nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20852 commits 4 branches 0 tags 121 MiB
Commit graph

2153 commits

Author SHA1 Message Date
Steffen van Bergerem
1158b0a41c
Bump rails-assets-markdown-it 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
47d427cf44
Bump rails-assets-higlightjs 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
df0c26da5c
Bump json-schema 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
86aab68c8e
Bump js-routes 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
f5d8ae68c1
Bump guard-rspec 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
8af192d6bd
Bump guard 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
86d8c5f239
Bump autoprefixer-rails 2016-06-16 02:01:06 +02:00
Steffen van Bergerem
e7227891e7 Use eslint instead of jshint 2016-06-12 10:03:59 +02:00
Jonne Haß
1891b9c61e
Merge branch 'stable' into develop 2016-06-07 14:05:41 +02:00
Jonne Haß
4c750c8784
Merge branch 'master' into stable 2016-06-07 14:04:22 +02:00
Jonne Haß
0bc8e54afd
Update Nokogiri to 1.6.8 
Which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,  addressing
a range of security issues.
See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
for more details.
 2016-06-07 13:51:33 +02:00
Dennis Schubert
347f783052
Bump versionist 2016-05-12 13:38:15 +02:00
Dennis Schubert
cd7fad1f6d
Bump sidekiq 2016-05-12 13:37:57 +02:00
Dennis Schubert
b53fc46658
Bump rails-assets-blueimp-gallery 2016-05-12 13:37:34 +02:00
Dennis Schubert
19d6a94a9c
Bump openid_connect 2016-05-12 13:36:37 +02:00
Dennis Schubert
5284cd2fff
Bump leaflet-rails 2016-05-12 13:36:20 +02:00
Dennis Schubert
c96f34807c
Bump hamlit 2016-05-12 13:35:54 +02:00
Jonne Haß
b4a63e7369
Merge branch 'stable' into develop 2016-05-12 13:34:10 +02:00
Jonne Haß
5378e8c8e7
bump rails-assets-markdown-it 2016-05-12 13:16:38 +02:00
Dennis Schubert
c6a9f38442
Freeze all versions for consistency 2016-05-12 13:16:38 +02:00
Dennis Schubert
7b039da24a
Update Rubocop config 2016-05-12 13:16:37 +02:00
Jonne Haß
0bb6c017f1
bump rubocop 2016-05-12 13:16:37 +02:00
Dennis Schubert
66c6300414
Bump guard-rspec 2016-05-12 13:05:52 +02:00
Dennis Schubert
0fd8102191
Bump guard-cucumber 2016-05-12 13:05:52 +02:00
Dennis Schubert
40d8400669
Bump capybara 2016-05-12 13:05:52 +02:00
Dennis Schubert
d772848338
Bump unicorn 2016-05-12 12:53:39 +02:00
Dennis Schubert
a5533387be
Bump uglifier 2016-05-12 12:40:39 +02:00
Dennis Schubert
ca548ed034
Bump typhoeus 2016-05-12 12:40:39 +02:00
Dennis Schubert
d16f9ef4b4
Bump twitter-text 2016-05-12 12:40:39 +02:00
Dennis Schubert
ac5caadd3d
Bump timecop 2016-05-12 12:40:39 +02:00
Dennis Schubert
241f0d977a
Bump test_after_commit 2016-05-12 12:34:52 +02:00
Dennis Schubert
43d0946769
Bump spring 2016-05-12 12:32:39 +02:00
Dennis Schubert
81779a86e5
Bump rubyzip 2016-05-12 12:30:42 +02:00
Dennis Schubert
ee98a96594
Bump ruby-oembed 2016-05-12 12:28:33 +02:00
Dennis Schubert
04f2f0741a
Bump rspec-instafail 2016-05-12 12:26:57 +02:00
Dennis Schubert
87644862de
Bump responders 2016-05-12 12:26:57 +02:00
Dennis Schubert
bd705bd01f
Bump rails-assets-perfect-scrollbar 2016-05-12 12:26:57 +02:00
Dennis Schubert
a73a9fefa6
Bump rails-assets-highlightjs 2016-05-12 12:24:02 +02:00
Dennis Schubert
8d214e8952
Bump mysql2 2016-05-12 12:21:20 +02:00
Dennis Schubert
b8e3c6cfb1
Bump mini_magick 2016-05-12 12:19:10 +02:00
Dennis Schubert
bb88156592
Bump json-schema 2016-05-12 12:18:29 +02:00
Dennis Schubert
93afbb924c
Bump js-routes 2016-05-12 12:15:42 +02:00
Dennis Schubert
dbe598e194
Bump jquery-rails 2016-05-12 12:15:42 +02:00
Dennis Schubert
6411449567
Bump fog and adapters 2016-05-12 12:15:01 +02:00
Dennis Schubert
7c256018a7
Bump factory_girl_rails 2016-05-12 12:13:32 +02:00
Dennis Schubert
2b45ba67c6
Bump database_cleaner 2016-05-12 12:09:24 +02:00
Dennis Schubert
4c06540f22
Bump carrierwave 2016-05-12 12:09:24 +02:00
Dennis Schubert
b72fd03a31
Bump autoprefixer-rails 2016-05-12 12:06:36 +02:00
Dennis Schubert
02ea344636
Bump activerecord-import 2016-05-12 12:04:43 +02:00
Dennis Schubert
f725349f18
Bump active_model_serializers 2016-05-12 12:04:43 +02:00
Dennis Schubert
f95ccdf979
Bump rails 2016-05-12 12:04:43 +02:00
Lukas Matt
1c5c4f10af
bump diaspora-prosody-config to v0.0.5 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-05-12 00:59:07 +02:00
Dennis Schubert
2131e3425a Merge pull request #6792 from Zauberstuhl/unicorn_killer 
Move unicorn_killer to Gemfile
 2016-05-06 02:13:07 +02:00
Lukas Matt
f0d5ff12a2 Diaspora configuration wrapper for Prosody 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-04-25 15:30:28 +02:00
Lukas Matt
56c7af940d
Move unicorn_killer to Gemfile 2016-04-13 14:41:02 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +02:00
Benjamin Neff
c4ad63d106 bump diaspora_federation 
and bump typhoeus
 2016-03-30 09:45:46 +02:00
Steffen van Bergerem
f06ff01c9e Remove jquery.hotkeys 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
bee08daca6 Remove jquery-elastic 2016-03-04 18:02:22 +01:00
Jonne Haß
e596b1d277 Merge branch 'stable' into develop 2016-03-04 15:05:36 +01:00
Dennis Schubert
92fcbfbede Bump mysql2 2016-03-04 15:00:33 +01:00
Dennis Schubert
e00cbf62ae Bump js_image_paths 2016-03-04 14:53:02 +01:00
Dennis Schubert
558094409b Bump js-routes 2016-03-04 14:53:02 +01:00
Dennis Schubert
5eba267db2 Bump autoprefixer-rails 2016-03-04 14:53:02 +01:00
Dennis Schubert
9af3e957f6 Bump rails 2016-03-04 14:50:07 +01:00
Dennis Schubert
091c426004 Merge pull request #6672 from k0kubun/hamlit 
Use Hamlit to render Haml
 2016-03-01 07:16:25 +01:00
Jonne Haß
086b6e4529 Merge branch 'stable' into develop 2016-02-16 11:19:10 +01:00
Steffen van Bergerem
9eb0dddb1a Speed up asset serving in development 
closes #6702
 2016-02-16 11:19:04 +01:00
Jonne Haß
2a47b889d1 Merge branch 'stable' into develop 2016-02-12 22:18:43 +01:00
Steffen van Bergerem
e66ff6973f Bump markdown-it 
closes #6695
 2016-02-12 22:18:38 +01:00
Dennis Schubert
0ee0b31e5c Bump openid_connect 2016-02-09 22:22:18 +01:00
Steffen van Bergerem
e10f606d7b Merge branch 'stable' into develop 2016-02-09 22:19:14 +01:00
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
Jonne Haß
30c531a6b9 bump devise 2015-09-19 22:37:48 +02:00
Jonne Haß
16a820992b bump database_cleaner 2015-09-19 22:37:47 +02:00
Jonne Haß
f996699aa2 bump sass-rails 2015-09-19 22:37:47 +02:00
Jonne Haß
a333b10805 bump compass-rails 2015-09-19 22:36:39 +02:00
Jonne Haß
8d917742e2 bump capybara 2015-09-19 22:35:25 +02:00
Jonne Haß
7bdb50ad7b bump autoprefixer-rails 2015-09-19 22:33:57 +02:00
Jonne Haß
c7a00018fc Merge branch 'stable' into develop 2015-09-19 11:36:41 +02:00
Benjamin Neff
a40816370e update federation gem to fix #6405 
removed some contraints to support friendica and redmatrix again

closes #6410
 2015-09-19 11:34:27 +02:00
zaziemo
298e195a8f add a map subview 
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813)
 2015-09-09 12:19:38 +02:00
Jonne Haß
3cc475c887 Merge branch 'stable' into develop 2015-08-30 22:34:56 +02:00
Steffen van Bergerem
a01cea0b63 Bump rails_admin 2015-08-30 21:52:52 +02:00
Jonne Haß
1dee542933 Merge branch 'stable' into develop 2015-08-29 17:01:14 +02:00
Jonne Haß
bf92a7441e Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API 2015-08-29 15:58:08 +02:00
Steffen van Bergerem
9446a3ae21 Merge pull request #6301 from AugierLe42e/image-gallery 
Using Blueimp image gallery
 2015-08-27 23:59:46 +02:00
augier
63bfcb7c98 Using Blueimp image gallery 2015-08-27 23:50:20 +02:00
Jonne Haß
d60a87ee85 Merge branch 'stable' into develop 2015-08-27 15:26:11 +02:00
Jonne Haß
f627919fc4 bump uglifier 2015-08-27 15:24:18 +02:00
Jonne Haß
8816c7bc84 Bump Rails to 4.2.4 2015-08-27 05:19:59 +02:00
Jonne Haß
41b4234ecb Bump Rails to 4.2.4 2015-08-25 01:14:48 +02:00
Jonne Haß
a7b854e743 add haml-lint 2015-08-23 13:21:53 +02:00
Jonne Haß
515d2ba9d5 Merge branch 'stable' into develop 2015-08-22 21:53:19 +02:00
Lukas Matt
f44bb613b9 bump diaspora-vines to v0.2.0-develop 
closes #6338

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-08-22 21:51:42 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
65b056341c update federation gem 2015-08-21 14:21:42 +02:00
Lukas Matt
bfcb1c3c88 bump diaspora_jsxc to v0.1.4-develop 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-08-21 13:04:38 +02:00
Lukas Matt
afde20f638 bump diaspora_jsxc to v0.1.4.alpha 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-08-21 13:01:32 +02:00
Jonne Haß
7714b83a72 Merge branch 'stable' into develop 2015-08-20 00:21:33 +02:00
Lukas Matt
5dd3675258 bump diaspora-vines to v0.1.28 
closes #6329

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-08-20 00:20:04 +02:00
Jonne Haß
b4923cc17c Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc 
bump diaspora_jsxc to v0.1.2
 2015-08-19 10:18:22 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Lukas Matt
c95164a7e9 bump diaspora_jsxc to v0.1.3 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-07-31 00:36:38 +02:00
Jonne Haß
18413fe3c9 bump bootstrap-sass 2015-07-30 05:10:02 +02:00
Jonne Haß
1c62bab271 bump pg 2015-07-30 05:08:31 +02:00
Dennis Schubert
2a55578cf2 Merge branch 'stable' into develop 2015-07-30 05:07:47 +02:00
Jonne Haß
f506258324 bump timecop 2015-07-30 05:03:08 +02:00
Jonne Haß
3f39555223 bump gon 2015-07-30 05:03:08 +02:00
Jonne Haß
2280edaa85 bump devise_lastseenable 2015-07-30 05:03:08 +02:00
Jonne Haß
7f0d178092 bump selenium-webdriver 2015-07-30 05:02:54 +02:00
Jonne Haß
abb42ec2a1 bump guard 2015-07-30 04:51:58 +02:00
Jonne Haß
6042247766 bump sidekiq 2015-07-30 04:51:58 +02:00
Jonne Haß
2ceef872bd bump rubocop 2015-07-30 04:51:58 +02:00
Jonne Haß
f64f5ac72e bump rspec-rails 2015-07-30 04:49:58 +02:00
Jonne Haß
5fc465155b bump rails-assets-perfect-scrollbar 2015-07-30 04:49:58 +02:00
Jonne Haß
3506e92594 bump fog 2015-07-30 04:45:53 +02:00
Jonne Haß
41ef70202e bump faraday_middleware 2015-07-30 04:45:53 +02:00
Jonne Haß
dd1349f69b bump autoprefixer-rails 2015-07-30 04:45:53 +02:00
Jonne Haß
bcd3cf1c77 bump activerecord-import 2015-07-30 04:44:19 +02:00
Jonne Haß
4abc0c5988 Merge branch 'stable' into develop 2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465 Update backbone.js 
closes #6262
 2015-07-29 10:04:18 +02:00
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Dennis Schubert
b4bc7d8198 Merge branch 'stable' into develop 2015-07-20 03:56:59 +02:00
Steffen van Bergerem
b707ec9622 Update jasmine-ajax 2015-07-20 03:52:03 +02:00
Steffen van Bergerem
cf4143f4a1 Remove jquery-idletimer 2015-07-20 03:51:03 +02:00
Steffen van Bergerem
aa75572815 Update perfect-scrollbar 2015-07-20 03:44:48 +02:00
Steffen van Bergerem
7a8269ce05 Update jquery-placeholder 2015-07-20 03:42:58 +02:00
Steffen van Bergerem
60e3b0c55f Update highlightjs 2015-07-20 03:39:08 +02:00
Steffen van Bergerem
032e292e82 Update markdown-it 2015-07-20 03:39:08 +02:00
Jonne Haß
99aa354052 Merge branch 'stable' into develop 2015-07-16 10:47:36 +02:00
Dennis Schubert
e7a2775cb5 Bump redcarpet 2015-07-16 10:45:32 +02:00
Dennis Schubert
0401de0e8a Merge branch 'stable' into develop 2015-07-15 01:38:45 +02:00
Benjamin Neff
0c8651d703 fix federation-gem for ruby 2.0 2015-07-15 01:33:36 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-14 05:50:26 +02:00
Dennis Schubert
6b6bf84598 Merge pull request #6151 from SuperTux88/federation-gem 
Federation Gem Step 1: Webfinger/HCard generation
 2015-07-12 17:02:23 +02:00
Jonne Haß
c538cc22d7 Add pronto for easier local code linting [ci skip] 
Run with bin/pronto run --commit=develop inside your feature branch
 2015-07-11 13:25:05 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-10 01:46:48 +02:00
Steffen van Bergerem
b89fabc2ec Update entypo-rails 2015-07-03 12:12:07 +02:00
Jonne Haß
6855095e7b Merge branch 'stable' into develop 2015-06-30 23:30:14 +02:00
Steffen van Bergerem
4cda8675e6 Update markdown-it 
closes #6150
 2015-06-30 23:30:04 +02:00
Jonne Haß
070e785714 bump rails 
closes #6140
 2015-06-27 04:38:25 +02:00
Dennis Schubert
4b1cd5b2fa Merge branch 'stable' into develop 2015-06-27 04:37:10 +02:00
Jonne Haß
8b6f487874 bump rails 
closes #6140
 2015-06-27 04:36:36 +02:00
Jonne Haß
21fe65bc02 bump bootstrap-sass 2015-06-24 04:01:22 +02:00
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79 
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
 2015-06-24 04:01:15 +02:00
Dennis Schubert
caf565681c Merge branch 'stable' into develop 2015-06-24 04:01:04 +02:00
Jonne Haß
e8bcaf98ca bump sidekiq 2015-06-24 04:00:13 +02:00
Jonne Haß
4307e9b53a bump typhoeus 2015-06-24 04:00:09 +02:00
Jonne Haß
d7b8251503 bump sinon-rails 2015-06-24 04:00:00 +02:00
Jonne Haß
b5413f1050 bump rails_admin 2015-06-24 03:59:56 +02:00
Jonne Haß
9032059535 bump uuid 2015-06-24 03:56:30 +02:00
Jonne Haß
97dd149aa0 bump timecop 2015-06-24 03:56:25 +02:00
Jonne Haß
403f49cd50 bump spring 2015-06-24 03:56:18 +02:00
Jonne Haß
1d1a23c74e bump rubocop 2015-06-24 03:56:12 +02:00
Jonne Haß
ccb183c42c bump rspec-rails 2015-06-24 03:56:08 +02:00
Jonne Haß
cb0dd55355 bump redcarpet 2015-06-24 03:56:00 +02:00
Jonne Haß
e0966d0f48 bump rb-fsevent 2015-06-24 03:55:55 +02:00
Jonne Haß
4365c5935e bump mini_magick 2015-06-24 03:55:42 +02:00
Jonne Haß
fbbeffb645 bump json 2015-06-24 03:55:38 +02:00
Jonne Haß
da49bb2946 bump jquery-ui-rails 2015-06-24 03:55:33 +02:00
Jonne Haß
66c5280c61 bump handlebars_assets 2015-06-24 03:55:25 +02:00
Jonne Haß
4c525abe02 bump guard 2015-06-24 03:54:46 +02:00
Jonne Haß
54dabe446f bump fog 2015-06-24 03:54:39 +02:00
Jonne Haß
99c809deca bump devise 2015-06-24 03:54:35 +02:00
Jonne Haß
8e60fa33eb bump autoprefixer-rails 2015-06-24 03:54:26 +02:00
Jonne Haß
7cfc960a60 bump activerecord-import 2015-06-24 03:54:03 +02:00
Jonne Haß
7a3b66c44f bump pg 2015-06-24 03:53:39 +02:00
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
Jonne Haß
319edd70ad bump backbone-on-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
16562d6d36 bump autoprefixer-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
55fdf51058 bump addressable 2015-05-07 22:55:35 +02:00
Dennis Schubert
642c4597e1 Merge branch 'stable' into develop 2015-05-07 04:03:57 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions 
closes #5934
 2015-05-07 04:03:43 +02:00
Dennis Schubert
17fbbeea69 Merge branch 'stable' into develop 2015-05-04 23:43:58 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader 
It now returns the origin for a missing og:url
 2015-05-04 23:43:53 +02:00
Jonne Haß
3fadcfa568 Merge branch 'stable' into develop 2015-05-04 15:14:41 +02:00
Jonne Haß
28ee47d6c9 bump sidekiq 2015-05-04 14:22:57 +02:00
Jonne Haß
bb14128052 bump ruby-oembed 2015-05-04 14:22:57 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
381e4978d9 Merge pull request #5909 from svbergerem/update-jasmine 
Update jasmine
 2015-05-04 03:53:54 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Steffen van Bergerem
c64c4114ac Update jquery-rails 2015-05-04 03:42:36 +02:00
Steffen van Bergerem
19a19919bb Update jasmine 2015-05-02 16:46:30 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Steffen van Bergerem
fc8e92b67a Bump markdown-it 2015-04-20 22:06:00 +02:00
Dennis Schubert
cfc98d9a2a Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC 2015-04-11 20:15:10 +02:00
Dennis Schubert
9fc00d0814 Bump Redcarpet to fix OSVDB-120415 2015-04-11 19:51:18 +02:00
Steffen van Bergerem
ba67196f5b Bump markdown-it 2015-04-01 00:59:13 +02:00
Steffen van Bergerem
adf9bcf8e8 Update markdown-it 2015-03-26 00:07:25 +01:00
Jonne Haß
ea58c95fa0 Switch back to database cleaner 
database_rewinder seems to cause deadlocks in postgres and other
subtle bugs for us.
 2015-03-25 13:37:56 +01:00
Jonne Haß
3b1e93cb30 bump test_after_commit 2015-03-25 02:33:57 +01:00
Jonne Haß
d1c42c77ba bump sinatra 2015-03-25 02:33:57 +01:00
Jonne Haß
80957a769f bump sidekiq 2015-03-25 02:33:57 +01:00
Jonne Haß
65a738e604 bump rspec-rails 2015-03-25 02:33:56 +01:00
Jonne Haß
03680ef718 bump rails_admin 2015-03-25 02:08:44 +01:00
Jonne Haß
ae93a1eef2 bump rails-assets-jasmine-ajax 2015-03-24 22:15:40 +01:00
Jonne Haß
38b1f792a4 bump mini_magick 2015-03-24 22:13:33 +01:00
Jonne Haß
9f6ca586a1 bump guard 2015-03-24 22:12:51 +01:00
Jonne Haß
f0b7d68399 bump autoprefixer-rails 2015-03-24 22:11:08 +01:00
Jonne Haß
a30295dcc6 bump acts-as-taggable-on 2015-03-24 22:06:02 +01:00
Jonne Haß
451c4c2f57 use explicit source for rails-assets.org gems 2015-03-24 18:55:04 +01:00
Jonne Haß
644fc46dee Merge pull request #5792 from MothOnMars/4020-role-specs 
added specs and validations for Role model
 2015-03-20 01:54:04 +01:00
Jonne Haß
0226cb9542 Merge pull request #5802 from jhass/rails42 
bump to rails 4.2.1
 2015-03-20 01:52:19 +01:00
Jonne Haß
9d85c488e3 bump to rails 4.2.1 2015-03-19 18:39:17 +01:00
Martha
d4f1a5dbe8 added specs and validations for Role model 
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
 2015-03-18 09:16:15 -07:00
Steffen van Bergerem
6d070c818c Use jshintrb and guard-jshintrb instead of jshint 2015-03-18 10:49:17 +01:00
Jonne Haß
dcfe9757aa make Gemfile offence free 2015-03-16 12:50:05 +01:00
Jonne Haß
69285b955c Enable Ruby linting 
* Add Rubocop
* Add guard-rubocop
* Enable Ruby linting on Hound
 2015-03-16 12:46:13 +01:00
Jonne Haß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00
Jonne Haß
679eca6f03 Bump jsxc 2015-03-08 23:04:52 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
Jonne Haß
0f2d2bd44d Replace DatabaseCleaner with DatabaseRewinder 2015-03-02 15:02:57 +01:00
Steffen van Bergerem
687cbf4954 Update markdown-it-diaspora-mention and markdown-it-sanitizer 2015-02-28 05:21:58 +01:00
Jonne Haß
95ba640e1b bump handlebars_assets 2015-02-28 02:36:14 +01:00
Jonne Haß
1b0cf2d11f bump compass & sass 2015-02-28 02:36:14 +01:00
Jonne Haß
9867f637ef bump autoprefixer-rails 2015-02-28 02:36:14 +01:00
Jonne Haß
84c61b4879 bump uglifier 2015-02-28 02:36:13 +01:00
Jonne Haß
fe6f1dbf54 bump typhoeus 2015-02-28 02:36:13 +01:00
Jonne Haß
eaa5c7f361 bump twitter-text 2015-02-28 02:36:13 +01:00
Jonne Haß
fb2f6e908a bump timecop 2015-02-28 02:36:13 +01:00
Jonne Haß
011235ea82 bump spring 2015-02-28 02:36:13 +01:00
Jonne Haß
ae97c140f5 bump simple_captcha2 2015-02-28 02:36:13 +01:00
Jonne Haß
2b9a2976f0 bump sidekiq 2015-02-28 02:36:13 +01:00
Jonne Haß
0d4c2d95c1 bump selenium-webdriver 2015-02-28 02:36:13 +01:00
Jonne Haß
987281270a bump ruby-oembed 2015-02-28 02:36:13 +01:00
Jonne Haß
77f4be4401 bump rspec-instafail 2015-02-28 01:40:05 +01:00
Jonne Haß
a4e8b1aca2 bump responders 2015-02-28 01:40:04 +01:00
Jonne Haß
5f3b6533d9 bump redcarpet 2015-02-28 01:40:04 +01:00
Jonne Haß
f5a0d77e2a bump rails_admin 2015-02-28 01:40:04 +01:00
Jonne Haß
fb4f3c3066 bump rails-i18n 2015-02-28 01:40:04 +01:00
Jonne Haß
33aeef2654 bump rails-assets-perfect-scrollbar 2015-02-28 01:40:03 +01:00
Jonne Haß
460779a234 bump rails-assets-jquery-placeholder 2015-02-28 01:40:03 +01:00
Jonne Haß
34044c4c75 bump rack-rewrite 2015-02-28 01:40:03 +01:00
Jonne Haß
3b3702cf4f bump rack-protection 2015-02-28 01:40:02 +01:00
Jonne Haß
07a17a8aa5 bump rack-cors 2015-02-28 01:40:02 +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
Jonne Haß
6790232960 bump pg 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ß
2d7399de28 Bump activerecord-import 2015-02-27 16:58:39 +01:00
Jonne Haß
b53ce9a51d Bump Rails to 4.2 2015-02-27 16:58:38 +01:00
Lukas Matt
94f73be7d9 bump Vines to v0.1.27 and Jsxc to v0.0.12 2015-02-25 00:11:01 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
e9179e33ea bump spring 2015-02-13 00:32:50 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
5f4f32f2cf Update jasmine 2015-02-10 19:28:52 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins 
activate sanitizer, sub and sup
 2015-01-13 03:41:06 +01:00
Steffen van Bergerem
0d9fd0aaac Bump markdown-it-hashtag to v0.2.3 2015-01-11 18:17:17 +01:00
Steffen van Bergerem
d692e6df7d Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2 2015-01-11 02:54:30 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02:00
Dumitru Ursu
4ba1032f42 Add autoprefixer 2015-01-07 13:02:53 +02:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Jonne Haß
e25a48cc1c Bump open_graph_reader 2014-12-14 16:55:30 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader 
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
 2014-12-08 02:01:31 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs 
Spring is the recommended application preloader for rails
 2014-12-01 08:06:07 +01:00
Jonne Haß
850c98cbf7 bump sinatra 2014-11-29 16:24:50 +01:00
Jonne Haß
c0aa5565cc Merge pull request #5403 from pravi/bump_rack-protection 
bump sinatra to 1.4.5 and rack-protection to 1.4
 2014-11-29 16:17:56 +01:00
Jonne Haß
04b000232f Merge pull request #5427 from axilleas/minitest_to_gemfile 
Add minitest to Gemfile
 2014-11-29 15:33:18 +01:00
Praveen Arimbrathodiyil
9165b94522 bump rack-protection to 1.5.2 2014-11-28 23:05:16 +05:30
Lukas Matt
2e89b70967 bump jsxc to v0.0.9 2014-11-26 19:30:49 +01:00
Achilleas Pipinellis
e88b154ff3 Add minitest to Gemfile. 
In order to use the system Fedora/EPEL ruby we need to install
minitest in production. See comments in Gemfile.
 2014-11-26 17:25:56 +02:00
Jonne Haß
10f3a071c5 Merge pull request #5420 from diaspora/update_gems 
Update gems

Conflicts:
	Gemfile.lock
 2014-11-24 23:02:50 +01:00
Lukas Matt
77ce94db40 bump jsxc to version 0.0.8 2014-11-24 19:12:05 +01:00
Jonne Haß
c305293314 bump mini_magick 2014-11-24 16:51:45 +01:00
Jonne Haß
5622f72420 bump jasmine 2014-11-24 16:44:39 +01:00
Jonne Haß
c2e355fce9 bump guard 2014-11-24 16:43:00 +01:00
Jonne Haß
64b9a4769b bump fog 2014-11-24 16:38:38 +01:00
Jonne Haß
3d757abf6d bump mysql2 2014-11-24 16:34:37 +01:00
Jonne Haß
dca06ae075 bump sidekiq 2014-11-24 16:31:22 +01:00
Jonne Haß
e4f68acf0a bump rails 2014-11-24 16:29:41 +01:00
Praveen Arimbrathodiyil
91c7020003 bump sidekiq to 3.2.6 
From upstream changelog,

    Deprecate delay extension for ActionMailer 4.2+ . [seuros, #1933]
    Poll interval tuning now accounts for dead processes [epchris, #1984]
    Add non-production environment to Web UI page titles [JacobEvelyn, #2004]

Debian already have 3.2.6 and I'd like to keep both versions in sync.
 2014-11-17 15:40:02 +05:30
Lukas Matt
78100c6fb2 Add vines, jsxc and devise token dependencies 2014-11-13 11:15:30 +01:00
Jonne Haß
e0a2c6438a lock down guard until all plugins updated 2014-11-09 20:18:14 +01:00
Jonne Haß
e965db534f bump webmock 2014-11-09 19:35:18 +01:00
Jonne Haß
62a7b130a2 bump twitter-text 2014-11-09 19:34:19 +01:00
Jonne Haß
791feab474 bump test_after_commit 2014-11-09 19:33:49 +01:00
Jonne Haß
7fc022a9b9 bump selenium-webdriver 2014-11-09 19:33:26 +01:00
Jonne Haß
fceba693f6 bump ruby-oembed 2014-11-09 19:33:04 +01:00
Jonne Haß
0a33a5f95a bump rails-assets-punycode 2014-11-09 19:32:39 +01:00
Jonne Haß
abe0629c02 bump rails-assets-perfect-scrollbar 2014-11-09 19:31:26 +01:00
Jonne Haß
9d967e9585 bump nokogiri 2014-11-09 19:30:52 +01:00
Jonne Haß
96c7624d82 bump guard-cucumber 2014-11-09 19:26:47 +01:00
Jonne Haß
a050d1bbba bump gon 2014-11-09 19:26:03 +01:00
Jonne Haß
0bd6ecd666 bump factory_girl_rails 2014-11-09 19:25:14 +01:00
Jonne Haß
f42d519e51 bump devise 2014-11-09 19:24:23 +01:00
Jonne Haß
f890121b8f bump sass-rails 2014-11-09 19:23:21 +01:00
Jonne Haß
aab1e4b5b1 Merge branch 'hotfix/0.4.1.2' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2014-10-30 21:36:46 +01:00
Jonne Haß
7000f39881 bump Rails to fix CVE-2014-7818 2014-10-30 21:29:16 +01:00
Sandip Trivedi
722112314b Replaced jquery.hotkeys.js vendored asset with a bower package #5194 2014-10-23 01:12:26 -04:00
Jonne Haß
f361a0f885 Merge pull request #5288 from jaywink/remove-old-users 
Maintenance feature to remove old users, scheduled in settings
 2014-10-17 01:00:51 +02:00
Augier
2ce98b49d7 Fix issue #4416 
Conflicts:
	spec/helpers/notifier_helper_spec.rb
 2014-10-16 23:27:48 +02:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
673f14e050 Revert "bump rails-timeago" 
This reverts commit bea94bd7b5.
 2014-10-14 16:12:27 +02:00
Jonne Haß
67bf4de895 bump webmock 2014-10-14 14:07:28 +02:00
Jonne Haß
2dbc20522f bump test_after_commit 2014-10-14 14:07:06 +02:00
Jonne Haß
bea94bd7b5 bump rails-timeago 2014-10-14 14:05:38 +02:00
Jonne Haß
94f5f59872 bump rails-assets-perfect-scrollbar 2014-10-14 14:05:12 +02:00
Jonne Haß
b6caef127f bump jasmine 2014-10-14 14:04:04 +02:00
Jonne Haß
1c35921e3c bump fog 2014-10-14 14:03:48 +02:00
Jonne Haß
0c5c737a38 bump cucumber-rails 2014-10-14 14:03:26 +02:00
Jonne Haß
e5189cf457 bump devise 2014-10-14 14:01:10 +02:00
Jonne Haß
995d3f900a bump capybara 2014-10-14 14:00:32 +02:00
Jonne Haß
2bc0fa5a6e bump backbone-on-rails 2014-10-14 14:00:05 +02:00
Jonne Haß
18b7a75b36 bump activerecord-import 2014-10-14 13:58:29 +02:00
Jonne Haß
9a8b1359e9 bump rails_admin 2014-10-14 13:57:27 +02:00
Jonne Haß
e86f76ea8c bump redcarpet, closes #4549 2014-10-14 13:46:27 +02:00
Sandip Trivedi
fce957443e Update jquery.idle-timer.js from 0.9.3 to 1.0.1 #5194 2014-10-08 00:10:42 -04:00
Sandip Trivedi
215fc1c96b Replaced jquery.idle-timer.js vendored asset with a bower package #5194 2014-10-08 00:00:14 -04:00
Sandip Trivedi
eb916f2690 Update jquery.placeholder.js from 1.8.7 to 2.0.8 #5194 2014-10-07 00:56:37 -04:00
Sandip Trivedi
2af32220a5 Replaced jquery.placeholder.js vendored asset with a bower package #5194 2014-10-07 00:46:24 -04:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Sandip Trivedi
10feffada4 Replaced punycode.js vendored asset with a bower package #5194 2014-09-30 16:16:52 -04:00
Jonne Haß
4a87e7d72e bump acts-as-taggable-on, closes #5228, #5234 2014-09-29 16:10:51 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
430d5bd2e9 bump configurate 2014-09-26 22:14:09 +02:00
Florian Staudacher
9a16560d8d * rename profile header view to make name more accurate 
* include 'js-routes' for rails routes in javascript
  (TODO: config options?)
* add handlebars helper for rails routes
 2014-09-15 01:37:23 +02:00
Jonne Haß
52f3e8d01d bump test_after_commit 2014-09-12 23:55:21 +02:00
Jonne Haß
f3d980ba5d bump sidekiq 2014-09-12 23:55:21 +02:00
Jonne Haß
743fc70999 bump selenium-webdriver 2014-09-12 23:55:21 +02:00
Jonne Haß
ba70f2293e bump mini_magick 2014-09-12 21:57:00 +02:00
Jonne Haß
a6ad721b8e bump handlebars_assets 2014-09-12 21:52:43 +02:00
Jonne Haß
9f125058f7 bump rails 2014-09-12 21:49:09 +02:00
Jonne Haß
c225bb17ce add pry and pry-debundle to the Gemfile 
If you now install pry-byebug and pry-stackexplorer,
you'll get a nice debugger
 2014-09-06 23:13:53 +02:00
Jonne Haß
fb058609e3 bump test_after_commit 2014-09-06 00:17:36 +02:00
Jonne Haß
3a7b0db67b bump rails-i18n 2014-09-05 23:52:17 +02:00
Jonne Haß
ef501f755c bump jquery-rails 2014-09-05 23:51:33 +02:00
Jonne Haß
9870069c56 bump rspec 2014-09-05 23:46:56 +02:00
Jonne Haß
f3ad3c93a3 Merge pull request #5190 from jhass/bump_handlebars 
bump handlebars_assets

Conflicts:
	Gemfile
 2014-09-01 13:53:16 +02:00
Jonne Haß
7c6776c280 bump jquery-rails 2014-09-01 12:15:01 +02:00
Jonne Haß
5da86def06 bump handlebars_assets 2014-09-01 11:44:34 +02:00
Jonne Haß
1a5bcec394 bump omniauth 2014-09-01 11:11:06 +02:00
Jonne Haß
7508300193 bump sidekiq 2014-09-01 11:03:53 +02:00
Jonne Haß
ef1cbda8c9 bump acts-as-taggable-on 2014-09-01 11:02:48 +02:00
Jonne Haß
2b2f4e44e5 bump sidekiq 2014-08-31 00:11:23 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere 
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
 2014-08-28 21:04:29 +02:00
Jonne Haß
6fef1cf990 bump gon 2014-08-27 18:32:50 +02:00
khall
087dbd4acf Bumping rspec to 3.0.2 2014-08-26 17:12:21 -07:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
Jonne Haß
00de34ba38 Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications 
Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
 2014-08-26 02:06:55 +02:00
jaideng123
b70f306ff5 Integrated Perfect Scrollbar into notifications dropdown 2014-08-25 15:33:25 -05:00
Jonne Haß
ef214d7681 bump http_accept_language 2014-08-25 22:06:28 +02:00
Jonne Haß
5ffbafa56a bump rack-google-analytics 2014-08-25 21:49:46 +02:00
Jonne Haß
eb3fbc35b2 bump rails-timeago 2014-08-25 21:40:15 +02:00
Jonne Haß
37f062c07f bump sinon-rails 2014-08-25 21:39:52 +02:00
Jonne Haß
b34fe4199b bump simple_captcha2 2014-08-25 19:20:50 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
Jonne Haß
67331a7371 bump rails_autolink 2014-08-25 19:16:54 +02:00
Jonne Haß
4da21d02db bump will_paginate 2014-08-25 19:16:54 +02:00
Jonne Haß
4415d91aa6 bump uglifier 2014-08-25 19:16:51 +02:00
Jonne Haß
b3f18e1961 bump typhoeus 2014-08-25 19:16:22 +02:00
Jonne Haß
5fa8d7c44c bump test_after_commit 2014-08-25 19:15:30 +02:00
Jonne Haß
a974f281e8 bump ruby-oembed 2014-08-25 19:15:30 +02:00
Jonne Haß
02bb317df0 bump rspec-instafail 2014-08-25 19:15:29 +02:00
Jonne Haß
3fc8be03af bump rb-inotify 2014-08-25 19:15:29 +02:00
Jonne Haß
6c0ee4c78d bump rails_admin 2014-08-25 19:15:29 +02:00
Jonne Haß
9cd0100090 bump rack-piwik 2014-08-25 19:15:29 +02:00
Jonne Haß
047a05f74c bump mini_magick 2014-08-25 19:15:29 +02:00
Jonne Haß
59d1076e31 bump guard-rspec 2014-08-25 19:15:29 +02:00
Jonne Haß
ebf43c1956 bump gon 2014-08-25 19:15:29 +02:00
Jonne Haß
b0bf570cd9 bump fog 2014-08-25 19:15:29 +02:00
Jonne Haß
25f117f8d8 bump devise 2014-08-25 19:15:29 +02:00
Jonne Haß
168aa26306 bump asset_sync 2014-08-25 19:15:27 +02:00
Jonne Haß
d745d621f8 bump acts-as-taggable-on 2014-08-25 19:14:50 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
Jonne Haß
e0c836c03d bump rails 2014-08-24 16:03:50 +02:00
Jonne Haß
2361b8e00f bump capybara and phantomjs 2014-08-24 01:57:49 +02:00
Jonne Haß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +02:00
Jonne Haß
68affd5dd1 bump entypo-rails 2014-08-24 01:02:35 +02:00
Jonne Haß
3fadba0430 update rails and compass-rails after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
5068be90e8 reduce cuke failures 
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
 2014-08-23 16:47:57 +02:00
Jonne Haß
38e5ae2b73 bump rails_admin 2014-08-23 16:47:57 +02:00
Jonne Haß
8d1b611f88 bump jasmine-jquery-rails 2014-08-23 16:47:57 +02:00
Jonne Haß
b671509184 bump jasmine 2014-08-23 16:47:57 +02:00
Jonne Haß
e9ab6dc1e6 bump rack-ssl 2014-08-23 16:47:57 +02:00
Jonne Haß
c856fb459a bump rails-i18n 2014-08-23 16:47:57 +02:00
Jonne Haß
c506276c73 bump activerecord-import 2014-08-23 16:47:57 +02:00
Jonne Haß
61c72b44e9 update rails to 4.0.5 2014-08-23 16:47:56 +02:00
Florian Staudacher
d4aca571ac add jasmine-jquery gem and use it, port some more specs 2014-08-23 16:46:08 +02:00
Jonne Haß
7fd2294111 switch to simple_captcha2 2014-08-23 16:38:50 +02:00
Jonne Haß
55f40a2b65 update to rails 4 2014-08-23 16:33:53 +02:00
Jonne Haß
58927d1a9d bump sidekiq to 2.17.7 2014-08-23 16:03:17 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02:00
Jonne Haß
e4246b6fdd Bump Rails to 3.2.19 
Rails 3.2.19 fixes a possible SQL-Injection when using the PostgreSQL
adapter. However this is only exploitable when using the "bit" type,
which we don't.
 2014-07-02 22:17:21 +02:00
Jonne Haß
ccae3a1c64 lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jonne Haß
e5f8b5fc57 bump sinon-rails 2014-06-01 13:55:59 +02:00
Jonne Haß
34fc681bc4 lock rails-timeago to 2.4.0 2014-06-01 13:55:59 +02:00
Jonne Haß
e3fd3520f2 bump webmock 2014-06-01 13:55:59 +02:00
Jonne Haß
55f496cb66 bump unicorn 2014-06-01 13:55:59 +02:00
Jonne Haß
38ee2f5faf bump uglifier 2014-06-01 13:55:58 +02:00
Jonne Haß
dda4e52aac bump typhoeus 2014-06-01 13:55:58 +02:00
Jonne Haß
50778e5b8b bump test_after_commit 2014-06-01 13:55:58 +02:00
Jonne Haß
91eb92180b bump strong_parameters 2014-06-01 13:55:58 +02:00
Jonne Haß
48a38231af bump selenium-webdriver 2014-06-01 13:55:58 +02:00
Jonne Haß
bc9eaed382 bump rspec-rails 2014-06-01 13:55:58 +02:00
Jonne Haß
4aaeb5f40f bump redcarpet 2014-06-01 13:55:57 +02:00
Jonne Haß
bc6ac28841 bump rb-inotify 2014-06-01 13:55:57 +02:00
Jonne Haß
08610f1b52 bump rack-cors 2014-06-01 13:55:57 +02:00
Jonne Haß
b749603d1e bump omniauth-wordpress 2014-06-01 13:55:57 +02:00
Jonne Haß
ef62fb8c89 bump omniauth 2014-06-01 13:55:57 +02:00
Jonne Haß
75107080c4 bump nokogiri 2014-06-01 13:55:57 +02:00
Jonne Haß
c25705a7e3 bump mysql2 2014-06-01 13:55:56 +02:00
Jonne Haß
dca5a6d8f3 bump markerb 2014-06-01 13:55:56 +02:00
Jonne Haß
241c584a0d bump guard-rspec 2014-06-01 13:55:56 +02:00
Jonne Haß
bb3fc500b1 bump gon 2014-06-01 13:55:56 +02:00
Jonne Haß
7b3abb1f11 bump fuubar 2014-06-01 13:55:56 +02:00
Jonne Haß
1704d71b22 bump fog 2014-06-01 13:55:51 +02:00
Jonne Haß
e8999332bf bump factory_girl_rails 2014-06-01 13:22:08 +02:00
Jonne Haß
85dc46b0de bump entypo-rails 2014-06-01 13:21:25 +02:00
Jonne Haß
5654d5921f bump devise 2014-06-01 13:20:06 +02:00
Jonne Haß
9f54d40428 bump database_cleaner 2014-06-01 13:19:14 +02:00
Jonne Haß
0ba9df6989 bump cucumber-rails 2014-06-01 13:18:24 +02:00
Jonne Haß
061373d2d4 bump compass-rails 2014-06-01 13:17:59 +02:00
Jonne Haß
cad043bfd7 bump carrierwave 2014-06-01 13:16:43 +02:00
Jonne Haß
f0b6f9315d bump backbone-on-rails 2014-06-01 13:15:16 +02:00
Jonne Haß
418c8d653d bump addressable 2014-06-01 13:11:57 +02:00
Jonne Haß
dcf275442d Update Rails to 3.2.18 
This Rails release closes a security issue but we're not affected by it.
See CVE-2014-0130 for further details.
 2014-05-06 19:10:15 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03:00
Jonne Haß
02ed7144a0 drop rmagick, fixes #4594 
This breaks the screenshot tool.

RMagick no longer compiles on recent ImageMagicks that have HDRI
support enabled.
 2014-04-04 20:41:37 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
8280556a47 Introduce message renderer 
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
 2014-03-15 17:16:17 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
1fd156fd46 bump jquery-rails to 3.0.4 2014-02-23 16:48:46 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking. 
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
 2014-02-22 23:22:46 +02:00
Jonne Haß
57991187d1 Merge branch 'hotfix/0.3.0.3' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-19 11:31:02 +01:00
Jonne Haß
1df3f546c9 update rails to 3.2.17 2014-02-19 11:09:06 +01:00
Ruxton
49800ece87 Moves rails-timeago into the root of Gemfile, it's used in views + assets 2014-01-20 21:25:15 +08:00
Ruxton
a3113cce7c Switched to using rails-timeago to make keeping on top of new versions of plugin easier 2014-01-20 09:33:35 +08:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem 
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
 2014-01-16 23:23:30 +01:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
Jonne Haß
cb048a2785 bump pg 2014-01-13 12:26:57 +01:00
Jonne Haß
25988ff04c bump webmock 2014-01-13 12:26:23 +01:00
Jonne Haß
f107a3145d bump will_paginate 2014-01-13 12:26:22 +01:00
Jonne Haß
84c4e68a73 bump rack-rewrite 2014-01-13 12:26:22 +01:00
Jonne Haß
e712bec498 bump json 2014-01-13 12:26:21 +01:00
Jonne Haß
196bb5e4c1 bump i18n-inflector-rails 2014-01-13 12:25:39 +01:00
Jonne Haß
f7759f2177 bump haml 2014-01-13 12:25:39 +01:00
Jonne Haß
92a153edaf bump guard-rspec 2014-01-13 12:25:39 +01:00
Jonne Haß
d0aa4cee61 bump faraday 2014-01-13 12:25:39 +01:00
Jonne Haß
88cb24fd32 bump acts_as_api 2014-01-13 12:25:39 +01:00
Jonne Haß
cabc6a5c92 bump rails_autolink 2014-01-13 12:25:36 +01:00
Jonne Haß
97d744d6da bump test_after_commit 2014-01-13 12:25:36 +01:00
Jonne Haß
d6878631bf bump capybara 2014-01-13 12:25:36 +01:00
Jonne Haß
b1375fd3f0 bump rack-google-analytics 2014-01-13 12:25:36 +01:00
Jonne Haß
801d4d4617 bump mini_magick 2014-01-13 12:25:35 +01:00
Jonne Haß
b771287893 bump omniauth-twitter 2014-01-13 12:25:35 +01:00
Jonne Haß
b7424b52e2 bump omniauth-facebook 2014-01-13 12:25:32 +01:00
Jonne Haß
56b62b0fa4 bump rb-inotify 2014-01-13 12:23:08 +01:00
Jonne Haß
8591488ad9 bump rb-fsevent 2014-01-13 12:23:08 +01:00
Jonne Haß
ccadcee444 bump spork 2014-01-13 12:23:07 +01:00
Jonne Haß
630a1e5980 bump guard-cucumber 2014-01-13 12:23:07 +01:00
Jonne Haß
52e3da9866 bump fuubar 2014-01-13 12:23:07 +01:00
Jonne Haß
8001a2da66 bump rspec 2014-01-13 12:23:07 +01:00
Jonne Haß
c45a381c36 bump foreigner 2014-01-13 12:23:06 +01:00
Jonne Haß
fbf8cdef2d bump fog 2014-01-13 12:23:06 +01:00
Jonne Haß
716b1af381 bump factory_girl_rails 2014-01-13 12:23:06 +01:00
Jonne Haß
7461cfad8a bump database_cleaner 2014-01-13 12:23:05 +01:00
Jonne Haß
7eb60dfd42 bump cucumber-rails 2014-01-13 12:23:05 +01:00
Jonne Haß
77e989dc8a bump client_side_validations 2014-01-13 12:23:05 +01:00
Jonne Haß
b1c9cec265 bump unicorn 2014-01-13 12:23:05 +01:00
Jonne Haß
9be498bce8 bump nokogiri 2014-01-12 23:27:16 +01:00
Jonne Haß
358076c14f bump mobile-fu 2014-01-12 23:27:16 +01:00
Jonne Haß
d706932db0 bump mysql2 2014-01-12 23:27:16 +01:00
Jonne Haß
4648654e03 bump typhoeus 2014-01-12 23:27:16 +01:00
Jonne Haß
ab7cbcc4cc bump timecop 2014-01-12 23:27:16 +01:00
Jonne Haß
4339d69f1e bump sidekiq 2014-01-12 23:27:16 +01:00
Jonne Haß
0db8086916 Add compatibility layer for old rubyzip 
https://github.com/rubyzip/rubyzip#important-note
 2014-01-12 23:27:15 +01:00
Fabian Rodriguez
08acd6e5bf bump Timecop 
Time.now remains the same inside the block, outside of the block it
returns
 2014-01-12 23:27:15 +01:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
flaburgan
3174310ba0 Bump selenium, close #4621 2014-01-03 23:12:26 +01:00
Jonne Haß
a9e52528c1 bump sidekiq 2013-12-08 14:03:08 +01:00
Fabian Rodriguez
c339090f6e Merge branch 'release/0.2.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-12-05 09:11:41 -02:00
Fabian Rodriguez
740c0bc082 bump Rails to version 3.2.16 2013-12-04 21:36:54 -02:00
Jonne Haß
ad20a8487b bump ruby-oembed 2013-09-19 23:39:13 +02:00
Roger Braun
44ee6b4892 User entypo font for large icons.. 2013-08-22 09:56:35 +02:00
Jonne Haß
9b92d6a10a bump devise to 3.0.2 2013-08-10 15:42:06 +02:00
Jonne Haß
769bc5ce90 update devise to 2.2.4 2013-08-08 15:40:46 +02:00
Jonne Haß
884cead57e bump selenium-webdriver, closes #4367 2013-08-08 09:53:09 +02:00
Andrew Smith
ffca9776d5 Bumped oauth-wordpress gem to 0.2.0 for compatability 2013-08-05 08:21:27 -07:00
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service 
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
 2013-08-04 17:15:39 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality, 
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
 2013-08-04 07:46:56 -07:00
Fábián Tamás László
0a4b58ac12 rspec test for GatherOpenGraphData worker 
Added rspec test for og in status_message model

Added rspec test for og_html helper

Improved tests for opengraph embedding
 2013-08-04 15:47:09 +02:00
Tamas Laszlo Fabian
22c644c2ae Replaced opengraph with opengraph_parser 
Code style fixes
 2013-08-04 15:44:58 +02:00
Fábián Tamás László
176c6826e0 opengraph POC 
Fixed small-frame opengraph view

Fixed incompletely saved OpenGraphCache bug
 2013-08-04 15:42:29 +02:00
James Fleming
9ca9a6f310 Remove duplicates and bad code habits. 
Remove some blank line.

Do not chain bang methods.
 2013-08-02 11:39:24 +02:00
carolina
143a970e61 Added strong_parameters gem to Gemfile and created an initializer in config 2013-08-02 11:39:05 +02:00
James Fleming
2a57f4851a Install strong_parameters 2013-08-02 10:09:04 +02:00
Jonne Haß
dd9e563322 bump sinon-rails 2013-08-01 23:20:07 +02:00
Jonne Haß
5119759bcf bump uglifier 2013-08-01 23:20:07 +02:00
Jonne Haß
f8cb203c87 bump database_cleaner 2013-08-01 23:20:07 +02:00
Jonne Haß
af749b2a72 bump redcarpet 2013-08-01 22:21:50 +02:00
Jonne Haß
f85f7e0840 bump mysql2 2013-08-01 22:21:50 +02:00
Jonne Haß
b5c2578af5 bump pg 2013-08-01 22:21:50 +02:00
Jonne Haß
f5015f27a7 bump nokogiri 2013-08-01 22:21:50 +02:00
Jonne Haß
6d53f989f3 bump fog 2013-08-01 22:21:50 +02:00
Jonne Haß
bbe8f6373c bump faraday 2013-08-01 22:21:49 +02:00
Jonne Haß
b22cb395b7 bump asset_sync 2013-08-01 22:21:49 +02:00
Jonne Haß
1bb2485c33 bump webmock 2013-08-01 21:59:36 +02:00
Jonne Haß
a3dba71809 bump foreigner 2013-08-01 21:59:36 +02:00
Jonne Haß
2fcc6bfc5a bump fixture_builder 2013-08-01 21:59:36 +02:00
Jonne Haß
3c9e3853e8 bump addressable 2013-08-01 21:59:36 +02:00
Jonne Haß
d113538171 bump remotipart 2013-08-01 21:59:36 +02:00
Jonne Haß
e3de9ad52d bump guard 2013-08-01 21:59:36 +02:00
Jonne Haß
70d1384cb1 bump omniauth-twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
b2e7eb4e2b bump twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
f76cd9c596 bump rails-i18n 2013-08-01 17:54:55 +02:00
Jonne Haß
beda9b2a1a bump carrierwave 2013-08-01 17:54:55 +02:00
Jonne Haß
6672b1c941 bump unicorn 2013-08-01 17:53:50 +02:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Jonne Haß
6720f6b3f7 bump fuubar 2013-06-12 00:23:47 +02:00
Jonne Haß
178b92d8ad bump rack-cors 2013-06-12 00:23:47 +02:00
Jonne Haß
7323c9c0fc bump twitter 2013-06-11 23:17:08 +02:00
Jonne Haß
0786a3d6b7 bump mobile-fu 2013-06-11 23:17:08 +02:00
Jonne Haß
b2b16ee3ab bump gon 2013-06-11 23:17:08 +02:00
Jonne Haß
d3fe58407c bump json 2013-06-11 23:17:08 +02:00
Jonne Haß
277f07d41b bump rails_autolink 2013-06-11 23:17:08 +02:00
Jonne Haß
06ca713d38 bump uglifier 2013-06-11 23:17:08 +02:00
Jonne Haß
c1635b34d6 bump slim 2013-06-11 23:17:08 +02:00
Jonne Haß
5859ceb5ea bump rspec-rails 2013-06-11 23:17:08 +02:00
Jonne Haß
d3953720a8 bump rails_admin 2013-06-11 23:17:08 +02:00
Jonne Haß
d9b63b26ea bump mini_magick 2013-06-11 23:17:07 +02:00
Jonne Haß
061bca7ca5 bump haml 2013-06-11 22:49:35 +02:00
Jonne Haß
858f447512 bump guard 2013-06-11 22:49:35 +02:00
Jonne Haß
fc3da627fb bump fog 2013-06-11 22:49:32 +02:00
Jonne Haß
0a127a9076 bump database_cleaner 2013-06-11 22:15:45 +02:00
Jonne Haß
6467ee1962 bump acts-as-taggable-on 2013-06-11 22:15:45 +02:00
Jonne Haß
9cbfee9408 bump configurate 2013-06-04 22:58:20 +02:00
Florian Staudacher
bcb1214f99 Merge pull request #4162 from MrZYX/typhoeus 
bump Typhoeus and refactor HydraWrapper
 2013-06-04 03:36:39 -07:00
Jonne Haß
234ebdb2e9 bump redcarpet, should fix #4104 2013-05-25 15:21:17 +02:00
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Jonne Haß
e3265aa650 Revert "bump sidekiq" 
This reverts commit 9307a1aaeb.
 2013-05-17 17:35:34 +02:00
Jonne Haß
e8f57d8fac Revert "downgrade multi_json" 
This reverts commit 4c4a98f42e.
 2013-05-17 13:19:00 +02:00
Jonne Haß
4c4a98f42e downgrade multi_json 2013-05-17 13:12:41 +02:00
Jonne Haß
9307a1aaeb bump sidekiq 2013-05-17 12:30:33 +02:00
Jonne Haß
6b1fdaafc0 Merge branch 'locator' of git://github.com/tangosource/diaspora into tangosource-locator 2013-05-06 17:33:10 +02:00
Jonne Haß
e70c2593ff bump configurate 2013-05-03 12:07:50 +02:00
Marco Gallardo
4aab8762fa Locator feature 
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
 2013-05-02 17:31:53 -05:00
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
Jonne Haß
6302de458d bump sidekiq 2013-04-20 14:37:42 +02:00
Jonne Haß
9c582a775a bump addressable 2013-04-20 14:37:41 +02:00
Jonne Haß
4bbbe93b2d bump acts-as-taggable-on 2013-04-20 14:37:41 +02:00
Jonne Haß
b3e1d860e9 bump rails_admin 2013-04-20 14:37:41 +02:00
Jonne Haß
c8eec463e5 bump configurate 2013-04-20 14:37:41 +02:00
Jonne Haß
849b0befd6 bump gon 2013-04-19 19:25:44 +02:00
Jonne Haß
347ea03042 bump pg 2013-04-19 19:25:43 +02:00
Jonne Haß
83ab708d44 bump uglifier 2013-04-19 19:25:43 +02:00
Jonne Haß
734f6cadbd bump fog 2013-04-19 19:25:42 +02:00
Jonne Haß
0694b3e9d0 bump foreigner 2013-04-19 19:25:42 +02:00
Jonne Haß
eeba00cde4 bump omniauth 2013-04-19 19:25:42 +02:00
Jonne Haß
f98b8e30d6 bump haml 2013-04-19 19:25:42 +02:00
Jonne Haß
07b2ceaf69 bump selenium-webdriver 2013-04-19 19:25:42 +02:00
Jonne Haß
ec32e33a37 bump faraday 2013-04-19 19:25:41 +02:00
Jonne Haß
20c5857612 bump client_side_validations 2013-04-19 19:25:41 +02:00
Jonne Haß
90c294c4d5 bump omniauth-twitter 2013-04-19 19:25:41 +02:00
Jonne Haß
d136fd56e7 bump guard 2013-04-15 01:36:48 +02:00
Florian Staudacher
f3aa802a0d remove capistrano from the main source code repo 
capistrano deployment scripts will be maintained in a separate deployment repo
 2013-04-15 00:50:23 +02:00
Jonne Haß
ac7bccfe4c bump sidekiq 2013-04-13 11:27:26 +02:00
Jonne Haß
92a2a9189d bump sidekiq and cleanup unicorn.rb 2013-04-04 20:42:41 +02:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq 
Sidekiq (+ some cleanup)
 2013-04-03 15:19:15 -07:00
Jonne Haß
1b71436c63 revert to old behaviour of only having mysql in the Gemfile.lock, fixes #4080 2013-03-28 00:56:54 +01:00
Jonne Haß
f956fca494 make all database adapters available in test env, reensure test related rake tasks are available in development env 2013-03-24 13:48:12 +01:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Jonne Haß
ba57fb52f2 bump rails-i18n 2013-03-21 22:07:32 +01:00
Jonne Haß
5869fc27c1 bump rack-piwik 2013-03-21 22:07:32 +01:00
Jonne Haß
e932b506b3 bump omniauth-twitter 2013-03-21 22:07:32 +01:00
Jonne Haß
97393faab3 bump rails_admin 2013-03-21 22:07:32 +01:00
Jonne Haß
c8829a703b bump nokogiri 2013-03-21 22:07:32 +01:00
Jonne Haß
18c66ac6bf bump lumberjack 2013-03-21 22:07:32 +01:00
Jonne Haß
90e1a654ad bump jasmine 2013-03-21 22:07:31 +01:00
Jonne Haß
e7ff0448ed bump foreman 2013-03-21 22:07:31 +01:00
Jonne Haß
cb1f31ae8e bump timecop 2013-03-21 22:07:31 +01:00
Jonne Haß
802ef60cad bump twitter 2013-03-21 22:07:31 +01:00
Jonne Haß
05ba4d04e7 bump fog 2013-03-21 22:07:30 +01:00
Jonne Haß
8aa4d8e0e8 bump cucumber-rails 2013-03-21 22:07:30 +01:00
Jonne Haß
1e00d8b683 bump selenium-webdriver 2013-03-21 22:07:30 +01:00