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

1210 commits

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