Steffen van Bergerem
05a6d95811
Always show public photos
...
closes #6398
2015-09-14 22:04:53 +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
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
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
Steffen van Bergerem
1874c37706
Fix back-to-top backbone view
...
closes #6360
2015-08-29 21:44:24 +02:00
Steffen van Bergerem
0df0926739
Convert BackToTop to a backbone view
2015-08-25 04:17:24 +02:00
theworldbright
335b1c32aa
Refactor post presenter
2015-08-23 22:49:12 +02:00
Jonne Haß
a1ca45b201
Update NodeInfo to final 1.0 schema
...
closes #6340
2015-08-23 14:45:20 +02:00
Anton Tkachov
ef6c8a5448
Issue #6180 : Update stream faces block if somebody was blocked
...
closes #6320
2015-08-22 01:35:23 +02:00
Benjamin Neff
663835ed3a
remove old webfinger/hcard code
...
closes #6310
2015-08-21 14:23:08 +02:00
Benjamin Neff
d28e03f053
use discovery from diaspora_federation gem
2015-08-21 14:21:43 +02:00
Benjamin Neff
21e5bd8697
add save callback for webfinger
2015-08-21 14:21:43 +02:00
Benjamin Neff
65b056341c
update federation gem
2015-08-21 14:21:42 +02:00
theworldbright
d7c92431ae
Extract service from comments controller
...
closes #6307
2015-08-09 18:35:11 +02:00
Steffen van Bergerem
dc576fb0d6
Check if person is nil in person_image_tag
...
closes #6286
2015-08-06 22:55:41 +02:00
Steffen van Bergerem
536d1fe0e7
Move nsfw-shield to status-message
...
closes #6270
2015-07-30 12:00:48 +02:00
Steffen van Bergerem
67653cf465
Update backbone.js
...
closes #6262
2015-07-29 10:04:18 +02:00
Steffen van Bergerem
6fea450777
Fix mobile photos index page
...
closes #6243
2015-07-27 01:59:26 +02:00
theworldbright
2a3dde1ae5
Refactor PostService and extract its tests
...
Squashed commits:
[ada0f09] Remove favorites from Posts table
closes #6208
2015-07-26 13:10:24 +02:00
theworldbright
d724397168
Refactor posts controller
2015-07-26 12:58:42 +02:00
Jonne Haß
d68b3f02bd
Expose whether chat is enabled as NodeInfo metadata
...
related to #6211
2015-07-24 04:16:54 +02:00
Jonne Haß
b7064677ff
Collapse StatisticsController into NodeInfoController
2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca
Implement NodeInfo
2015-07-24 03:50:02 +02:00
cmrd Senya
e30293b9c1
Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser.
...
closes #6234
2015-07-23 17:02:52 +02:00
Steffen van Bergerem
f8bbe71f54
Remove correlations
...
closes #6223
2015-07-22 09:46:52 +02:00
Steffen van Bergerem
c8f482064c
Remove rake_helpers
2015-07-22 09:41:53 +02:00
JoeBew42
e21dad780d
Refactoring tests on photo saved with and without EXIF data
...
closes #6183
2015-07-16 11:12:12 +02:00
realtin
d0b290ea4d
refactor hash indentation and add double quotes
...
this is the suggested styling according to hound/pronto/rubocop
(#6192 )
2015-07-16 03:08:34 +02:00
zaziemo
c5a2334fbe
refactor tests to use let
...
instead of before blocks creating instance variables
pronto checked
#6192
2015-07-16 03:05:21 +02:00
realtin
8823bb01a2
refactor test to use let and better indentation
...
(#6192 )
2015-07-16 03:05:20 +02:00
zaziemo
56e0d3d57d
Remove one comment and change hash syntax
...
#6192
2015-07-16 03:05:20 +02:00
zaziemo
f52260ec68
Delete test because it didn't have an expectation
...
and dipatch is also called in the following test
#6192
2015-07-16 03:05:20 +02:00
realtin
62b375bb8e
refactor test to use let
...
instead of instance variables
(#6192 )
2015-07-16 03:05:20 +02:00
realtin
1503376fa6
refactor test to not use send method
...
since dispatch method is not private
(#6192 )
2015-07-16 03:05:20 +02:00
realtin
880886bbad
refactor test to use let instead of instance variables
2015-07-16 03:05:20 +02:00
zaziemo
5fba53a105
refactor even more tests
2015-07-16 03:05:20 +02:00
realtin
3ff33d355f
refactor test to use let
2015-07-16 03:05:20 +02:00
zaziemo
e1e8856e8d
refactor more specs
2015-07-16 03:05:20 +02:00
zaziemo
e3fe375849
correct indentation and use new hash syntax
2015-07-16 03:05:20 +02:00
zaziemo
fccb5dae23
refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests
2015-07-16 03:04:41 +02:00
realtin
a9919fabd1
refactor test to use let and rm unused variables
2015-07-16 03:00:08 +02:00
