Commit graph

15861 commits

Author SHA1 Message Date
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
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
19fd36b1ce add changelog entry for #5908 [ci skip] 2015-05-04 04:06:55 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Steffen van Bergerem
c64c4114ac Update jquery-rails 2015-05-04 03:42:36 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Steffen van Bergerem
1fc31cc313 Fix close account for mobile view
and use Bootstrap modal for desktop close account
2015-05-04 03:31:28 +02:00
Jonne Haß
02cdf803b6 add travis badge for stable branch [ci skip] 2015-05-04 01:00:12 +02:00
Jonne Haß
0021326fc9 build stable 2015-05-04 00:42:54 +02:00
Jonne Haß
db08cec9c0 update changelog and version for 0.5.1.0 2015-05-04 00:41:55 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
2015-05-04 00:36:27 +02:00
Jonne Haß
69842b84a4 Merge branch 'master' into develop 2015-05-03 15:48:42 +02:00
Jonne Haß
f8b3836d1f Merge branch 'release/0.5.0.0-RC' 2015-05-03 15:45:49 +02:00
Jonne Haß
8e2278b80d Merge branch 'release/0.5.0.0-RC' into develop 2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2 updated 60 locale files [ci skip] 2015-05-03 15:43:35 +02:00
Jonne Haß
5371c3876f Merge pull request #5907 from pravi/add-x-permissions-to-scripts
add execution permission to scripts
2015-05-02 15:14:51 +02:00