Jonne Haß
c2a29294c9
bump rails-assets-highlightjs
2015-09-19 22:46:29 +02:00
Jonne Haß
265ea26f05
bump pg
2015-09-19 22:42:50 +02:00
Jonne Haß
a6eb8521c3
bump mysql2
2015-09-19 22:42:04 +02:00
Jonne Haß
d9f9855e15
bump omniauth-twitter
2015-09-19 22:40:56 +02:00
Jonne Haß
21a6a8fd86
bump mini_magick
2015-09-19 22:40:27 +02:00
Jonne Haß
7f27b95d4c
bump markerb
2015-09-19 22:40:27 +02:00
Jonne Haß
bab07436d2
bump js-routes
2015-09-19 22:40:27 +02:00
Jonne Haß
f255dc490d
bump jquery-rails
2015-09-19 22:40:27 +02:00
Jonne Haß
28cebf7800
bump haml
2015-09-19 22:39:37 +02:00
Jonne Haß
1db832fa11
bump guard-rspec
2015-09-19 22:38:47 +02:00
Jonne Haß
4fa8cc4e62
bump fog
2015-09-19 22:37:48 +02:00
Jonne Haß
30c531a6b9
bump devise
2015-09-19 22:37:48 +02:00
Jonne Haß
16a820992b
bump database_cleaner
2015-09-19 22:37:47 +02:00
Jonne Haß
f996699aa2
bump sass-rails
2015-09-19 22:37:47 +02:00
Jonne Haß
a333b10805
bump compass-rails
2015-09-19 22:36:39 +02:00
Jonne Haß
8d917742e2
bump capybara
2015-09-19 22:35:25 +02:00
Jonne Haß
7bdb50ad7b
bump autoprefixer-rails
2015-09-19 22:33:57 +02:00
Benjamin Neff
a40816370e
update federation gem to fix #6405
...
removed some contraints to support friendica and redmatrix again
closes #6410
2015-09-19 11:34:27 +02:00
Achilleas Pipinellis
9888b4ce43
Add option to set a pid file for unicorn in diaspora.yml
...
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid
closes #6411
2015-09-19 11:33:04 +02:00
Jonne Haß
92113749c0
highlight-white is still referenced on stable
2015-09-15 10:44:23 +02:00
Steffen van Bergerem
8bb3d4d8a8
Remove unused color variables
...
closes #6404
2015-09-15 09:51:06 +02:00
Jonne Haß
43a09fec39
add changelog entry for #6398 [ci skip]
2015-09-14 22:08:57 +02:00
Steffen van Bergerem
05a6d95811
Always show public photos
...
closes #6398
2015-09-14 22:04:53 +02:00
Steffen van Bergerem
8fb1116da5
Update AUTHORS file
...
closes #6399
2015-09-14 21:50:09 +02:00
Jonne Haß
f7a883917c
Merge branch 'master' into stable
2015-09-13 12:35:46 +02:00
Jonne Haß
04b3531cd0
bump to 0.5.3.1
2015-09-13 12:33:44 +02:00
Jonne Haß
6fb5e88ead
Merge branch 'master' into stable
2015-09-13 12:23:41 +02:00
Steffen van Bergerem
ebad0961a9
Show private profile info if contact is sharing
2015-09-13 12:16:25 +02:00
Lukas Matt
e57bdeed19
Set onlineHelp link in jsxc options
...
related to diaspora/jsxc#125
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #6388
2015-09-07 13:35:51 +02:00
Lukas Matt
a40a34ee8c
autoLang default value is true
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-07 13:35:49 +02:00
Jonne Haß
0dd5447e63
Fix tumblr service deletion spec to actually test deletion
2015-09-07 13:31:45 +02:00
Jonne Haß
0e64d8de2a
Refactor tumblr service spec
...
closes #6386
2015-09-07 13:24:53 +02:00
Vinothan Shankar
2ace9b47b1
* app/models/services/tumblr.rb (Services::Tumblr#post): Post only to primary blog
...
Hardly a total fix, but it's a start. Based on meitar/diaspora:b5c01598.
* app/models/services/tumblr.rb: style: double-quote string
Line 22. Change from single-quotes.
* app/models/services/tumblr.rb: parse URL only for blogs we care about
...which in this case is just the primary.
This also fixes the failed test in 7079fda (and by extension, 7a1d3a9).
* spec/models/services/tumblr_spec.rb: Add "primary" flag to test user-info
* spec/models/services/tumblr_spec.rb: Add a secondary blog to test user-info
This should not cause a request to be issued, so we can continue to
expect the request for the primary blog only. Any request for the
secondary indicates a bug in the service implementation.
* spec/models/services/tumblr_spec.rb: Make the second blog returned the primary
Just to catch if it's picking the first one
* app/models/services/tumblr.rb: use blogs.find instead of blogs.each
Since we're only handling the primary blog, this should be easy enough
* app/models/services/tumblr.rb: Remove redundant if block
The condition it would have caught is dealt with by the ifnone on the find
* app/models/services/tumblr.rb: Style: remove space between { and |
2015-09-07 12:45:16 +02:00
zaziemo
d38741d5eb
add more specs to test moderator role
...
fixes #5324
closes #6351
2015-09-07 12:38:12 +02:00
zaziemo
c2c6ed5dea
refactor moderator role and add specs
...
#5324
2015-09-07 12:32:09 +02:00
realtin
15b186518c
add moderators to report email recievers
...
and refactor coding style according to pull request comments
(#5324 )
2015-09-07 12:31:25 +02:00
realtin
098c30c2b7
adapt report spec for the moderator
2015-09-07 12:29:46 +02:00
realtin
0b420d0308
adapt templates to allow moderator to view reports
...
(#5324 )
2015-09-07 12:29:46 +02:00
zaziemo
b2dc77e1e6
change method name for a better understanding of what the befor_filter does
...
and correct test syntax
#5324
2015-09-07 12:24:12 +02:00
realtin
bc75371b7a
report controller renders index for the moderator
...
(#5324 )
2015-09-07 12:24:12 +02:00
zaziemo
3a3c881735
add new role moderator analogue to admin role
...
#5324
2015-09-07 12:24:12 +02:00
Dennis Schubert
81084cde46
Merge branch 'master' into stable
2015-09-07 04:23:23 +02:00
Dennis Schubert
782c1ef6ee
Merge branch 'release/0.5.3.0'
2015-09-07 04:22:47 +02:00
Jonne Haß
c0da031e33
Merge branch 'release/0.5.3.0' into stable
2015-09-06 13:56:10 +02:00
Jonne Haß
f855fb9718
updated 60 locale files [ci skip]
2015-09-06 13:53:41 +02:00
sjain1107
928576bc88
6306-add-spinner-on-initial-stream-load
...
closes #6384
2015-09-05 16:11:09 +02:00
Jonne Haß
ca5fa14376
Merge branch 'release/0.5.3.0' into stable
2015-09-03 21:39:13 +02:00
Lukas Matt
23c016cf36
Update wiki links in diaspora config
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-03 21:38:56 +02:00
Dennis Schubert
f75a6147a5
Bump version number
...
[ci skip]
2015-09-01 03:52:06 +02:00
Jonne Haß
e47be13ae8
Merge pull request #6370 from svbergerem/update-rails_admin
...
Bump rails_admin
2015-08-30 22:34:46 +02:00
