Jonne Haß
9aa7b2bd78
bump ruby-oembed
2015-12-31 16:05:57 +01:00
Jonne Haß
d62f3c8668
bump jasmine
2015-12-31 16:02:26 +01:00
Jonne Haß
1223d6887c
bump handlebars_assets
2015-12-31 15:59:38 +01:00
Jonne Haß
4b67b1cc3a
bump webmock
2015-12-31 15:50:12 +01:00
Jonne Haß
27f79e16ee
bump unicorn
2015-12-31 15:40:03 +01:00
Jonne Haß
0deb16adcc
bump test_after_commit
2015-12-31 15:40:03 +01:00
Jonne Haß
44bc55337d
bump spring
2015-12-31 15:35:45 +01:00
Jonne Haß
75c8d0c4ed
bump simplecov
2015-12-31 15:35:45 +01:00
Jonne Haß
19141239dc
bump shoulda-matchers
2015-12-31 15:35:45 +01:00
Jonne Haß
670c5fed4f
bump rails_admin
2015-12-31 15:34:08 +01:00
Jonne Haß
226b3b3663
bump rails-i18n
2015-12-31 15:32:17 +01:00
Jonne Haß
256e0fadfa
bump rails-assets-perfect-scrollbar
2015-12-31 15:31:36 +01:00
Jonne Haß
560f2df089
bump rails-assets-jquery-placeholder
2015-12-31 15:27:51 +01:00
Jonne Haß
5e6f01a956
bump pry-byebug
2015-12-31 15:27:51 +01:00
Jonne Haß
b886ece423
bump pronto
2015-12-31 15:22:20 +01:00
Jonne Haß
f4e6aefd57
bump omniauth-tumblr
2015-12-31 15:17:41 +01:00
Jonne Haß
a6e3d587b6
bump omniauth-facebook
2015-12-31 15:17:41 +01:00
Jonne Haß
3a0da0564a
bump json-schema
2015-12-31 15:17:41 +01:00
Jonne Haß
fbc64743f0
bump fog
2015-12-31 15:17:07 +01:00
Jonne Haß
ff0e5c0563
bump devise
2015-12-31 15:17:07 +01:00
Jonne Haß
152505511b
bump autoprefixer-rails
2015-12-31 15:17:07 +01:00
Dennis Schubert
d4fbbd86b3
Merge branch 'stable' into develop
2015-12-30 14:51:05 +01:00
Benjamin Neff
c036a6a4c3
bump diaspora_federation
2015-12-30 14:50:34 +01:00
Jonne Haß
20ba097918
Merge branch 'stable' into develop
2015-12-28 17:31:38 +01:00
Steffen van Bergerem
78df0f5158
Update highlightjs
2015-12-28 17:25:45 +01:00
Lukas Matt
cf49276aa8
bump jsxc to v0.1.4
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #6569
2015-12-21 17:29:42 +01:00
Steffen van Bergerem
7f146a8af9
Merge pull request #6570 from Zauberstuhl/bump_jsxc_develop
...
[develop] bump jsxc to v0.1.5.develop
2015-12-20 15:58:13 +01:00
Dennis Schubert
86fead30a4
Merge branch 'stable' into develop
2015-12-20 00:47:42 +01:00
Dennis Schubert
c238329cd8
Merge branch 'master' into stable
2015-12-20 00:41:49 +01:00
Dennis Schubert
3028b283e4
Bump nokogiri
2015-12-20 00:27:11 +01:00
Jonne Haß
13029235d0
Merge branch 'stable' into develop
2015-12-13 12:28:04 +01:00
cmrd Senya
08b910bd88
bump diaspora_federation
2015-12-13 12:24:52 +01:00
Lukas Matt
b9729db0d6
bump jsxc to v0.1.5.develop
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-11-30 15:06:15 +01:00
Jonne Haß
578f196a7b
Merge branch 'stable' into develop
2015-11-24 00:43:37 +01:00
Jonne Haß
e195651592
bump nokogiri
2015-11-24 00:43:12 +01:00
Steffen van Bergerem
24301084fe
Update autosize
2015-11-22 18:17:38 +01:00
Jonne Haß
c109a6f6b0
Merge branch 'stable' into develop
2015-11-22 15:50:13 +01:00
Steffen van Bergerem
98eb103446
Update highlight.js
...
closes #6558
2015-11-22 15:47:56 +01:00
Steffen van Bergerem
b8756cb16f
Update markdown-it-sanitizer
2015-11-22 15:44:32 +01:00
Steffen van Bergerem
c3a44dcce1
Update markdown-it
2015-11-22 15:44:32 +01:00
Jonne Haß
a7ff246d8e
Merge branch 'stable' into develop
2015-11-14 16:13:52 +01:00
Jonne Haß
acb9547978
Update Rails to 4.2.5
2015-11-14 16:12:15 +01:00
Lukas Matt
d91907cfe1
bump diaspora_jsxc to v0.1.4.develop.4
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-29 15:32:28 +01:00
Jonne Haß
4f72377171
bump pronto-rubocop
2015-10-29 04:33:07 +01:00
Dennis Schubert
92c2a2e527
Merge branch 'stable' into develop
2015-10-29 04:31:47 +01:00
Jonne Haß
bf42cc17f1
bump http
...
closes #6514
2015-10-29 04:25:11 +01:00
Jonne Haß
a189155773
bump valid
2015-10-29 04:21:07 +01:00
Jonne Haß
c7a5010b37
bump sass
2015-10-29 04:21:07 +01:00
Jonne Haß
c79a3fa4bf
bump fog
2015-10-29 04:20:37 +01:00
Jonne Haß
ada2913cd7
bump webmock
2015-10-29 04:20:37 +01:00
Jonne Haß
c0c4b7277b
bump shoulda-matchers
2015-10-29 04:20:37 +01:00
Jonne Haß
6404f5df2b
bump rubocop
2015-10-29 04:20:37 +01:00
Jonne Haß
e0e2ab01af
bump redcarpet
2015-10-29 04:19:18 +01:00
Jonne Haß
19875a59e0
bump rails-assets-jquery-placeholder
2015-10-29 04:19:18 +01:00
Jonne Haß
bd427ea2db
bump pry
2015-10-29 04:18:53 +01:00
Jonne Haß
b1318779a6
bump mini_magick
2015-10-29 04:18:12 +01:00
Jonne Haß
6bc1314b43
bump handlebars_assets
2015-10-29 04:18:12 +01:00
Jonne Haß
fb923a188e
bump faraday
2015-10-29 04:17:42 +01:00
Jonne Haß
3eb32a6c60
bump database_cleaner
2015-10-29 04:17:07 +01:00
Jason Robinson
7f70f411fc
Merge pull request #6488 from Zauberstuhl/bump_vines_jsxc
...
Bump jsxc to v0.1.4.develop.3
2015-10-10 20:45:50 +02:00
Jason Robinson
9e9128f77d
Merge branch 'stable' into develop
2015-10-10 20:45:06 +02:00
Lukas Matt
9be6b41141
bump vines to v0.2.0.develop.4
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #6489
2015-10-10 20:44:57 +02:00
Lukas Matt
f89fc53b17
bump jsxc to v0.1.4.develop.3
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-10 20:42:21 +02: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
Dennis Schubert
cc631372a1
Merge branch 'stable' into develop
2015-10-03 02:28:08 +02:00
Lukas Matt
1cf69b33ea
bump diaspora-vines to v0.2.0.develop.3
...
closes #6441
2015-10-03 02:28:01 +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ß
e571acf2f2
bump notiffany
2015-09-19 23:01:37 +02:00
Jonne Haß
cacc3c2994
bump mime-types
2015-09-19 23:01:37 +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ß
ab74d2313d
bump naught
2015-09-19 22:59:17 +02:00
Jonne Haß
de9f7d4173
bump spring
2015-09-19 22:59:17 +02:00
Jonne Haß
4fec2e8968
bump valid
2015-09-19 22:59:17 +02:00
Jonne Haß
21c54d1083
bump timers
2015-09-19 22:59:17 +02:00
Jonne Haß
00429bac95
bump little-plugger
2015-09-19 22:59:17 +02:00
Jonne Haß
f27a729b54
bump kgio
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ß
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ß
ed463750b1
bump font-awesome-rails
2015-07-30 05:03:08 +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ß
b6a83415b0
bump sass
2015-07-30 04:52:55 +02:00
Jonne Haß
3be5acef8c
bump request_store
2015-07-30 04:51:59 +02:00
Jonne Haß
8f0ca722c8
bump omniauth-oauth2
2015-07-30 04:51:59 +02:00
Jonne Haß
a713cc6066
bump nio4r
2015-07-30 04:51:59 +02:00
Jonne Haß
452fcab554
bump raindrops
2015-07-30 04:51:59 +02:00
Jonne Haß
d17c1e3220
bump jwt
2015-07-30 04:51:58 +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
Jonne Haß
7c233aa216
Drop rails-assets-autosize from Gemfile.lock
2015-07-20 17:42:42 +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ß
e6712185a2
bump listen
2015-06-27 04:36:21 +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ß
6c2e93c01d
bump listen
2015-06-24 04:00:20 +02:00
Jonne Haß
bd96bb0607
bump cucumber
2015-06-24 04:00:17 +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ß
bdcdf55f84
bump rails-assets-jquery.slimscroll
2015-06-24 03:59:24 +02:00
Jonne Haß
7309ba81e2
bump jwt
2015-06-24 03:59:19 +02:00
Jonne Haß
65708cb11d
bump rails-assets-jasmine
2015-06-24 03:59:10 +02:00
Jonne Haß
f73e7c1b6d
bump jasmine-core
2015-06-24 03:58:39 +02:00
Jonne Haß
7d741b8d8b
bump hashie
2015-06-24 03:56:47 +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ß
bf69cb6d19
Merge branch 'stable' into develop
2015-06-16 22:37:40 +02:00
Jonne Haß
bff18523ef
Update BUNDLED WITH to 1.10.4
2015-06-16 22:37:08 +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ß
bb24b8bedb
bump BUNDLED WITH [ci skip]
...
See https://github.com/bundler/bundler/issues/3697
2015-06-04 11:27:37 +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
Jonne Haß
b2faf20d18
Merge branch 'stable' into develop
2015-05-31 15:49:54 +02:00
Jonne Haß
59bbbeba14
update bundled with to 1.10.2 for now [ci skip]
...
See https://github.com/bundler/bundler/issues/3697
2015-05-31 15:48:42 +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
