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

1599 commits

Author SHA1 Message Date
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
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ß
60fb680572 bump hashie 
closes #5925
 2015-05-07 22:55:56 +02:00
Jonne Haß
729fc1a6bf bump sprockets-rails 2015-05-07 22:55:37 +02:00
Jonne Haß
2240599f59 bump rack 2015-05-07 22:55:37 +02:00
Jonne Haß
5d9822056b bump websocket 2015-05-07 22:55:36 +02:00
Jonne Haß
b702c80fb8 bump listen 2015-05-07 22:55:36 +02:00
Jonne Haß
e0116e268f bump domain_name 2015-05-07 22:55:36 +02:00
Jonne Haß
11f4561ae5 bump childprocess 2015-05-07 22:55:36 +02:00
Jonne Haß
4cf681a538 bump rspec 2015-05-07 22:55:36 +02:00
Jonne Haß
1024b3b1f1 bump byebug 2015-05-07 22:55:36 +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
Jonne Haß
51c54caa34 Remove double entries from Gemfile.lock 2015-04-01 04:02:25 +02:00
Steffen van Bergerem
ba67196f5b Bump markdown-it 2015-04-01 00:59:13 +02:00
Steffen van Bergerem
241ac83f17 bump ruby-progressbar 2015-03-26 18:14:52 +01: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ß
15cdb552ba bump systemu 2015-03-25 02:33:58 +01:00
Jonne Haß
30fcf4229e bump fog 2015-03-25 02:33:58 +01:00
Jonne Haß
a6b61c473c bump ruby-progressbar 2015-03-25 02:33:58 +01:00
Jonne Haß
4f887ba5d5 bump jwt 2015-03-25 02:33:57 +01:00
Jonne Haß
699bd6e597 bump excon 2015-03-25 02:33:57 +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ß
a92ad87e94 bump pry-byebug 2015-03-24 22:15:02 +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ß
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ß
74eb3daba0 bump domain_name 2015-02-28 02:36:15 +01:00
Jonne Haß
10c040c04e bump rails-assets-jquery-colorbox 2015-02-28 02:36:15 +01:00
Jonne Haß
a0be0fa1da bump kgio 2015-02-28 02:36:15 +01:00
Jonne Haß
90d91ae63b bump hashie 2015-02-28 02:36:15 +01:00
Jonne Haß
1a9f1ed462 bump ruby-progressbar 2015-02-28 02:36:14 +01:00
Jonne Haß
22464ba9fd bump jwt 2015-02-28 02:36:14 +01:00
Jonne Haß
e2b321502d bump cucumber 2015-02-28 02:36:14 +01:00
Jonne Haß
46176df481 bump bcrypt 2015-02-28 02:36:14 +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ß
fb6d3db7c7 bump autoprefixer-rails 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