nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16623 commits 4 branches 0 tags 121 MiB
Commit graph

16623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
f9a452265d Merge branch 'stable' into develop 2015-09-07 13:35:56 +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ß
6528f1479c Merge branch 'stable' into develop 2015-09-07 13:32:19 +02:00
Jonne Haß
0dd5447e63 Fix tumblr service deletion spec to actually test deletion 2015-09-07 13:31:45 +02:00
Jonne Haß
ba61ca4bdf Merge branch 'stable' into develop 2015-09-07 13:25:14 +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
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +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
908f63fae9 Merge branch 'stable' into develop 2015-09-07 04:23:33 +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ß
6fb6b8dc8a Merge branch 'stable' into develop 2015-09-06 13:56:25 +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
Steffen van Bergerem
426f55e685 Merge branch 'stable' into develop 2015-09-05 16:12:00 +02:00
sjain1107
928576bc88 6306-add-spinner-on-initial-stream-load 
closes #6384
 2015-09-05 16:11:09 +02:00
Jonne Haß
ac6e9fd7c7 Merge branch 'stable' into develop 2015-09-03 21:39:24 +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
67df0a20ee Merge branch 'stable' into develop 2015-09-01 03:52:33 +02:00
Dennis Schubert
f75a6147a5 Bump version number 
[ci skip]
 2015-09-01 03:52:06 +02:00
Jonne Haß
5e2b1458cd Merge pull request #6375 from Raven24/more_exceptions 
forgot to pass through my own exception
 2015-09-01 01:40:53 +02:00
Florian Staudacher
f8e93e1554 forgot to pass my own exceptions through 2015-09-01 01:36:04 +02:00
Jonne Haß
84083bd8bd Merge pull request #6371 from Raven24/more_exceptions 
pod check - make the error handling more robust
 2015-08-31 20:34:22 +02:00
Florian Staudacher
461c8e67cd make the error handling more robust 
catch more exceptions higher up in the hierarchy
 - don't stop checking all pods if there's just one malfolmed pod
avoid echoing the complete body on json error
 2015-08-31 19:39:00 +02:00
Jonne Haß
3cc475c887 Merge branch 'stable' into develop 2015-08-30 22:34:56 +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
Steffen van Bergerem
a01cea0b63 Bump rails_admin 2015-08-30 21:52:52 +02:00
Jonne Haß
55eed936b0 Merge pull request #6355 from Raven24/pod-test-fixup 
fixup pod list frontend
 2015-08-30 20:18:06 +02:00
Florian Staudacher
738413c65f fix some issues with pod-checking 
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
 2015-08-30 18:50:34 +02:00
Dennis Schubert
39fb1a6db2 Merge branch 'stable' into develop 2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14 Change default autofollow_on_join_user 
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.

closes #6369
 2015-08-30 10:17:05 +02:00
Jonne Haß
48bc79f1b5 Merge branch 'stable' into develop 2015-08-30 01:14:54 +02:00
Jonne Haß
1223699f76 Disable all network requests in Cucumber suite 
closes #6368
 2015-08-30 01:14:49 +02:00
Dennis Schubert
4f2f3cca59 Merge branch 'stable' into develop 2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706 Fix back-to-top backbone view 
closes #6360
 2015-08-29 21:44:24 +02:00
Dennis Schubert
8c54d83f03 Merge branch 'stable' into develop 
closes #6335
 2015-08-29 21:38:55 +02:00
Steffen van Bergerem
82081af71a Add Code of Conduct 2015-08-29 21:38:11 +02:00
Jonne Haß
9842841c18 Merge branch 'stable' into develop 2015-08-29 19:55:09 +02:00
Steffen van Bergerem
34319758ed Improve posts from ... page cukes 
closes #6367
 2015-08-29 19:55:03 +02:00
Steffen van Bergerem
5020ac45c7 Merge branch 'stable' into develop 2015-08-29 18:19:12 +02:00