Benjamin Neff
78ea344454
Merge branch 'next-minor' into develop
2022-07-23 17:01:02 +02:00
Benjamin Neff
4efc4dabf8
Show software and version directly in the pods table if no errors
...
closes #8379
2022-07-23 17:00:48 +02:00
Benjamin Neff
37a00173f5
Merge branch 'next-minor' into develop
2022-07-23 00:54:06 +02:00
Benjamin Neff
e984fa7d91
Don't use host-meta in connection tester anymore
...
This route was removed from the federation and doesn't exist anymore, so
checking for it doesn't make any sense.
But lets check if a server responds to /.well-known/nodeinfo instead.
All other software which supports the diaspora protocol should have this
endpoint by now. Parsing/validating nodeinfo is still handled
gracefully.
closes #8377
2022-07-23 00:53:07 +02:00
Benjamin Neff
d6436f4d03
Merge pull request #8368 from SuperTux88/upgrade-diaspora-federation
...
Upgrade diaspora federation (and some preparations for ruby 3)
2022-07-21 02:22:43 +02:00
Benjamin Neff
d4079070ed
Merge branch 'next-minor' into develop
2022-07-20 21:34:39 +02:00
Benjamin Neff
3c4da76be5
Fix follow up tasks for assets:precompile when no manifest existed
...
When no `.sprockets-manifest-xxx.json` existed, every instance of
`Sprockets::Manifest` generated their own path with their own random
filename, and since this happened before the assets were actually
precompiled, they were all empty. So the error pages didn't find the
manifest and the non-digest assets also didn't have any assets to copy.
So lets create our own instance of `Sprockets::Manifest` here, AFTER
`assets:precompile`, which then loads the manifest json that was used
during precompile, so all precompiled assets are available.
closes #8366
2022-07-20 21:32:21 +02:00
Benjamin Neff
0cd1080b76
Merge pull request #8364 from cmrd-senya/use-yarn-for-assets
...
Use yarn for assets
2022-07-18 00:50:23 +02:00
Benjamin Neff
d0af34c079
Merge pull request #8358 from tclaus/supporting_heic_images
...
Using webp as storage format for images
2022-07-16 04:48:03 +02:00
Benjamin Neff
5669ba6b48
Merge branch 'next-minor' into develop
2022-07-16 04:44:59 +02:00
Benjamin Neff
a5e5c7f378
Fix Link to OWASP CSRF more information page
...
closes #8365
2022-07-16 04:44:17 +02:00
Benjamin Neff
c6dda6cf2d
Merge branch 'next-minor' into develop
2022-07-03 23:14:51 +02:00
Benjamin Neff
a7a02e87cf
Replace unmaintained sass-rails with sassc-rails
...
closes #8362
2022-07-03 23:14:42 +02:00
Benjamin Neff
1e3386c77a
Merge branch 'next-minor' into develop
2022-07-03 20:44:24 +02:00
Benjamin Neff
5f48cedb84
Remove entypo-rails dependency and add font to vendor/assets
...
entypo-rails doesn't support newer rails versions
closes #8361
2022-07-03 20:44:10 +02:00
Benjamin Neff
1b2270572b
Merge branch 'next-minor' into develop
2022-06-29 13:28:02 +02:00
Benjamin Neff
739fc780c3
Manually stringify keys to fix sidekiq 7.0 deprecation warning
...
closes #8359
2022-06-29 13:27:37 +02:00
Benjamin Neff
6c9e7f283f
Merge branch 'next-minor' into develop
2022-06-19 19:30:56 +02:00
Sage Ross
6fadfb30fe
Undo another Capybara refactor that causes CI to break
...
Alas.
Closed #8331
2022-06-19 19:30:41 +02:00
Benjamin Neff
e5b65f6498
Fix jasmine fake publisher messing with follow up tests in random order
2022-06-19 19:29:50 +02:00
Dennis Schubert
865c36bc8a
Merge branch 'next-minor' into develop
2022-04-27 21:17:23 +02:00
Dennis Schubert
058090afe7
Start 0.7.18.0 cycle
2022-04-27 21:15:32 +02:00
Dennis Schubert
02eba842ae
Merge branch 'next-minor'
2022-04-27 21:11:26 +02:00
Dennis Schubert
22ac0872bd
Merge branch 'next-minor' into develop
2022-04-27 20:37:49 +02:00
Dennis Schubert
9212fd3f46
Merge pull request #8351 into next-minor
2022-04-27 20:35:34 +02:00
Dennis Schubert
31ea07daa1
Merge pull request #8350 into next-minor
2022-04-27 20:32:19 +02:00
Benjamin Neff
5d81555ae1
Merge branch 'next-minor' into develop
2022-03-05 16:31:34 +01:00
Dennis Schubert
7611391f9f
Don't suggest to retry exports on failure.
...
closes #8343
2022-03-05 16:31:25 +01:00
Benjamin Neff
2b1f27a850
Merge pull request #8341 from SuperTux88/remove-auth-token
...
Remove /user/auth_token route, this was a leftover from the chat
2022-02-27 23:31:25 +01:00
Benjamin Neff
7e889f71eb
Merge branch 'next-minor' into develop
2022-02-12 00:12:01 +01:00
Benjamin Neff
d896744ca1
Start 0.7.17.0 cycle
2022-02-12 00:07:58 +01:00
Benjamin Neff
d4800544f0
Bump rails to fix CVE-2022-23633
...
closes #8336
2022-02-11 23:31:19 +01:00
Benjamin Neff
37a7c0b35d
Merge pull request #8298 from tclaus/migration_backend
...
Migration: Backend, Rake file, Photos import
2021-11-25 01:39:57 +01:00
Benjamin Neff
ced6905cbc
Merge pull request #8320 from tclaus/8319-fix_show_local_posts_link_in_ui
...
Show local posts in sidebar, if enabled
2021-11-23 01:42:01 +01:00
Benjamin Neff
b1a2cf616e
Merge pull request #8302 from SuperTux88/fix-local-sharing-with-me
...
Fix sharing status of local contacts after an import
2021-11-23 01:40:37 +01:00
Benjamin Neff
4902a35972
Merge branch 'next-minor' into develop
2021-11-23 00:56:41 +01:00
Benjamin Neff
eb977dc25a
Use old person private key if relayable author migrated away
...
We only store signatures for relayables if the author is external, but
if the author becomes external through a migration, the signature is
missing. Lets just use the old persons private key to still be able to
generate a signature for the export.
closes #8310
2021-11-23 00:46:50 +01:00
Benjamin Neff
1570e3fb9a
Migrate remote_photo_path and cleanup old photo uploads
...
If the migration contains a new remote_photo_path migrate all photos of
the old person to this path. If the person was local before, cleanup old
uploaded files of the photos.
closes #8314
2021-11-23 00:43:56 +01:00
flaburgan
c67fc4e0f7
Add sharing status in hovercards, fixes #6542
...
closes #8317
2021-11-23 00:31:41 +01:00
flaburgan
f6c885394d
Refactor hovercards, fixes #8315
...
closes #8316
2021-11-23 00:30:21 +01:00
flaburgan
37f081959c
Add a max-width to user name in the header, fixes #7676
...
closes #8313
2021-11-23 00:27:05 +01:00
Benjamin Neff
36e6b31135
Merge pull request #8237 from tclaus/7878-direct-image-pasting
...
7878 direct image pasting
fixes #7878
closes #7883
2021-10-25 03:51:58 +02:00
Benjamin Neff
95c0bb9ef2
Merge branch 'next-minor' into develop
2021-10-25 03:46:48 +02:00
Benjamin Neff
5714e83ab2
Store signatures of AccountMigrations if the old person is local
...
That way it can be re-used when sending the AccountMigrations to other
pods again if a message for the migrated account is received.
fixes #7902
closes #8309
2021-10-25 03:40:16 +02:00
flaburgan
5b3f75f011
Remind the username in the reset password e-mail
...
closes #8037
2021-10-25 01:58:47 +02:00
Benjamin Neff
274edf7589
Merge branch 'next-minor' into develop
2021-09-19 14:30:07 +02:00
Thorsten Claus
4c337c6952
8139 add a podmin mail to footer
...
fixes #8139
closes #8242
2021-09-19 14:27:46 +02:00
Benjamin Neff
c740660c0c
Merge pull request #8260 from tclaus/import_zipped_archive
...
Migration: Import compressed archive file handling
2021-09-19 02:28:43 +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