Claire
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
Renaud Chaput
87b9b23025
[Glitch] Use integers and not numbers in notification policy API counters
...
Port b4d991adaa
2024-05-01 17:12:57 +02:00
Renaud Chaput
c316852a65
[Glitch] Add API types for status and related objects
...
Port e47a3d00fe
2024-05-01 17:12:16 +02:00
Renaud Chaput
297c8c37b1
[Glitch] Fix Redux Middleware types
...
Port 07635228e2
2024-05-01 17:08:44 +02:00
Michael Stanclift
0f756eaed2
[Glitch] Fix search box color on light theme
...
Port fa9574086d
2024-05-01 17:08:05 +02:00
Claire
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Michael Stanclift
3b1c8d56b2
[Glitch] Fix light theme header on mobile
...
Port 90eb4a5d01
2024-05-01 16:49:21 +02:00
Michael Stanclift
1783820acd
[Glitch] Fix background tint in single column light theme
...
Port 430da03160
2024-05-01 16:48:55 +02:00
Renaud Chaput
375bd52d97
[Glitch] Handle createAppAsyncThunk rejected actions in the errors middleware
...
Port 69e5771881
2024-05-01 16:48:27 +02:00
Claire
7f404fd635
Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream
2024-05-01 16:47:25 +02:00
Renaud Chaput
b3d5567bd0
[Glitch] Remove global boosts state and convert boosts modal to Typescript
...
Port 67442f9039
2024-05-01 16:42:20 +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
bc370938ef
[Glitch] Fix logo pushing header buttons out of view on certain conditions in mobile layout
...
Port 4f068d4fcc
2024-05-01 15:56:38 +02:00
Renaud Chaput
cc720cd38f
[Glitch] Fix <RelativeTimestamp> types
...
Port 961bb84e4c
2024-05-01 15:56:37 +02:00
Renaud Chaput
0ab212f6a9
[Glitch] Fix props for <Button>
...
Port d088964761
2024-05-01 15:56:37 +02:00
Renaud Chaput
02f9ce9ce3
[Glitch] Fix PropTypes for some record objects
...
Port f2fd1da23f
2024-05-01 15:56:37 +02:00
Claire
5cb4adbf4e
[Glitch] Fix language picker and privacy picker not having a backdrop filter
...
Port c913e2f3e5
2024-05-01 15:56:37 +02:00
Renaud Chaput
555f45f249
[Glitch] Fix notifications marker fetch
...
Port b9982ce578
2024-05-01 15:56:37 +02:00
Renaud Chaput
371c5e59eb
[Glitch] Rewrite PIP state in Typescript
...
Port 9fbe8d3a0c
2024-05-01 15:56:37 +02:00
Renaud Chaput
059e10e546
[Glitch] Rewrite markers reducer in Typescript
...
Port 27d014a7fa
2024-05-01 14:55:03 +02:00
Claire
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
Claire
03af271d3d
[Glitch] Fix column borders disappearing in advanced interface on low width viewports
...
Port b2d841ce9a
2024-05-01 14:32:29 +02:00
Claire
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
Renaud Chaput
d63c0a2879
[Glitch] Support "system" theme setting (light/dark theme depending on user system preference)
...
Port 02ea161506
2024-05-01 14:25:51 +02:00
Claire
a6147a831f
Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' 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
d6048d3a6c
Add compatibility app/javascript/flavours/glitch/styles/index.scss
2024-04-30 21:27:04 +02:00
Claire
8a34c42341
Rename app/javascript/flavours/glitch/styles/index.scss to application.scss
...
This is just to reduce differences with upstream.
2024-04-30 21:03:04 +02:00
Claire
e0a3662d7b
Drop hardcoded reliance on vanilla flavor
2024-04-28 22:38:11 +02:00
Claire
7208edbd37
Replace use_pack, layouts/theme and @theme by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
Claire
c3e12a4dfa
Change how theme style packs are loaded
...
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
2024-04-28 15:45:41 +02:00
Claire
93cdc66e64
Make common inheritence unconditional and simplify theming code
2024-04-28 15:06:48 +02:00
Claire
dee57982f1
Rename “home” pack to “application”
2024-04-28 15:06:41 +02:00
Claire
9a8be8cf49
Remove theme fallback mechanism
...
Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.
Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead.
2024-04-28 15:05:16 +02:00
Claire
62bc36416f
Get rid of app/javascript/core
...
Have all flavors implement everything they need instead.
2024-04-28 15:04:52 +02:00
Claire
113c931cda
Fix follow request notifications not being displayed ( #2695 )
2024-04-24 17:00:48 +02:00
GitHub Actions
c61130af33
New Crowdin translations
2024-04-22 04:27:38 +00:00
Eugen Rochko
91531e9586
[Glitch] Add ability to reorder uploaded media before posting in web UI
...
Port 8e7e86ee35
2024-04-06 22:34:03 +02:00
Eugen Rochko
fc533cfad3
[Glitch] Fix background and icon on notification requests in web UI
...
Port 0cea7a623b
2024-04-06 21:51:51 +02:00
Eugen Rochko
b55bbfa2b3
[Glitch] Change design of notification about lost connections in web UI
...
Port 29f9dc742e
2024-04-06 21:49:57 +02:00
Eugen Rochko
1ae08ae257
[Glitch] Change out-of-band hashtags design in web UI
...
Port dd061291b1
2024-04-06 21:48:52 +02:00
Claire
0e76b919b5
Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream
2024-04-06 21:48:35 +02:00
Claire
a844a6a577
[Glitch] Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately
...
Port dfa43707eb
2024-04-06 21:39:04 +02:00
Claire
c3a128f31e
Remove strings already defined upstream
2024-04-06 21:25:04 +02:00
Claire
afaad0755f
[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional
...
Port 37ca59815c
2024-04-06 21:17:45 +02:00
Claire
1d1c3a808a
Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' 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
f635cde756
[Glitch] Change new modals to allow vertical scrolling
...
Port de6c9e0fcd
2024-04-06 20:43:43 +02:00
Claire
0f8b33238f
[Glitch] Change icon of severed relationships notifications
...
Port 387c78ddf9
2024-04-06 20:39:07 +02:00
Renaud Chaput
576c085ea0
[Glitch] Add the role ID to the badge component
...
Port ec1e770fea
2024-04-06 20:35:29 +02:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
f14b6f3d99
[Glitch] Fix duplicate translation string for severed relationships
...
Port 885d0faf83
2024-04-06 20:31:09 +02:00
