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

557 commits

Author SHA1 Message Date
Benjamin Neff
4902a35972
Merge branch 'next-minor' into develop 2021-11-23 00:56:41 +01:00
Benjamin Neff
fef6380721
Bump js-routes 2021-11-06 02:35:57 +01:00
Benjamin Neff
95c0bb9ef2
Merge branch 'next-minor' into develop 2021-10-25 03:46:48 +02:00
Benjamin Neff
3cb1e470a4
Resend AccountMigration or AccountDeletion for closed recipients 2021-10-25 03:34:03 +02:00
Benjamin Neff
0e7c91aeac
Merge branch 'next-minor' into develop 2021-09-19 02:22:05 +02:00
Thorsten Claus
2a99cc93ba
diaspora should send AccountMigration message back when a federation message received for a moved account 
I use Senya's Patch for this
The extra check is for satisfying tests, which don't create real database objects.

fixes #7902
closes #8288
 2021-09-19 02:20:38 +02:00
Benjamin Neff
d27eefeb34
Merge branch 'next-minor' into develop 2021-06-30 23:27:57 +02:00
Benjamin Neff
dc3bef6a93
Bump carrierwave 2021-06-28 01:28:15 +02:00
Jonne Haß
28213b1a47 Merge branch 'next-minor' into develop 2021-04-11 17:29:57 +02:00
Jonne Haß
62bb4dc7b6 Update to Sidekiq 6 
closes #8153
closes #8162
 2021-04-11 17:25:18 +02:00
Jonne Haß
15c11b87ca Merge branch 'next-minor' into develop 2020-09-04 21:58:57 +02:00
Jonne Haß
08395cc877 Migrate configuration to TOML 
YAML is just too easy to get wrong

closes #8132
 2020-09-04 21:48:54 +02:00
Dennis Schubert
bcf5406f53
Issue #8126 - Allow CORS on all API routes. 2020-06-11 20:13:46 +02:00
Benjamin Neff
4139ae2549
Merge branch 'next-minor' into develop 2020-02-12 00:13:19 +01:00
Dennis Schubert
71023a8713
Replace secret_token with secret_key_base. 
secrets.secret_token is deprecated in favor of secret_key_base and will be removed in Rails 6.0.
 2020-02-11 23:54:55 +01:00
Jonne Haß
39c863ead9 Merge branch 'develop' into api 2020-01-21 23:35:01 +01:00
Jonne Haß
cb679371ac Merge branch 'develop' into api 2020-01-21 23:34:43 +01:00
Jonne Haß
16e754f4c7 API: don't return default avatar 2020-01-21 23:34:00 +01:00
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration. 
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
 2019-10-18 23:14:14 +02:00
Benjamin Neff
a26e20ab7d
Merge branch 'next-minor' into develop 2019-07-03 13:25:49 +02:00
Benjamin Neff
df4e79b842
Cleanup pending photos which were never posted with cronjob 
Only delete photos older than a day, so we don't delete photos for posts
which were uploaded 10 minutes ago and the author is still writing the
post for it.

closes #8041
 2019-07-03 13:24:27 +02:00
Benjamin Neff
6f14f1b850
Merge branch 'next-minor' into develop 2019-06-17 01:20:42 +02:00
Benjamin Neff
88e35d3f3a
Use :database_authenticatable strategy to check password for OTP user 
This:
* makes sure that after_database_authentication is called for users with
enabled 2fa.
* handles paranoid mode correctly
 2019-06-17 01:12:42 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop 2019-04-30 00:21:55 +02:00
Benjamin Neff
607659939d
Enable paranoid mode for devise 
fixes #8001

closes #8003
 2019-04-30 00:21:00 +02:00
lislis
9d5b981809 Two factor authentication (#7751) 2019-04-28 23:24:40 +02:00
lislis
1da118780e Two factor authentication (#7751) 2019-04-28 19:06:48 +02:00
Benjamin Neff
6ba9b24c1a
Merge branch 'next-minor' into develop 2019-04-27 18:00:40 +02:00
flaburgan
2073791cee
Add a manifest.json file as a first step to make diaspora* a PWA 
fixes #7997

closes #7998
 2019-04-27 18:00:14 +02:00
Dennis Schubert
cd16f29c39
Merge branch 'next-minor' into develop 2018-11-08 05:14:36 +01:00
Benjamin Neff
3c55a425c7
Fix script domain for instagram in CSP header 
closes #7920
 2018-11-08 05:12:55 +01:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration 
Facebook removed the API and facebook integration is broken now, so lets
remove it.

closes #7874
 2018-10-08 02:50:25 +02:00
Benjamin Neff
f3d2a54050
Merge branch 'next-minor' into develop 2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid 
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.

closes #7815
 2018-06-16 04:36:05 +02:00
Benjamin Neff
212da3a2b7
Merge branch 'next-minor' into develop 2018-06-16 01:23:10 +02:00
Alex Tribble
1b03265c2e
Allow fonts to be served from asset host in CSP. 
Closes #7796

closes #7825
 2018-06-16 01:22:22 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop 2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs 
closes #7787
 2018-04-16 01:26:48 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop 2018-04-12 02:49:11 +02:00
Benjamin Neff
7854e14e07
Bump secure_headers 2018-04-12 02:41:53 +02:00
Frédéric Bolvin
6d55b15604 Resize images on client-side before uploading 2018-03-11 11:20:16 +01:00
Frédéric Bolvin
23e4062342 Allow blob: URIs to be used as a content source in CSP header 2018-03-03 21:12:18 +01:00
Benjamin Neff
bb97aa8538
Allow RFC 7033 WebFinger via http:// for development 2017-09-28 23:04:34 +02:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
Benjamin Neff
5ea7b8ee13
Set fog_provider and load carrierwave/storage/fog if S3 is enabled 
Fixes #7563

closes #7566
 2017-08-26 02:50:18 +02:00
Benjamin Neff
b203862ca3
Workaround for bootstrap-sass 
The change in assets.rb should be enough, but it doesn't work, because
sprockets `after_initialize` runs before it and initializes sprockets
with unfiltered paths.

But the trick with the underscore works, because bootstrap-sass has
named the file `_bootstrap.scss`, and rails-assets-bootstrap has
`bootstrap.scss`, so with `_bootstrap` it uses the correct bootstrap.
 2017-08-12 15:39:26 +02:00
Benjamin Neff
3d7061b240
Update configs for rails 5 
Used `rails app:update`
 2017-08-12 15:39:19 +02:00
Benjamin Neff
4f9e560ab3
Use RFC 7033 webfinger from diaspora_federation gem 2017-07-03 03:14:41 +02:00
Benjamin Neff
87d0778086
Remove guid and public_key from WebFinger 
Related to diaspora/diaspora_federation#39
 2017-07-02 23:56:00 +02:00