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
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
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
add707252a
Merge branch 'next-minor' into develop
...
... and also remove json-schema-rspec dependency from api specs
2022-06-28 02:08:42 +02:00
Benjamin Neff
4076eb3fcf
Bump json-schema and remove json-schema-rspec (unmaintained)
2022-06-27 02:19:38 +02:00
Benjamin Neff
6c9e7f283f
Merge branch 'next-minor' into develop
2022-06-19 19:30:56 +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
Sage Ross
cb774d1c50
Fix another order-dependent failure in router_spec.js
2022-06-19 17:24:41 +02:00
Sage Ross
692f5fdafb
Fix style violations, per automated code review
2022-06-19 17:24:40 +02:00
Sage Ross
37d440f91e
Turn on random spec order in jasmine.yml
2022-06-19 17:23:00 +02:00
Sage Ross
baeeee8e73
More order-dependent Jasmine test fixes
2022-06-19 17:23:00 +02:00
Sage Ross
23c2487550
Delete specs that cause order-dependent failures elsewhere
...
This set of specs — in particular, all the calls to `this.view.$el.find(...).trigger('click') — are changing the environment in ways that cause I18n missing key errors elsewhere.
There are failures in `app_spec.js` if this spec file is run before it, and I haven't found a way to reset the environment to avoid the issue.
2022-06-19 17:23:00 +02:00
Sage Ross
94956a2eda
Add workound for order-dependent notification_collection_spec.js
...
This is from Flaburgan: https://github.com/diaspora/diaspora/pull/8305/files
I can't find a better way around it. The specs that call `onChangedUnreadStatus` change the environment in ways we can't figure out how to reset cleanly.
2022-06-19 17:23:00 +02:00
Sage Ross
09ecaec0b5
Fix order-dependent Jasmine failure due to missing translation key
...
There must be another Jasmine spec that modifies the locale without loading the default afterwards.
2022-06-19 17:23:00 +02:00
Sage Ross
2b352b86ae
Fix order-dependent failures in comment_view_spec.js
...
It looks like these specs expect a logged-in user, and would fail when run after a test that logged out.
2022-06-19 17:23:00 +02:00
Sage Ross
1c577fb5b2
More fixes for order-dependent Jasmine spec failures
...
These ones would fail if `app.page` was in the wrong state from a previous test.
2022-06-19 17:23:00 +02:00
Sage Ross
b2ee986815
Fix order-dependent failure in app_spec.js
...
The 'sets the user' spec was failing if run after a spec that had already set the user.
2022-06-19 17:23:00 +02:00
Sage Ross
ae3bd1f62e
Fix order-dependent jasmine failure in contacts_collection_spec.js
...
This was failing if `app.aspect` got set by another spec than ran before it (such as one of the other specs in the same file, when run in a different order).
2022-06-19 17:22:59 +02:00
Sage Ross
b195861483
Fix order-dependent failures in notification_dropdown_view_spec.js
...
These tests were failing because of an error thrown from `this.header.render()`, unless `head_view_spec.js` had already been run to set app.notificationsCollection.
2022-06-19 17:22:59 +02:00
Sage Ross
4e4d332d6e
Fix more order-dependent jasmine specs
2022-06-19 17:22:59 +02:00
Sage Ross
56ef83fa8a
Don't overwrite app.stream properties in tests
...
These cases of modifying app.stream can cause other specs to fail, depending on test order. Here we either don't modify them if the tests still pass without manually stubbing `addNow`, or we cache and restore the properties we need to test.
2022-06-19 17:22:59 +02:00
Sage Ross
f4234fa3a0
Fix order-dependence bug in single_post_interactions_spec.js
...
This was only passing when run after a loginAs from another spec.
2022-06-19 17:22:59 +02:00
Sage Ross
f85135f726
Make shortcuts_spec.js more order-independent
...
This spec was failing whenever router_spec.js was not run prior it it running.
2022-06-19 17:22:59 +02:00
Sage Ross
0831d4e294
Fix order-dependent failure of stream_view_spec.js
...
This spec was only passing when it was run after another spec (router_spec.js) that put `app.page` in an appropriate state.
2022-06-19 17:22:53 +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
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
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
Thorsten Claus
d531b64d66
fixes #8319
2021-11-08 18:47:01 +01: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
Benjamin Neff
3cb1e470a4
Resend AccountMigration or AccountDeletion for closed recipients
2021-10-25 03:34:03 +02:00
Thorsten Claus
88e2e593a4
Update open_graph_reader gem
...
closes #8307
2021-10-25 03:28:56 +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
5e47c284b6
Merge branch 'next-minor' into develop
2021-10-01 02:12:37 +02:00
Benjamin Neff
b2a56376cd
Fix running jasmine tests in docker
...
closes #8299
2021-10-01 02:11:36 +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
d9116efb85
Revert #8254
...
This reverts commit 123b8b906c60f9dbcdbd
2021-09-29 01:58:57 +02:00
Benjamin Neff
d39a4e3621
Also need to handle account_migration in AccountDeleter spec
...
Also backported from #7660
2021-09-19 03:45:52 +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
Thorsten Claus
85a5744867
Import compressed archive file
2021-09-19 02:14:50 +02:00
Thorsten Claus
4630b49ec4
Update reshare import test with more generic test from #8257 and #8017
...
Just test for generic NotFetchable error, which also includes the root
author failing to be fetched.
2021-09-18 18:09:30 +02:00
cmrd Senya
9723bd37a7
Fix relayable import when parent is not fetchable
2021-09-18 18:09:30 +02:00
cmrd Senya
1ec0314752
Fix reshare import when root is not fetchable
2021-09-18 04:44:19 +02:00
Benjamin Neff
b2ba0123e1
Fix FactoryBot for next-minor
2021-08-16 01:02:08 +02:00
Benjamin Neff
e2b96c81f2
Merge branch 'next-minor' into develop
2021-08-16 00:24:47 +02:00
Thorsten Claus
8691e650dc
Person.find_or_fetch_by_identifier never return nil
...
Person.find_or_fetch_by_identifier raises an exception if person is not found localy and not fetchable. It never returns nil. These code changes take care about this behaviour and changes specs and code to behave equally.
Also related to #8253
2021-08-16 00:24:33 +02:00
Benjamin Neff
8d5abe8892
Merge pull request #8264 from tclaus/migration_importing_blocks
...
Migration: Importing user blocks
2021-07-13 01:40:04 +02:00
Benjamin Neff
2e6ae8c967
Merge pull request #8254 from tclaus/8106_set_contact_status_on_account_migration
...
Migration: set share status in contacts
closes #8106
2021-07-13 01:36:48 +02:00
Thorsten Claus
1ec7bd7ce1
Migration: Importing user blocks
...
Migration: fix error on blocks import
2021-07-13 01:22:14 +02:00
Dennis Schubert
0810fa77e9
Remove special-case for diaspora-handle lookups in people controller.
...
Thss partly reverts a475d5fb62
2021-07-04 22:10:20 +02:00
Benjamin Neff
4c46ca1a94
Merge branch 'next-minor' into develop
2021-07-04 22:09:32 +02:00
Dennis Schubert
407f51d5a3
Allow points and dashes in the username.
...
This reverts b3ca504c40closes #8266
2021-07-04 22:07:21 +02:00
Benjamin Neff
8f804e376a
Don't export chat_enabled flag anymore
...
The chat is already removed for 0.8, so there is no need to still export
this data since it can't be imported anyway.
Related to #8069
closes #8265
2021-07-04 22:03:37 +02:00
Benjamin Neff
caeeac6c59
Merge branch 'next-minor' into develop
2021-07-03 03:03:32 +02:00
Thorsten Claus
b31f9106a1
Migration: Exporting user blocks
...
closes #8263
2021-07-03 02:51:41 +02:00
Benjamin Neff
d27eefeb34
Merge branch 'next-minor' into develop
2021-06-30 23:27:57 +02:00
Benjamin Neff
7b73002a2c
Merge pull request #8261 from SuperTux88/gem-updates
...
Gem updates
2021-06-30 23:21:52 +02:00
Benjamin Neff
c203c1eb94
Cleanup unused commenting_disabled? and can_comment?
...
closes #8262
2021-06-30 23:19:29 +02:00
Benjamin Neff
2f29bb3035
Bump ruby-oembed
2021-06-28 01:34:25 +02:00
Benjamin Neff
5fcc60fea8
Merge branch 'next-minor' into develop
2021-06-27 22:29:12 +02:00
Akshay S Dinesh
b375bfa630
Add more closing tags to fix specs
...
closes #8159
2021-06-27 22:23:22 +02:00
Thorsten Claus
60f9dbcdbd
Adapted tests for imported share-attribute
2021-06-17 11:15:21 +02:00
Benjamin Neff
1dd2382d03
Merge pull request #8243 from tclaus/8192_drop_relay_example
...
drop relay example and implementation
closes #8192
2021-06-13 01:35:42 +02:00
Benjamin Neff
a6c79f5e57
Merge pull request #8232 from tclaus/local_public_posts
...
Show Local public posts
closes #8220
2021-06-13 01:32:24 +02:00
Benjamin Neff
a17fca02ff
Merge branch 'next-minor' into develop
2021-06-13 01:27:34 +02:00
Thorsten Claus
43d489edda
Fixed test
...
closes #8244
2021-06-13 01:26:27 +02:00
Allan Klaus
b2b03d2679
Improve Service::Tumblr
...
- Fix rubocop styles
- Improve specs coverage
2021-06-13 01:24:48 +02:00
Thorsten Claus
61de6e117d
8192 drop relay example and implementation
2021-05-12 23:23:46 +02:00
Thorsten Claus
2db1d5d641
Fixing PR Rewview issues
2021-04-18 13:11:25 +02:00
Thorsten Claus
4147249d2d
Makes the local posts link be configured for special audiences
2021-04-18 13:11:25 +02:00
Thorsten Claus
34d9d9c3ee
Fixing test
2021-04-18 13:11:25 +02:00
Thorsten Claus
ddee980426
Adds a local-public tag on the sidebar that shows all posts local to this pod
2021-04-18 13:11:25 +02:00
Jonne Haß
28213b1a47
Merge branch 'next-minor' into develop
2021-04-11 17:29:57 +02:00
Jonne Haß
7960a51d12
update open_graph_reader to 0.7.1
2021-04-11 17:25:18 +02:00
Jonne Haß
f4dc6d0dc7
Merge branch 'next-minor' into develop
2021-04-11 17:23:46 +02:00
gabrielrumiranda
394eafccc5
Actually implement validation error case in Photo#ownserhip_of_status_message
...
closes #8214
closes #8048
Co-authored-by: Thorsten Claus <thorstenclaus@web.de>
2021-04-11 17:22:40 +02:00
Jonne Haß
5f00b4a4e6
Merge branch 'next-minor' into develop
2021-04-11 17:13:46 +02:00
Gayathrir1666
ef9e764f7a
Add scrollbar to aspect dropdowns
...
closes #8213
closes #7696
Co-authored-by: Hank Grabowski <hankgrabowski@gmail.com>
Co-authored-by: Thorsten Claus <thorstenclaus@web.de>
2021-04-11 17:13:25 +02:00
Jonne Haß
cc5fca99be
Fixup rubocop warnings from factory_bot introduction
2021-04-11 01:59:47 +02:00
Jonne Haß
3e6bb01199
Fix specs for factory_bot 6
2021-04-11 01:51:38 +02:00
Ntavranis Serafeim
671e8476ba
Update factory_girl to factory_bot
2021-04-11 01:51:38 +02:00
