Claire
fd867adffe
Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream
2024-06-20 18:36:13 +02:00
Renaud Chaput
1c65932776
Convert disconnectTimeline and timelineDelete actions to Typescript ( #30777 )
2024-06-20 11:56:52 +00:00
Claire
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
Renaud Chaput
d558dfd77d
Convert notifications policies frontend code to Typescript ( #29868 )
2024-06-18 13:23:30 +00:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Eugen Rochko
ed6d24330b
Add author links on the explore page in web UI ( #30521 )
2024-06-13 13:04:16 +00:00
Claire
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
Renaud Chaput
b6fd14f0e2
Fix createDataLoadingThunk and related actions ( #30408 )
2024-05-23 18:22:42 +00:00
Renaud Chaput
10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests ( #30270 )
2024-05-23 09:50:13 +00:00
Claire
22d12229b2
Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream
2024-05-22 21:05:19 +02:00
Renaud Chaput
2c5ab8f647
Remove the access token from Redux & context ( #30275 )
2024-05-22 14:45:18 +00:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Claire
66906a1bc1
Fix Web UI trying to save user settings when logged out ( #30324 )
2024-05-16 13:01:01 +00:00
Claire
a76980a229
Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream
2024-05-04 15:40:07 +02:00
Claire
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
Claire
0f90e624c5
Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Conflict due to our theming system being different.
Ported upstream's changes.
2024-05-01 16:10:45 +02:00
Claire
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
David Beck
4f4b77920e
Remove home marker updates ( #22721 )
2024-04-29 07:55:58 +00:00
Renaud Chaput
65093c619f
Fix marker thunks to not ignore eslint directives for the whole file ( #30089 )
2024-04-26 17:11:27 +00:00
Claire
0e76b919b5
Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream
2024-04-06 21:48:35 +02:00
Renaud Chaput
67442f9039
Remove global boosts state and convert boosts modal to Typescript ( #29774 )
2024-03-28 15:33:15 +00:00
Renaud Chaput
b9982ce578
Fix notifications marker fetch ( #29777 )
2024-03-27 15:49:02 +00:00
Renaud Chaput
9fbe8d3a0c
Rewrite PIP state in Typescript ( #27645 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-27 15:19:33 +00:00
Renaud Chaput
27d014a7fa
Rewrite markers reducer in Typescript ( #27644 )
2024-03-27 12:47:09 +00:00
Eugen Rochko
8e7e86ee35
Add ability to reorder uploaded media before posting in web UI ( #28456 )
2024-03-25 10:29:55 +00:00
Claire
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
Eugen Rochko
ec19d0a14b
Change mute, block and domain block confirmations in web UI ( #29576 )
2024-03-15 17:36:41 +00:00
Claire
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
Claire
95a5713ff7
Fix accounts not getting imported into redux store for some filtered notification types ( #29588 )
2024-03-14 09:34:36 +00:00
Claire
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
Eugen Rochko
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
Renaud Chaput
b9722dfe2b
Use the server setting to get the max number of poll options in UI ( #29490 )
2024-03-11 09:13:35 +00:00
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Eugen Rochko
9cdc60ecc6
Change onboarding prompt to follow suggestions carousel in web UI ( #28878 )
2024-02-01 13:37:04 +00:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
Eugen Rochko
9f8e3cca9a
Fix duplicate and missing keys in search popout component in web UI ( #28834 )
2024-01-21 07:44:46 +00:00
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
Claire
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
Renaud Chaput
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
2023-12-18 23:19:27 +00:00
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
Claire
f3864db409
Fix notification sounds ( #28316 )
2023-12-11 14:23:30 +00:00
Eugen Rochko
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
2023-11-15 11:13:53 +00:00
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
Renaud Chaput
f476d9dab2
Fix the notificationsUpdate call ( #27758 )
2023-11-07 14:18:59 +00:00
Renaud Chaput
3bf2a7296e
Use Immutable Record for accounts in Redux state ( #26559 )
2023-11-03 15:00:03 +00:00
Claire
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
Renaud Chaput
774e1189d2
Change eslint config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
