Commit graph

1431 commits

Author SHA1 Message Date
Dennis Schubert
9cf2a9be49 Bump mysql2 ActiveRecord issues seem to be gone. 2016-02-09 21:18:09 +01:00
Dennis Schubert
3bfab029d5 Bump twitter-text 2016-02-09 21:14:35 +01:00
Dennis Schubert
86ed0026f3 Bump twitter 2016-02-09 21:14:35 +01:00
Dennis Schubert
c05ca939b6 Bump spring 2016-02-09 21:13:23 +01:00
Dennis Schubert
ed2564d76d Bump simplecov 2016-02-09 21:13:23 +01:00
Dennis Schubert
98949e3afd Bump rb-inotify 2016-02-09 21:12:29 +01:00
Dennis Schubert
9855385bde Bump rb-fsevent 2016-02-09 21:10:45 +01:00
Dennis Schubert
d3b5215951 Bump mini_magick 2016-02-09 21:10:45 +01:00
Dennis Schubert
66b81e4dd3 Bump json-schema 2016-02-09 21:09:58 +01:00
Dennis Schubert
954697bc9b Bump devise 2016-02-09 21:08:59 +01:00
Dennis Schubert
a11c02fc53 Bump factory_girl_rails 2016-02-09 21:08:12 +01:00
Dennis Schubert
4a75ad43c8 Bump webmock 2016-02-09 21:07:21 +01:00
Dennis Schubert
16fbe061d7 Bump shoulda-matchers 2016-02-09 21:06:27 +01:00
Dennis Schubert
246cba947e Bump rspec-rails and related 2016-02-09 21:04:54 +01:00
Dennis Schubert
8180f6658c Bump capybara 2016-02-09 21:04:54 +01:00
Dennis Schubert
d6a400f8cb Bump cucumber-rails 2016-02-09 21:03:34 +01:00
Dennis Schubert
9e0c818d9a Bump activerecord-import 2016-02-09 20:49:22 +01:00
Dennis Schubert
e3b21f63e8 Bump active_model_serializers 2016-02-09 20:45:10 +01:00
Takashi Kokubun
3028f8e9ad Use Hamlit to render Haml 2016-02-07 14:39:25 +09:00
Steffen van Bergerem
ef31b441e8 Bump rails-assets-blueimp-gallery 2016-02-01 00:20:06 +01:00
Steffen van Bergerem
461a337cc6 Bump rails-assets-autosize 2016-02-01 00:19:48 +01:00
Steffen van Bergerem
6fa0fe5202 Bump sidekiq-cron 2016-02-01 00:18:32 +01:00
Steffen van Bergerem
53bf478f24 Bump sidekiq 2016-02-01 00:17:24 +01:00
Steffen van Bergerem
02a0650b0e Bump eye 2016-02-01 00:14:21 +01:00
Jonne Haß
3a1ead1b21 Merge branch 'stable' into develop 2016-02-01 00:06:06 +01:00
Steffen van Bergerem
2f66c7c89a Bump rails-assets-perfect-scrollbar 2016-01-31 23:56:56 +01:00
Steffen van Bergerem
f1aad6512a Bump rails-assets-highlightjs 2016-01-31 23:42:58 +01:00
Steffen van Bergerem
89dedb8ba1 Bump will_paginate 2016-01-31 23:36:21 +01:00
Steffen van Bergerem
3065e1bf21 Bump sinatra 2016-01-31 23:33:23 +01:00
Steffen van Bergerem
80088fa2a0 Bump simple_captcha2 2016-01-31 23:27:09 +01:00
Steffen van Bergerem
0540a14056 Bump js-routes 2016-01-31 23:19:14 +01:00
Steffen van Bergerem
809763f653 Bump jquery-rails and rails-assets-jquery 2016-01-31 23:19:14 +01:00
Steffen van Bergerem
ce8e8716b9 Bump handlebars_assets 2016-01-31 23:19:14 +01:00
Steffen van Bergerem
3782935b19 Bump devise 2016-01-31 23:16:25 +01:00
Steffen van Bergerem
5995afbd36 Bump autoprefixer-rails 2016-01-31 23:13:57 +01:00
Jonne Haß
762299b6ad Merge branch 'stable' into develop 2016-01-28 16:36:46 +01:00
Sayed Abdelhaleem
8c0d12b6d3 fix NameError: uninitialized constant User::Zip by specifying rubzip gem main file name in Gemfile
closes #6659
2016-01-28 16:36:40 +01:00
Dennis Schubert
8da3cc0852 Merge branch 'stable' into develop 2016-01-26 14:33:36 +01:00
Dennis Schubert
6153fc7286 Merge branch 'hotfix/0.5.6.2' into stable 2016-01-26 14:30:34 +01:00
Dennis Schubert
33af30529a Bump rails 2016-01-26 14:28:02 +01:00
cmrd Senya
ed61ef6d6a Replace sidetiq with sidekiq-cron
closes #6616
2016-01-24 07:20:44 +01:00
Dennis Schubert
541e053ddb Merge branch 'stable' into develop 2016-01-24 07:09:12 +01:00
Benjamin Neff
ebfb901b39 update federation gem to prevent locale leakage in receive requests
closes #6651
2016-01-24 07:02:15 +01:00
Dennis Schubert
072ce711d2 Merge branch 'master' into stable 2016-01-22 01:41:49 +01:00
Dennis Schubert
22fa2c7cc4 Merge branch 'hotfix/0.5.6.1' into develop 2016-01-22 01:40:29 +01:00
Dennis Schubert
a8008571b3 Bump devise 2016-01-21 20:55:46 +01:00
Dennis Schubert
f7d42fa83d Bump nokogiri 2016-01-21 20:47:54 +01:00
Dennis Schubert
cb3f269218 Merge branch 'stable' into develop 2016-01-09 20:11:20 +01:00
Steffen van Bergerem
e99ecd259c Update markdown-it
closes #6626
2016-01-09 20:11:15 +01:00
Jonne Haß
baeff22451 Merge pull request #6095 from AugierLe42e/openid
OpenID Connect
2016-01-06 12:30:15 +01:00
Dennis Schubert
40e780abcf Merge branch 'stable' into develop 2016-01-06 00:49:15 +01:00
cmrd Senya
2aaf45166b bump diaspora_federation 2016-01-06 00:47:42 +01:00
theworldbright
3fc0f64c56 Move openid controllers to openid connect namespace 2016-01-04 16:49:48 +09:00
theworldbright
68d96a3189 Add versionist gem 2016-01-04 16:49:16 +09:00
theworldbright
efdfe318fd Add ability to get user info from access tokens 2016-01-04 16:48:42 +09:00
augier
8d8faf684c OpenID Connect debut work 2016-01-04 16:45:21 +09:00
Jonne Haß
80c18a32c6 bump bootstrap-sass 2015-12-31 16:26:40 +01:00
Jonne Haß
39e445cc38 bump pronto 2015-12-31 16:21:58 +01:00
Dennis Schubert
9dca1785c2 Merge branch 'stable' into develop 2015-12-31 16:17:35 +01:00
Jonne Haß
b1f7a452f9 bump spring 2015-12-31 16:09:11 +01:00
Jonne Haß
733e61ee1a bump responders 2015-12-31 16:09:11 +01:00
Jonne Haß
7c1600d1b1 bump redcarpet 2015-12-31 16:09:11 +01:00
Jonne Haß
65685695d2 bump omniauth 2015-12-31 16:09:11 +01:00
Jonne Haß
69b4492148 bump js-routes 2015-12-31 16:07:23 +01:00
Jonne Haß
9aa7b2bd78 bump ruby-oembed 2015-12-31 16:05:57 +01:00
Jonne Haß
d62f3c8668 bump jasmine 2015-12-31 16:02:26 +01:00
Jonne Haß
1223d6887c bump handlebars_assets 2015-12-31 15:59:38 +01:00
Jonne Haß
4b67b1cc3a bump webmock 2015-12-31 15:50:12 +01:00
Jonne Haß
27f79e16ee bump unicorn 2015-12-31 15:40:03 +01:00
Jonne Haß
0deb16adcc bump test_after_commit 2015-12-31 15:40:03 +01:00
Jonne Haß
44bc55337d bump spring 2015-12-31 15:35:45 +01:00
Jonne Haß
75c8d0c4ed bump simplecov 2015-12-31 15:35:45 +01:00
Jonne Haß
19141239dc bump shoulda-matchers 2015-12-31 15:35:45 +01:00
Jonne Haß
670c5fed4f bump rails_admin 2015-12-31 15:34:08 +01:00
Jonne Haß
226b3b3663 bump rails-i18n 2015-12-31 15:32:17 +01:00
Jonne Haß
256e0fadfa bump rails-assets-perfect-scrollbar 2015-12-31 15:31:36 +01:00
Jonne Haß
560f2df089 bump rails-assets-jquery-placeholder 2015-12-31 15:27:51 +01:00
Jonne Haß
b886ece423 bump pronto 2015-12-31 15:22:20 +01:00
Jonne Haß
8948298310 bump pg 2015-12-31 15:18:49 +01:00
Jonne Haß
f4e6aefd57 bump omniauth-tumblr 2015-12-31 15:17:41 +01:00
Jonne Haß
a6e3d587b6 bump omniauth-facebook 2015-12-31 15:17:41 +01:00
Jonne Haß
3a0da0564a bump json-schema 2015-12-31 15:17:41 +01:00
Jonne Haß
fbc64743f0 bump fog 2015-12-31 15:17:07 +01:00
Jonne Haß
ff0e5c0563 bump devise 2015-12-31 15:17:07 +01:00
Jonne Haß
152505511b bump autoprefixer-rails 2015-12-31 15:17:07 +01:00
Dennis Schubert
d4fbbd86b3 Merge branch 'stable' into develop 2015-12-30 14:51:05 +01:00
Benjamin Neff
c036a6a4c3 bump diaspora_federation 2015-12-30 14:50:34 +01:00
Jonne Haß
20ba097918 Merge branch 'stable' into develop 2015-12-28 17:31:38 +01:00
Steffen van Bergerem
78df0f5158 Update highlightjs 2015-12-28 17:25:45 +01:00
Lukas Matt
cf49276aa8 bump jsxc to v0.1.4
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6569
2015-12-21 17:29:42 +01:00
Steffen van Bergerem
7f146a8af9 Merge pull request #6570 from Zauberstuhl/bump_jsxc_develop
[develop] bump jsxc to v0.1.5.develop
2015-12-20 15:58:13 +01:00
Dennis Schubert
86fead30a4 Merge branch 'stable' into develop 2015-12-20 00:47:42 +01:00
Dennis Schubert
c238329cd8 Merge branch 'master' into stable 2015-12-20 00:41:49 +01:00
Dennis Schubert
3028b283e4 Bump nokogiri 2015-12-20 00:27:11 +01:00
Jonne Haß
13029235d0 Merge branch 'stable' into develop 2015-12-13 12:28:04 +01:00
cmrd Senya
08b910bd88 bump diaspora_federation 2015-12-13 12:24:52 +01:00
Lukas Matt
b9729db0d6 bump jsxc to v0.1.5.develop
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-11-30 15:06:15 +01:00
Jonne Haß
578f196a7b Merge branch 'stable' into develop 2015-11-24 00:43:37 +01:00
Jonne Haß
e195651592 bump nokogiri 2015-11-24 00:43:12 +01:00
Steffen van Bergerem
24301084fe Update autosize 2015-11-22 18:17:38 +01:00
Jonne Haß
c109a6f6b0 Merge branch 'stable' into develop 2015-11-22 15:50:13 +01:00
Steffen van Bergerem
98eb103446 Update highlight.js
closes #6558
2015-11-22 15:47:56 +01:00
Steffen van Bergerem
b8756cb16f Update markdown-it-sanitizer 2015-11-22 15:44:32 +01:00
Steffen van Bergerem
c3a44dcce1 Update markdown-it 2015-11-22 15:44:32 +01:00
Jonne Haß
a7ff246d8e Merge branch 'stable' into develop 2015-11-14 16:13:52 +01:00
Jonne Haß
acb9547978 Update Rails to 4.2.5 2015-11-14 16:12:15 +01:00
Jonne Haß
4f72377171 bump pronto-rubocop 2015-10-29 04:33:07 +01:00
Dennis Schubert
92c2a2e527 Merge branch 'stable' into develop 2015-10-29 04:31:47 +01:00
Jonne Haß
ada2913cd7 bump webmock 2015-10-29 04:20:37 +01:00
Jonne Haß
c0c4b7277b bump shoulda-matchers 2015-10-29 04:20:37 +01:00
Jonne Haß
6404f5df2b bump rubocop 2015-10-29 04:20:37 +01:00
Jonne Haß
e0e2ab01af bump redcarpet 2015-10-29 04:19:18 +01:00
Jonne Haß
19875a59e0 bump rails-assets-jquery-placeholder 2015-10-29 04:19:18 +01:00
Jonne Haß
b1318779a6 bump mini_magick 2015-10-29 04:18:12 +01:00
Jonne Haß
6bc1314b43 bump handlebars_assets 2015-10-29 04:18:12 +01:00
Jonne Haß
fb923a188e bump faraday 2015-10-29 04:17:42 +01:00
Jonne Haß
3eb32a6c60 bump database_cleaner 2015-10-29 04:17:07 +01:00
Steffen van Bergerem
1687e231fe Update autosize 2015-10-09 18:22:33 +02:00
Jonne Haß
ebc8f71f8b Merge branch 'stable' into develop 2015-10-09 18:21:09 +02:00
Steffen van Bergerem
98eca2d1a6 Update perfect-scrollbar
closes #6476
2015-10-09 18:16:35 +02:00
Steffen van Bergerem
95f3a5edbf Update markdown-it 2015-10-09 18:15:13 +02:00
Steffen van Bergerem
be67415269 Add 'require: false' for pronto-scss 2015-09-24 19:24:15 +02:00
Steffen van Bergerem
b1bb259292 Add scss linter 2015-09-23 16:35:34 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm
5813 show geolocation on osm
2015-09-23 01:43:49 +02:00
Jonne Haß
2601186507 Merge branch 'stable' into develop 2015-09-21 12:23:23 +02:00
Jonne Haß
ca215ca28d Sidetiq still isn't celluloid 0.17 compatible 2015-09-21 12:21:16 +02:00
Dennis Schubert
cb7ab32d06 Merge branch 'stable' into develop 2015-09-19 23:06:43 +02:00
Jonne Haß
8c246c406f bump typhoeus 2015-09-19 23:02:13 +02:00
Jonne Haß
cce910000f bump js-routes 2015-09-19 23:01:37 +02:00
Jonne Haß
691274d068 bump jasmine 2015-09-19 23:01:37 +02:00
Jonne Haß
0169f5ca8c bump eye, sidekiq, celluloid 2015-09-19 23:00:08 +02:00
Jonne Haß
de9f7d4173 bump spring 2015-09-19 22:59:17 +02:00
Jonne Haß
78655b6f43 bump typhoeus 2015-09-19 22:59:17 +02:00
Jonne Haß
6ea200e0e3 bump twitter-text 2015-09-19 22:58:18 +02:00
Jonne Haß
9f6b4c56ad bump twitter 2015-09-19 22:58:18 +02:00
Jonne Haß
92181b9882 bump rspec-instafail 2015-09-19 22:48:43 +02:00
Jonne Haß
16a5ac2630 bump rb-fsevent 2015-09-19 22:47:49 +02:00
Jonne Haß
f9b93c037f bump rails-i18n 2015-09-19 22:47:49 +02:00
Jonne Haß
9a4b157a95 bump rails-assets-perfect-scrollbar 2015-09-19 22:47:14 +02:00
Jonne Haß
c2a29294c9 bump rails-assets-highlightjs 2015-09-19 22:46:29 +02:00
Jonne Haß
265ea26f05 bump pg 2015-09-19 22:42:50 +02:00
Jonne Haß
a6eb8521c3 bump mysql2 2015-09-19 22:42:04 +02:00
Jonne Haß
d9f9855e15 bump omniauth-twitter 2015-09-19 22:40:56 +02:00
Jonne Haß
21a6a8fd86 bump mini_magick 2015-09-19 22:40:27 +02:00
Jonne Haß
7f27b95d4c bump markerb 2015-09-19 22:40:27 +02:00
Jonne Haß
bab07436d2 bump js-routes 2015-09-19 22:40:27 +02:00
Jonne Haß
f255dc490d bump jquery-rails 2015-09-19 22:40:27 +02:00
Jonne Haß
28cebf7800 bump haml 2015-09-19 22:39:37 +02:00
Jonne Haß
1db832fa11 bump guard-rspec 2015-09-19 22:38:47 +02:00
Jonne Haß
4fa8cc4e62 bump fog 2015-09-19 22:37:48 +02:00