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

16227 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip 
closes #5956
 2015-05-16 03:42:14 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
Jason Robinson
ce16a122fc Fix missing localization of inactive user removal warning emails. 
Fixes #5950
 2015-05-16 03:40:06 +02:00
Jason Robinson
aec2467e98 Fix inactive user removal not respecting configuration for daily limits 
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.

closes #5953
 2015-05-16 03:36:25 +02:00
goobertron
2668c487e7 Remove dupe line from en.yml [ci skip] 
closes #5951
 2015-05-12 14:20:03 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
1a4e3cef48 Mute ActiveRecord::RecordInvalid due to ignores 
closes #5943
 2015-05-10 14:26:21 +02:00
Dennis Schubert
32f95a860c We don't always have invalid record messages ... so log the exception message instead. 2015-05-10 14:25:50 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names 
closes #5941
 2015-05-10 02:00:30 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Steffen van Bergerem
59e57c013b Update jasmine-ajax 
closes #5937
 2015-05-10 01:59:17 +02:00
Dennis Schubert
6273c2959a Rescue from private objects sent to the public api 
closes #5938
 2015-05-10 00:10:12 +02:00
Dennis Schubert
915dee3c4b Mute some ActiveRecord::RecordNotUnique exceptions 2015-05-10 00:09:25 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person 
closes #5936
 2015-05-09 23:48:59 +02:00
Jonne Haß
60fb680572 bump hashie 
closes #5925
 2015-05-07 22:55:56 +02:00
Jonne Haß
729fc1a6bf bump sprockets-rails 2015-05-07 22:55:37 +02:00
Jonne Haß
2240599f59 bump rack 2015-05-07 22:55:37 +02:00
Jonne Haß
5d9822056b bump websocket 2015-05-07 22:55:36 +02:00
Jonne Haß
b702c80fb8 bump listen 2015-05-07 22:55:36 +02:00
Jonne Haß
e0116e268f bump domain_name 2015-05-07 22:55:36 +02:00
Jonne Haß
11f4561ae5 bump childprocess 2015-05-07 22:55:36 +02:00
Jonne Haß
4cf681a538 bump rspec 2015-05-07 22:55:36 +02:00
Jonne Haß
1024b3b1f1 bump byebug 2015-05-07 22:55:36 +02:00
Jonne Haß
2634ea07a9 bump js-routes 2015-05-07 22:55:36 +02:00
Jonne Haß
487afed53e bump webmock 2015-05-07 22:55:36 +02:00
Jonne Haß
70189f05f4 bump unicorn 2015-05-07 22:55:36 +02:00
Jonne Haß
a9519ede3d bump twitter-text 2015-05-07 22:55:36 +02:00
Jonne Haß
147ea4e399 bump spring 2015-05-07 22:55:36 +02:00
Jonne Haß
fa24333ca1 bump rubocop 2015-05-07 22:55:35 +02:00
Jonne Haß
5a6f6c68cc bump rack-cors 2015-05-07 22:55:35 +02:00
Jonne Haß
ac405dddeb bump mini_magick 2015-05-07 22:55:35 +02:00
Jonne Haß
4f75205d9f bump fog 2015-05-07 22:55:35 +02:00
Jonne Haß
5c6e20048a bump entypo-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
319edd70ad bump backbone-on-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
16562d6d36 bump autoprefixer-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
55fdf51058 bump addressable 2015-05-07 22:55:35 +02:00
Jonne Haß
138551112b Fix obtaining sidekiq log path 2015-05-07 22:30:07 +02:00
Jonne Haß
f0d51e24b8 Fix invalid setting calls in config/unicorn.rb 
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
 2015-05-07 22:07:22 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails 
merges #5931
 2015-05-07 04:10:21 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions 
closes #5934
 2015-05-07 04:03:43 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Jonne Haß
6c164fe236 Merge branch 'hotfix/0.5.0.1' 2015-05-06 23:52:54 +02:00
Jonne Haß
51918a798a bump to 0.5.0.1 2015-05-06 23:52:40 +02:00
Dennis Schubert
d27061d5d6 Set captcha length correctly, fix #5932 2015-05-06 23:51:28 +02:00
Rich
2ce0e8045b Change <subtitle> branding on atom feeds 
Minor consistency change ( from Diaspora to diaspora* )

closes #5929
 2015-05-05 18:02:14 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader 
It now returns the origin for a missing og:url
 2015-05-04 23:43:53 +02:00
Jonne Haß
a30e34bfdb Merge pull request #5922 from diaspora/update_gems 
Update gems
 2015-05-04 15:14:34 +02:00
Jonne Haß
28ee47d6c9 bump sidekiq 2015-05-04 14:22:57 +02:00
Jonne Haß
bb14128052 bump ruby-oembed 2015-05-04 14:22:57 +02:00