Claire
b0c979af49
Merge commit ' 58ace2e45e' 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
395b9011ee
Merge commit ' d5f02adad7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Claire
8089fa6935
Merge commit ' a7264a2b42' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's different theming system.
Ported upstream's change.
2024-06-17 18:14:14 +02:00
Claire
677f73f793
Merge commit ' 3a191b3797' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Eugen Rochko
b9fd7571ae
Change sidebar text in web UI ( #30696 )
2024-06-14 13:04:20 +00:00
Marcin Mikołajczak
a243963e93
LanguageDropdown: remove unused function ( #30346 )
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-13 19:46:45 +00:00
Eugen Rochko
ed6d24330b
Add author links on the explore page in web UI ( #30521 )
2024-06-13 13:04:16 +00:00
Claire
30b00ca2b5
Merge commit ' 5652ca6135' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Eugen Rochko
3c435f9ba0
Change counters to be displayed on profile timelines in web UI ( #30525 )
2024-06-05 23:52:46 +00:00
Claire
c827a98f19
Merge commit ' d20a5c3ec9' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
Renaud Chaput
3750e8050c
Enable stricter Typescript options ( #30435 )
2024-05-27 09:24:59 +00:00
Claire
d76106da12
Merge commit ' ccb6aeddac' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
Renaud Chaput
8ea2726376
Fix a leftover argument to api() ( #30405 )
2024-05-24 08:25:42 +00:00
Claire
51631c785f
Merge commit ' b6fd14f0e2' 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
e46321e63d
Merge commit ' de4815afda' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Renaud Chaput
a178ba7cd5
Use a modern React context for identity in the app ( #30098 )
2024-05-19 17:07:32 +00:00
Claire
f35ba6963d
Merge commit ' 1959365c2f' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
Chee Aun
c36a8786c1
Fix typo ( #30224 )
2024-05-10 09:19:27 +00:00
Claire
f09f5b35f2
Merge commit ' d97d31cce6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
2024-05-04 16:12:51 +02:00
Claire
d6f9c97ae4
Merge commit ' 7201f99cf8' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
Claire
b039e62194
Merge commit ' a2399046ca' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
Claire
946bd2e7e1
Merge commit ' 0622107449' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
Claire
6f342a6d4c
Merge commit ' 34e826f373' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
Claire
2c386d4cfe
Merge commit ' c70c39cad0' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Claire
0f90e624c5
Merge commit ' 672c9f5f05' 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 ' 8a498f4e65' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
Claire
a6147a831f
Merge commit ' 02ea161506' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`
All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.
Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
2024-05-01 14:25:47 +02:00
Claire
7d3fe2b4c3
Add loading indicator and empty result message to advanced interface search ( #30085 )
2024-04-29 09:55:41 +00:00
Claire
de4a7bf531
Change moderation warning notification icon ( #30081 )
2024-04-26 15:33:15 +00:00
Claire
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
Eugen Rochko
0ec061aa8f
Change design of people tab on explore in web UI ( #30059 )
2024-04-25 16:25:33 +00:00
Tim Rogers
75163d9daf
Fixed rendering error on /start when not logged in ( #30023 )
2024-04-22 08:53:08 +00:00
Claire
66ee0d4a1f
Fix incorrect label for filtered notifications badge ( #29922 )
2024-04-16 09:25:23 +00:00
Claire
c386c36866
Add / keyboard shortcut to focus the search field ( #29921 )
2024-04-12 09:42:12 +00:00
Claire
0e76b919b5
Merge commit ' 0cea7a623b' into glitch-soc/merge-upstream
2024-04-06 21:48:35 +02:00
Claire
1d1c3a808a
Merge commit ' 6c381f20b1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
Claire
777984faeb
Merge commit ' 119c7aa0df' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
903dc53522
Merge commit ' 05eda8d193' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Claire
67842ffb22
Merge commit ' 01464074c9' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
f2b23aa5f3
Merge commit ' 954b470fbc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
Renaud Chaput
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00: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
f2fd1da23f
Fix PropTypes for some record objects ( #29786 )
2024-03-28 10:05:16 +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
02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) ( #29748 )
...
Co-authored-by: Nishiki Liu <hello@nshki.com>
2024-03-26 09:25:49 +00:00
Eugen Rochko
0cea7a623b
Fix background and icon on notification requests in web UI ( #29706 )
2024-03-25 13:39:06 +00:00