Commit graph

1244 commits

Author SHA1 Message Date
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