Commit graph

9644 commits

Author SHA1 Message Date
cmrd Senya
ac39716ab4 Drop jquery.textchange 2022-07-17 22:16:05 +03:00
cmrd Senya
3c3b988603 Merge branch 'develop' into use-yarn-for-assets 2022-07-17 13:07:09 +03: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
dd3bc39c97
Render markdown to html for notifications 2022-07-16 04:34:07 +02:00
Benjamin Neff
3c02a1f067
Remove unused translation fallback 2022-07-16 04:22:51 +02:00
Benjamin Neff
a9ae84f3a6
Remove markerb dependency
markerb is dead and isn't compatible with rails 6 anymore. Removing it
means adding separate templates for text and html, this sadly means some
code duplication, but also luckily the templates aren't that
complicated, so the duplication is also very minimal.
2022-07-16 04:22:51 +02:00
Benjamin Neff
6cea355636
Fix escaping of names in the from header 2022-07-16 04:22:51 +02:00
Benjamin Neff
f76a8d7deb
Fix sending mails after photo export 2022-07-16 04:22:51 +02:00
Benjamin Neff
41633fcea9
Don't autoload PeopleHelper during initialization
this is for future rails versions with zeitwerk autoloader where this
isn't allowed anymore
2022-07-16 04:22:51 +02:00
Thorsten Claus
f995e6af0d
Dont Convert when initialized by import 2022-07-16 04:12:01 +02:00
cmrd Senya
551841e0ad blueimp: fix image asset URL 2022-07-12 23:42:01 +03:00
cmrd Senya
b8b448ae40 Use yarn for front-end dependencies instead of rails-assets 2022-07-12 22:02:05 +03:00
Benjamin Neff
c6dda6cf2d
Merge branch 'next-minor' into develop 2022-07-03 23:14:51 +02:00
Benjamin Neff
485af7ea78
Remove compass-rails and just use the few images without a sprite
Fixes #6433
2022-07-03 23:14:01 +02:00
Thorsten Claus
492ac74819 Issue #8355: Adding webp as supported file format
Converting all uploaded images to the webp format.
2022-07-01 13:50:01 +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
792d034059
Merge pull request #8345 from tclaus/feature/set_name_in_auth_dialog
Set Name from client in auth dialog
2022-06-20 23:54:02 +02:00
Thorsten Claus
18f63250e1 Adding default value to predefined username 2022-06-20 21:59:43 +02:00
Thorsten Claus
84b33f8c63 Using login_hint instead of username 2022-06-20 08:04:03 +02:00
Sage Ross
2ce99d5b5a
Remove unread var in mobile_file_uploader.js
This doesn't appear to be actually used, but if `gon` on not defined — which may happen in jasmine tests when run in random order — then it causes test failures.

Closes #8333
2022-06-19 19:31:09 +02:00
Dennis Schubert
22ac0872bd
Merge branch 'next-minor' into develop 2022-04-27 20:37:49 +02:00
Jonne Haß
43ee2dbb50 Do not allow to mass assign OTP fields on user edit page 2022-04-27 19:48:42 +02:00
Jonne Haß
1cfe0037f9 Do not allow the user to mass assign their own password alongside other
parameters

Much thanks to Breno Vitório (@brenu) for the report!
2022-04-27 13:44:48 +02:00
Thorsten Claus
96c5146ebd Set Name from client in auth dialog 2022-03-29 08:25:32 +02:00
Benjamin Neff
36778dbeac
Remove /user/auth_token route, this was a leftover from the chat
Also remove authentication_token from database
2022-02-27 23:06:24 +01:00
Benjamin Neff
d3c2407df1
Don't overwrite photos of other users during import
If a photo with the same filename already exists, generate a new random
filename, and re-federate the photo with that filename. This ensures
users can't modify their archive to overwrite other users photos.
2021-11-24 02:42:31 +01:00
Benjamin Neff
e9f7bf382e
Send new remote_photo_path in migration message 2021-11-24 01:18:07 +01:00
Benjamin Neff
34528521f2
Allow to choose to overwrite settings and profile data 2021-11-23 01:48:33 +01:00
Benjamin Neff
96493b4a5c
Refactory archive concurrency so the same logic can be reused 2021-11-23 01:48:33 +01:00
Benjamin Neff
1eb2c59cce
Move extension logic to SecureUploader class 2021-11-23 01:48:32 +01:00
Thorsten Claus
6c4c6f8889
Migration Backend Part 2021-11-23 01:48:32 +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
ec22f5883e
Bump omniauth 2021-11-06 17:43:57 +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
3cb1e470a4
Resend AccountMigration or AccountDeletion for closed recipients 2021-10-25 03:34:03 +02:00
Benjamin Neff
3292ce64fc
Change placeholder in translations for #8304 2021-10-25 03:26:05 +02:00
David Morley
af9f26d11c
Change domain for poduptime
closes #8304
2021-10-25 01:59:30 +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
0e6caf61ff
Fix sharing status with local users when importing archive
* Local contacts also start sharing again with imported user if they
  were sharing with the old account
* Don't create empty contact entities for contacts which the imported
  user doesn't share with and also maybe the contact doesn't share with
  the importer
* Ensure people which were a contact in the archive still receive the
  migration, even when the importer doesn't share with them, so they can
  resend their contact message

fixes #8106 for real this time
2021-09-29 05:05:28 +02:00
Benjamin Neff
274edf7589
Merge branch 'next-minor' into develop 2021-09-19 14:30:07 +02:00