Steffen van Bergerem
2ba6ed0b48
Bump spring
2016-08-14 10:34:36 +02:00
Steffen van Bergerem
21712f7c8f
Bump sass-rails
2016-08-14 10:31:23 +02:00
Steffen van Bergerem
30fb58a3df
Bump perfect-scrollbar
2016-08-14 10:27:08 +02:00
Steffen van Bergerem
beab9e9925
Bump markdown-it-diaspora-mention
2016-08-14 10:25:50 +02:00
Steffen van Bergerem
5dd6e143ea
Bump markdown-it
2016-08-14 10:23:20 +02:00
Steffen van Bergerem
be4d7c9a43
Bump highlightjs
2016-08-14 10:22:22 +02:00
Steffen van Bergerem
f71d5c472b
Bump bootstrap-markdown
2016-08-14 10:21:20 +02:00
Steffen van Bergerem
1148e3a839
Bump blueimp-gallery
2016-08-14 10:19:02 +02:00
Steffen van Bergerem
d4a700d939
Bump autosize
2016-08-14 10:18:01 +02:00
Steffen van Bergerem
e2cc9f9c24
Bump openid_connect
2016-08-14 10:15:47 +02:00
Steffen van Bergerem
0fbddbe8f8
Bump omniauth-facebook
2016-08-14 10:13:26 +02:00
Steffen van Bergerem
a01764278a
Bump js-routes
2016-08-14 10:05:46 +02:00
Steffen van Bergerem
957da66aa0
Bump handlebars_assets
2016-08-14 10:01:04 +02:00
Steffen van Bergerem
a76dd9c6ca
Bump haml_lint
2016-08-14 09:59:47 +02:00
Steffen van Bergerem
a5e4d11f7b
Bump gon
2016-08-14 09:58:12 +02:00
Steffen van Bergerem
36910095fd
Bump fuubar
2016-08-14 09:56:42 +02:00
Steffen van Bergerem
415713b6d3
Bump bootstrap-rails
2016-08-14 09:51:49 +02:00
Steffen van Bergerem
791c8f3fc4
Bump autoprefixer-rails
2016-08-14 09:43:17 +02:00
Steffen van Bergerem
9d02c6595d
Bump acts_as_api
2016-08-14 09:25:56 +02:00
Steffen van Bergerem
f1065c8127
Bump activerecord-import
2016-08-14 09:24:20 +02:00
augier
5c2e241106
Displaying the markdown editor on publisher
2016-08-12 23:08:41 +02:00
Jonne Haß
47c6b4eff9
Merge branch 'stable' into develop
2016-08-11 21:34:55 +02:00
Jonne Haß
4f176dc4e3
Update to Rails 4.2.7.1 which fixes CVE-2016-6316 and CVE-2016-6317
2016-08-11 20:23:55 +02:00
Jonne Haß
11ecbbe20b
bump coveralls
2016-08-11 17:54:56 +02:00
Jonne Haß
7dd1fa425a
bump sidekiq
2016-08-11 17:52:29 +02:00
Jonne Haß
20d0a6e29d
bump cucumber-rails
2016-08-11 15:27:23 +02:00
Jonne Haß
5985085cda
bump poltergeist
2016-08-11 15:25:58 +02:00
Jonne Haß
7fa299b7ad
Merge pull request #6959 from cmrd-senya/devise-upgrade
...
Upgrade devise to 4.2
2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded
Upgrade devise to 4.2
2016-08-11 12:25:36 +03:00
Steffen van Bergerem
7985f95db5
Update markdown-it-sanitizer
2016-08-10 19:07:27 +02:00
Steffen van Bergerem
5865314172
Use typeahead.js version from github
2016-08-10 00:41:07 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
...
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
Benjamin Neff
5a4775c13c
bump diaspora_federation
2016-08-08 18:56:37 +02:00
Jonne Haß
77059f11c4
Bump pronto to 0.7.0
2016-08-07 19:24:05 +02:00
Augier
2e175c4be5
Bump to jQuery 2
2016-08-07 16:14:52 +02:00
Jonne Haß
dc0258f8a6
bump rspec-rails, guard-rspec
2016-08-01 12:55:27 +02:00
Jonne Haß
8cffc5cfbe
bump rails to 4.2.7
2016-07-15 13:48:09 +02:00
Benjamin Neff
32cc0951bb
bump diaspora_federation
2016-07-15 02:02:55 +02:00
Steffen van Bergerem
58c7478133
Remove messagebus_ruby_api gem
...
Messagebus closed in 2015. See https://web.archive.org/web/20150623093956/https://www.messagebus.com/ for more information.
2016-07-07 18:48:31 +02:00
Jonne Haß
bcd7894e59
add code coverage reporting
2016-07-05 23:35:53 +02:00
Benjamin Neff
3497183645
bump diaspora_federation to 0.1.1
...
This fetches reshare roots if they are not available locally already.
2016-06-26 21:43:15 +02:00
Benjamin Neff
21fd9f23da
remove roxml
2016-06-26 06:21:01 +02:00
Benjamin Neff
88d91233d3
bump diaspora_federation to v0.1.0
2016-06-26 06:20:58 +02:00
Steffen van Bergerem
21476e4ea7
Bump eslintrb
2016-06-20 22:57:02 +02:00
Jonne Haß
2cab7f02eb
Merge branch 'stable' into develop
2016-06-19 11:56:58 +02:00
Dennis Schubert
3ae3bfe520
Don't require guard-* gems
2016-06-19 11:53:02 +02:00
Dennis Schubert
eb1e1e1263
Merge pull request #6768 from svbergerem/poltergeist
...
Use Poltergeist instead of Selenium
2016-06-19 11:43:50 +02:00
Dennis Schubert
76369f33c5
Remove pry-debundle
2016-06-19 11:38:12 +02:00
Dennis Schubert
d41711a383
Merge branch 'stable' into develop
2016-06-19 05:38:59 +02:00
Dennis Schubert
7fb6ffbb4d
Don't require guard-rspec
...
since it causes an ugly warning in the console!
2016-06-19 05:37:41 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium
2016-06-19 01:53:18 +02:00
Dennis Schubert
f9e0469183
Use a forked version of eslintrb for now
...
fixes #6866
upstream https://github.com/zendesk/eslintrb/pull/7
2016-06-17 07:32:31 +02:00
Dennis Schubert
673740b93c
Merge pull request #6860 from svbergerem/eslint
...
Use eslint instead of jshint
2016-06-16 02:50:27 +02:00
Steffen van Bergerem
cec7fcd964
Bump hamlit
2016-06-16 02:39:45 +02:00
Steffen van Bergerem
02bd6c3c3e
Bump eye
2016-06-16 02:39:37 +02:00
Dennis Schubert
45063bf08d
Merge branch 'stable' into develop
2016-06-16 02:39:20 +02:00
Steffen van Bergerem
d6341c21c7
Bump webmock
2016-06-16 02:34:03 +02:00
Steffen van Bergerem
966166f057
Bump ruby-oembed
2016-06-16 02:34:03 +02:00
Steffen van Bergerem
8182dfb818
Drop rspec-instafail dependency
2016-06-16 02:34:03 +02:00
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
