Jonne Haß
|
e57609a4d6
|
Merge branch 'stable' into develop
|
2015-06-16 21:41:13 +02:00 |
|
Jonne Haß
|
4b2a43b005
|
Merge branch 'master' into stable
|
2015-06-16 21:40:18 +02:00 |
|
Jonne Haß
|
532f78b5a1
|
Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4
This fixes CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225
|
2015-06-16 21:33:16 +02:00 |
|
Steffen van Bergerem
|
b3a5e92eca
|
Remove all faceboxes
|
2015-06-15 14:09:24 +02:00 |
|
Steffen van Bergerem
|
92a3dd53f0
|
Replace jquery.autoresize with autosize
|
2015-06-14 20:03:15 +02:00 |
|
Steffen van Bergerem
|
18a8211cc3
|
Add img-responsive to image class
|
2015-06-12 00:01:56 +02:00 |
|
Jonne Haß
|
c83650f023
|
Merge branch 'stable' into develop
|
2015-06-10 13:33:37 +02:00 |
|
Steffen van Bergerem
|
034fc5b183
|
Update markdown-it
closes #6091
|
2015-06-10 13:33:33 +02:00 |
|
Jonne Haß
|
72bb85eeba
|
Merge branch 'stable' into develop
|
2015-06-08 16:59:31 +02:00 |
|
Steffen van Bergerem
|
5516926b74
|
Update perfect-scrollbar
closes #6085
|
2015-06-08 16:59:27 +02:00 |
|
Dennis Schubert
|
ad52eaf6d7
|
Merge branch 'stable' into develop
|
2015-06-08 04:09:57 +02:00 |
|
Jan Berdajs
|
ec4e7b4a69
|
upgrade Twitter gem - fixes Faraday deprecation warning
|
2015-06-08 04:08:02 +02:00 |
|
Dennis Schubert
|
3a07be1243
|
Merge branch 'stable' into develop
|
2015-06-06 17:55:01 +02:00 |
|
Benjamin Neff
|
0b5bf2e340
|
add simplecov for test-coverage
works with rubymine
closes #6065
|
2015-06-06 17:54:57 +02:00 |
|
Augier
|
207b6c6153
|
Port to Bootstrap 3
correcting images display on stream sidebar
Corrections on profile page
|
2015-06-04 18:05:43 +02:00 |
|
Jonne Haß
|
e39d024ba1
|
Merge branch 'stable' into develop
|
2015-06-04 11:31:43 +02:00 |
|
Jonne Haß
|
f9ce41bae4
|
bump fixture_builder
|
2015-06-04 10:58:01 +02:00 |
|
Dennis Schubert
|
ee890310d3
|
Merge branch 'stable' into develop
|
2015-06-01 04:44:49 +02:00 |
|
Jonne Haß
|
ea63343b69
|
bump oauth related dependencies
closes #5924
|
2015-06-01 04:44:45 +02:00 |
|
Dennis Schubert
|
807b4f72bd
|
Merge pull request #6003 from jhass/remove_db_hack
Replace DB environment variable with optional bundler groups
|
2015-05-30 03:04:33 +02:00 |
|
Jonne Haß
|
146f7eea52
|
Merge branch 'stable' into develop
|
2015-05-29 11:42:03 +02:00 |
|
Sandip Trivedi
|
b026a2afe8
|
Replaces facebox vendored asset with rails gem #5194
closes #6005
|
2015-05-29 11:41:57 +02:00 |
|
Jonne Haß
|
c85fe3872e
|
Replace DB environment variable with optional bundler groups
See the changes to the changelog for more details
|
2015-05-29 01:33:12 +02:00 |
|
Jonne Haß
|
351f54d74f
|
Merge branch 'stable' into develop
|
2015-05-28 11:24:34 +02:00 |
|
Sandip Trivedi
|
36d6c5d2ba
|
Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
closes #6001
|
2015-05-28 11:24:30 +02:00 |
|
Sandip Trivedi
|
2ba2ef1b9c
|
Replaces the zipzip gem with the rubyzip gem
|
2015-05-28 11:23:57 +02:00 |
|
Dennis Schubert
|
04df6c115d
|
Merge branch 'stable' into develop
|
2015-05-28 01:28:19 +02:00 |
|
Steffen van Bergerem
|
6206bb9920
|
Update markdown-it-hashtag
closes #5998
|
2015-05-28 01:28:15 +02:00 |
|
Dennis Schubert
|
70dc4fcab1
|
Merge branch 'stable' into develop
|
2015-05-22 02:53:55 +02:00 |
|
Benjamin Neff
|
ac96232d85
|
use logging gem for better logging with class name and log-level
|
2015-05-22 02:53:19 +02:00 |
|
Benjamin Neff
|
49f0fb6dcd
|
replace silence_assets.rb with quiet_assets gem
|
2015-05-22 02:53:19 +02:00 |
|
Dennis Schubert
|
00cb87ce11
|
Merge branch 'stable' into develop
|
2015-05-19 02:55:36 +02:00 |
|
Jonne Haß
|
4bde00177c
|
replace foreman with eye
closes #5966
|
2015-05-19 02:55:31 +02:00 |
|
Jonne Haß
|
b5e277384b
|
Merge branch 'stable' into develop
|
2015-05-17 20:44:53 +02:00 |
|
Jonne Haß
|
d2467319ed
|
Bump open_graph_reader
|
2015-05-17 20:44:37 +02:00 |
|
Jonne Haß
|
15d7b019f1
|
Merge branch 'stable' into develop
|
2015-05-17 13:58:00 +02:00 |
|
Steffen van Bergerem
|
6bec3d67ed
|
Update markdown-it-sanitizer and markdown-it-for-inline
closes #5965
|
2015-05-17 13:57:54 +02:00 |
|
Dennis Schubert
|
5477c7df96
|
Merge branch 'stable' into develop
|
2015-05-10 01:59:21 +02:00 |
|
Steffen van Bergerem
|
59e57c013b
|
Update jasmine-ajax
closes #5937
|
2015-05-10 01:59:17 +02:00 |
|
Dennis Schubert
|
bd9bce2a5f
|
Merge branch 'stable' into develop
|
2015-05-07 22:56:05 +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 |
|