Commit graph

15453 commits

Author SHA1 Message Date
Jonne Haß
07a17a8aa5 bump rack-cors 2015-02-28 01:40:02 +01:00
Jonne Haß
492200a5fb bump pry-byebug 2015-02-28 01:40:01 +01:00
Jonne Haß
77aa074c5d bump nokogiri 2015-02-28 01:40:01 +01:00
Jonne Haß
dc47eca6ee bump mysql2 2015-02-28 01:40:00 +01:00
Jonne Haß
b7235178f5 bump mini_magick 2015-02-28 01:40:00 +01:00
Jonne Haß
7311f3cbc1 bump json 2015-02-28 01:40:00 +01:00
Jonne Haß
44b9bb956f bump js_image_paths 2015-02-28 01:39:59 +01:00
Jonne Haß
e6fb73dc90 bump js-routes 2015-02-28 01:39:59 +01:00
Jonne Haß
d047337a7e bump http_accept_language 2015-02-28 01:39:59 +01:00
Jonne Haß
c1ef5e5d3b bump haml 2015-02-28 01:39:58 +01:00
Jonne Haß
fe3bc2c1b2 bump guard 2015-02-28 01:39:55 +01:00
Jonne Haß
25dd8ffc67 bump fog 2015-02-28 01:06:36 +01:00
Jonne Haß
273363ba6e bump faraday 2015-02-28 01:05:48 +01:00
Jonne Haß
e83cd159b0 bump database_cleaner 2015-02-28 01:05:03 +01:00
Jonne Haß
343d98f2f2 bump addressable 2015-02-28 01:02:14 +01:00
Jonne Haß
c0cb7536d5 bump acts-as-taggable-on 2015-02-28 01:01:48 +01:00
Jonne Haß
01a102e2f3 bump active_model_serializers 2015-02-28 01:01:03 +01:00
Dennis Schubert
5b64ae7b21 Merge pull request #5501 from jhass/rails42
Rails 4.2
2015-02-28 00:47:19 +01:00
Jonne Haß
678033fa23 replace deprecated stub syntax in export user spec 2015-02-27 17:00:42 +01:00
Jonne Haß
7a741c6dce Ensure deliveries are cleared after each example 2015-02-27 17:00:41 +01:00
Jonne Haß
a0c22659d5 Monkey patch to prevent dumping limit on boolean fields 2015-02-27 17:00:41 +01:00
Jonne Haß
6790232960 bump pg 2015-02-27 17:00:41 +01:00
Jonne Haß
7e245a0082 Fix orphan conversations migration
Can't delete all with group/having
2015-02-27 17:00:41 +01:00
Jonne Haß
657d0baea7 Drop foreigner, Rails 4.2 ships the provided functionality 2015-02-27 17:00:41 +01:00
Jonne Haß
8fd39d67f0 Rendering a file is no longer the default 2015-02-27 17:00:41 +01:00
Jonne Haß
3a90386303 deliver needs to be called on the return value of the mailer call 2015-02-27 16:58:39 +01:00
Jonne Haß
f62ba0f73c Don't split contact_ids when they already are an array 2015-02-27 16:58:39 +01:00
Jonne Haß
d295b5d5b5 ActiveRecord::Base::reflection returns strings now 2015-02-27 16:58:39 +01:00
Jonne Haß
9530f00bd6 Don't use a too large invalid id 2015-02-27 16:58:39 +01:00
Jonne Haß
2d7399de28 Bump activerecord-import 2015-02-27 16:58:39 +01:00
Jonne Haß
1ec3f5caa6 Don't pass a model instance where an id is expected 2015-02-27 16:58:39 +01:00
Jonne Haß
f49c8884f4 Use _url, not _path, in mailers 2015-02-27 16:58:39 +01:00
Jonne Haß
290aded7f6 ActionMailer deliver -> deliver_now 2015-02-27 16:58:39 +01:00
Jonne Haß
162303db37 Enable Rails 5 behavior for exceptions in after_commit callbacks 2015-02-27 16:58:39 +01:00
Jonne Haß
9ad2409264 Don't use AR internals (@attributes) 2015-02-27 16:58:38 +01:00
Jonne Haß
3a8302ff7f serve_static_assets was renamed to serve_static_files 2015-02-27 16:58:38 +01:00
Jonne Haß
b53ce9a51d Bump Rails to 4.2 2015-02-27 16:58:38 +01:00
Jonne Haß
ed44689670 Fix a spec for LikesController 2015-02-27 16:36:45 +01:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
6432bbe67b fix 2015-02-27 16:29:49 +01:00
Jonne Haß
93c9ad6eba Fix participations controller spec 2015-02-27 16:27:55 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts
5041 total user statistic shouldnt include closed accounts
2015-02-27 16:02:35 +01:00
Jonne Haß
e46a77ba19 Merge pull request #5706 from aka001/help_section
Update the help section #5698
2015-02-27 15:57:12 +01:00
Jonne Haß
e8440bb25f Merge pull request #5683 from svbergerem/mobile-fix-style-more
Mobile: fix style of 'more' button
2015-02-27 15:53:36 +01:00
Jonne Haß
205f82bfd0 Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login
Adjust jsxc initialization for ajax login
2015-02-27 15:52:30 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Jonne Haß
073e99992e Some fixes to participation controls
* prevent default event in JS handlers to prevent jumping back to the
  top.
* Use js-routes
* Use sprite for icons
* Reply with 200 instead of 204 when destroying a participation,
  to prevent errors in the browser console.
2015-02-27 15:31:30 +01:00
Akash Agrawall
e85cb7b373 Help_section_update_keyboard_shortcut 2015-02-27 16:36:11 +05:30
Jonne Haß
39c50b231f Merge pull request #5665 from AugierLe42e/chat-help-section-bis-repetita
Adding help section for chat
2015-02-26 22:20:57 +01:00
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00