Commit graph

1499 commits

Author SHA1 Message Date
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
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
Dennis Schubert
f7c03514cb Remove old diaspora_federation-* Gems 2016-01-24 08:16:22 +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
Dennis Schubert
642de6909e Remove duplicate Gems from Lockfile
this commit could also be named "Remove user error", but that would look
like I am too stupid to use bundler.
2015-12-31 16:30:11 +01:00
Jonne Haß
80c18a32c6 bump bootstrap-sass 2015-12-31 16:26:40 +01:00
Jonne Haß
e3f86492ed bump pg 2015-12-31 16:24:54 +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ß
5e6f01a956 bump pry-byebug 2015-12-31 15:27:51 +01:00
Jonne Haß
b886ece423 bump pronto 2015-12-31 15:22:20 +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
Lukas Matt
d91907cfe1 bump diaspora_jsxc to v0.1.4.develop.4
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-29 15:32:28 +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ß
bf42cc17f1 bump http
closes #6514
2015-10-29 04:25:11 +01:00
Jonne Haß
a189155773 bump valid 2015-10-29 04:21:07 +01:00
Jonne Haß
c7a5010b37 bump sass 2015-10-29 04:21:07 +01:00
Jonne Haß
c79a3fa4bf bump fog 2015-10-29 04:20:37 +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ß
bd427ea2db bump pry 2015-10-29 04:18:53 +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