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
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
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
Claire
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Eugen Rochko
375af259a2
[Glitch] Change back button to always appear in advanced web UI
...
Port be52633ee4
2024-04-06 19:55:13 +02:00
Claire
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
0f966209ca
[Glitch] Add notifications of severed relationships
...
Port 44bf7b8128
2024-04-06 19:38:57 +02:00
Claire
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' 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
Claire
9451997fa8
Refactor notifications code to reduce differences with upstream ( #2692 )
...
* Merge back `Follow` notification component
* Merge back part of `FollowRequestContainer` notification container
* Reduce differences with upstream in the `mention` case
* Reduce differences with upstream in the `favourite` case
* Reduce differences with upstream in the `reblog` case
* Reduce differences with upstream in the `status` case
* Reduce differences with upstream in the `update` case
* Reduce differences with upstream in the `poll` case
* Merge back `AdminSignup` notification component
* Merge back `AdminReport` notification container
2024-04-06 19:34:30 +02:00
github-actions[bot]
8a64406d34
New Crowdin Translations (automated) ( #2668 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 18:18:06 +02: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
Eugen Rochko
29f9dc742e
Change design of notification about lost connections in web UI ( #29731 )
2024-03-25 13:27:38 +00:00
Eugen Rochko
dd061291b1
Change out-of-band hashtags design in web UI ( #29732 )
2024-03-25 12:45:00 +00:00
github-actions[bot]
799e3be9bd
New Crowdin Translations (automated) ( #29726 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-25 11:07:38 +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
Renaud Chaput
6c381f20b1
Restore advanced filter bar setting ( #29737 )
2024-03-24 14:17:06 +00:00
Claire
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
Claire
de6c9e0fcd
Change new modals to allow vertical scrolling ( #29644 )
2024-03-22 16:21:50 +00:00
Claire
387c78ddf9
Change icon of severed relationships notifications ( #29712 )
2024-03-22 15:45:04 +00:00
Claire
dfa43707eb
Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
github-actions[bot]
5db5fa879b
New Crowdin Translations (automated) ( #29708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-22 14:50:03 +00:00
Renaud Chaput
ec1e770fea
Add the role ID to the badge component ( #29707 )
2024-03-22 11:59:35 +00:00
Claire
885d0faf83
Fix duplicate translation string for severed relationships ( #29689 )
2024-03-21 10:06:21 +00:00
github-actions[bot]
c007dd5dd2
New Crowdin Translations (automated) ( #29687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-21 09:57:45 +00:00
Claire
49089817b0
[Glitch] Fix “Explore” icon in navigation bar not being filled when selected
...
Port 3211e960ac
2024-03-20 18:33:00 +01:00
Claire
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
Eugen Rochko
be52633ee4
Change back button to always appear in advanced web UI ( #29669 )
2024-03-20 17:21:03 +00:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
