4b82dc84f5
[Glitch] Change width breakpoint for mobile placement behavior
...
Port 26e10aa203
2024-05-04 16:16:22 +02:00
6662d604c1
[Glitch] Add loading indicator and empty result message to advanced interface search
...
Port 7d3fe2b4c3
2024-05-04 16:15:54 +02:00
e62595c966
[Glitch] Remove usage of deprecated `defaultTypes` on React functional components
...
Port b9b4db483c
2024-05-04 16:15:16 +02:00
f09f5b35f2
Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' 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
494d28bb56
[Glitch] Convert `entrypoints/sign_up` to Typescript
...
Port 4527e012da
2024-05-04 15:51:58 +02:00
fe7db7905f
[Glitch] Convert easy entrypoints files to Typescript
...
Port 36909065b5
2024-05-04 15:49:30 +02:00
defd1e4024
[Glitch] Remove home marker updates
...
Port 4f4b77920e
2024-05-04 15:42:33 +02:00
a76980a229
Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream
2024-05-04 15:40:07 +02:00
552e09d57f
[Glitch] Fix marker thunks to not ignore eslint directives for the whole file
...
Port 65093c619f
2024-05-04 15:30:18 +02:00
a4ce53df27
[Glitch] Change moderation warning notification icon
...
Port de4a7bf531
2024-05-04 15:29:51 +02:00
aac59a34ed
[Glitch] Add in-app notifications for moderation actions/warnings
...
Port 4ef0b48b95
2024-05-04 15:29:29 +02:00
8dbcf8a287
[Glitch] Change design of people tab on explore in web UI
...
Port 0ec061aa8f
2024-05-04 15:28:17 +02:00
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
333905b2d5
[Glitch] Change mute options to be in dropdown on muted users list in web UI
...
Port 74012831f6
2024-05-04 15:15:00 +02:00
bac4026d80
Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream
2024-05-04 15:10:54 +02:00
bceb45adda
Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/entrypoints/common.js`:
Upstream moved everything from `app/javascript/packs` to
`app/javascript/entrypoints` while this file was a glitch-soc
addition. Moved it like the rest.
- `tsconfig.json`:
Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
2024-05-04 14:59:00 +02:00
9e260014c7
Convert `entrypoints/two_factor_authentication` to Typescript ( #30105 )
2024-05-02 12:02:13 +00:00
616e2f2666
Fix word breaking in filtered notifications badge ( #30114 )
2024-05-02 09:40:18 +00:00
309f352e6a
New Crowdin Translations (automated) ( #30140 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-02 08:57:30 +00:00
b039e62194
Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
6204d13a2e
Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
There was an extra newline in glitch-soc for some reason.
Removed it.
2024-05-01 19:38:34 +02:00
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
df933836ca
[Glitch] Fix incorrect label for filtered notifications badge
...
Port 66ee0d4a1f
2024-05-01 19:18:06 +02:00
62b3f284db
[Glitch] Fix unfollow button being out of frame on small screens on old browsers
...
Port 4117c8f6b8
2024-05-01 19:17:28 +02:00
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
ac5113d524
[Glitch] Update eslint (non-major)
...
Port 37d984b8bf
2024-05-01 19:04:59 +02:00
e76ddf79bc
[Glitch] Add `/` keyboard shortcut to focus the search field
...
Port c386c36866
2024-05-01 18:57:39 +02:00
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' 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
2d43547934
[Glitch] Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`)
...
Port 730e2127e1
2024-05-01 18:43:37 +02:00
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
3739dda2f6
[Glitch] Add purple border to active compose field search inputs
...
Port 1c87cb8019
2024-05-01 17:31:39 +02:00
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
41c43168fb
[Glitch] Makes the star icon rotate around its actual centre axis
...
Port c6da3ee828
2024-05-01 17:27:59 +02:00
b21322b406
[Glitch] Fix blue border on emoji/language search in Safari & Chrome
...
Port e284417349
2024-05-01 17:27:29 +02:00
4543bb9384
[Glitch] Fix language and emoji search field background colors on light theme
...
Port 5d67247061
2024-05-01 17:27:10 +02:00
3503fe1865
Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream
2024-05-01 17:26:21 +02:00
46cc9141c9
[Glitch] Fix contrast in notification request badge
...
Port 0b9d4103cb
2024-05-01 17:23:07 +02:00
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
87b9b23025
[Glitch] Use integers and not numbers in notification policy API counters
...
Port b4d991adaa
2024-05-01 17:12:57 +02:00
c316852a65
[Glitch] Add API types for status and related objects
...
Port e47a3d00fe
2024-05-01 17:12:16 +02:00
297c8c37b1
[Glitch] Fix Redux Middleware types
...
Port 07635228e2
2024-05-01 17:08:44 +02:00
0f756eaed2
[Glitch] Fix search box color on light theme
...
Port fa9574086d
2024-05-01 17:08:05 +02:00
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
3b1c8d56b2
[Glitch] Fix light theme header on mobile
...
Port 90eb4a5d01
2024-05-01 16:49:21 +02:00
1783820acd
[Glitch] Fix background tint in single column light theme
...
Port 430da03160
2024-05-01 16:48:55 +02:00
375bd52d97
[Glitch] Handle `createAppAsyncThunk` rejected actions in the errors middleware
...
Port 69e5771881
2024-05-01 16:48:27 +02:00
7f404fd635
Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream
2024-05-01 16:47:25 +02:00
b3d5567bd0
[Glitch] Remove global `boosts` state and convert boosts modal to Typescript
...
Port 67442f9039
2024-05-01 16:42:20 +02:00
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
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
cc720cd38f
[Glitch] Fix `<RelativeTimestamp>` types
...
Port 961bb84e4c
2024-05-01 15:56:37 +02:00
0ab212f6a9
[Glitch] Fix props for `<Button>`
...
Port d088964761
2024-05-01 15:56:37 +02:00
02f9ce9ce3
[Glitch] Fix PropTypes for some record objects
...
Port f2fd1da23f
2024-05-01 15:56:37 +02:00
5cb4adbf4e
[Glitch] Fix language picker and privacy picker not having a backdrop filter
...
Port c913e2f3e5
2024-05-01 15:56:37 +02:00
555f45f249
[Glitch] Fix notifications marker fetch
...
Port b9982ce578
2024-05-01 15:56:37 +02:00
371c5e59eb
[Glitch] Rewrite PIP state in Typescript
...
Port 9fbe8d3a0c
2024-05-01 15:56:37 +02:00
059e10e546
[Glitch] Rewrite markers reducer in Typescript
...
Port 27d014a7fa
2024-05-01 14:55:03 +02:00
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
03af271d3d
[Glitch] Fix column borders disappearing in advanced interface on low width viewports
...
Port b2d841ce9a
2024-05-01 14:32:29 +02:00
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
d63c0a2879
[Glitch] Support "system" theme setting (light/dark theme depending on user system preference)
...
Port 02ea161506
2024-05-01 14:25:51 +02:00
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
26e10aa203
Change width breakpoint for mobile placement behavior ( #30131 )
2024-04-30 23:39:28 +00:00
d6048d3a6c
Add compatibility `app/javascript/flavours/glitch/styles/index.scss`
2024-04-30 21:27:04 +02:00
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
56821ed879
New Crowdin Translations (automated) ( #30128 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-30 09:05:53 +00:00
7d3fe2b4c3
Add loading indicator and empty result message to advanced interface search ( #30085 )
2024-04-29 09:55:41 +00:00
b9b4db483c
Remove usage of deprecated `defaultTypes` on React functional components ( #30099 )
2024-04-29 09:29:59 +00:00
4527e012da
Convert `entrypoints/sign_up` to Typescript ( #30106 )
2024-04-29 08:23:05 +00:00
9be7efedf0
New Crowdin Translations (automated) ( #30092 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-29 08:15:43 +00:00
36909065b5
Convert easy entrypoints files to Typescript ( #30102 )
2024-04-29 08:02:41 +00:00
4f4b77920e
Remove home marker updates ( #22721 )
2024-04-29 07:55:58 +00:00
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
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
dee57982f1
Rename “home” pack to “application”
2024-04-28 15:06:41 +02:00
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
62bc36416f
Get rid of `app/javascript/core`
...
Have all flavors implement everything they need instead.
2024-04-28 15:04:52 +02:00
65093c619f
Fix marker thunks to not ignore eslint directives for the whole file ( #30089 )
2024-04-26 17:11:27 +00:00
de4a7bf531
Change moderation warning notification icon ( #30081 )
2024-04-26 15:33:15 +00:00
5201882a23
New Crowdin Translations (automated) ( #30077 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-26 10:05:18 +00:00
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
0ec061aa8f
Change design of people tab on explore in web UI ( #30059 )
2024-04-25 16:25:33 +00:00
85fdbd0ad5
New Crowdin Translations (automated) ( #30062 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-25 08:50:54 +00:00
113c931cda
Fix follow request notifications not being displayed ( #2695 )
2024-04-24 17:00:48 +02:00
ebcf9840f4
New Crowdin Translations (automated) ( #30050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-24 08:45:24 +00:00
74012831f6
Change mute options to be in dropdown on muted users list in web UI ( #30049 )
2024-04-24 08:45:12 +00:00
3f6887557b
Move JS source from `packs` to `entrypoints` ( #30037 )
2024-04-23 16:45:12 +00:00
32ead51e5a
Add material design icons to admin/settings views ( #27780 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-23 16:43:49 +00:00
d754b15afb
New Crowdin Translations (automated) ( #30034 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-23 09:07:05 +00:00
75163d9daf
Fixed rendering error on /start when not logged in ( #30023 )
2024-04-22 08:53:08 +00:00
3655fb6a22
New Crowdin Translations (automated) ( #30014 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-22 08:42:35 +00:00
c61130af33
New Crowdin translations
2024-04-22 04:27:38 +00:00
ec71c02c4b
New Crowdin Translations (automated) ( #29994 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-19 13:57:43 +00:00
443186ff40
New Crowdin Translations (automated) ( #29980 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-18 11:18:39 +00:00
c35042b7eb
New Crowdin Translations (automated) ( #29972 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-17 09:07:13 +00:00
66ee0d4a1f
Fix incorrect label for filtered notifications badge ( #29922 )
2024-04-16 09:25:23 +00:00
285d4123b5
New Crowdin Translations (automated) ( #29955 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-16 08:36:21 +00:00
4117c8f6b8
Fix unfollow button being out of frame on small screens on old browsers ( #29923 )
2024-04-15 11:56:48 +00:00
4e78cb9988
New Crowdin Translations (automated) ( #29939 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-15 09:29:39 +00:00
c386c36866
Add `/` keyboard shortcut to focus the search field ( #29921 )
2024-04-12 09:42:12 +00:00
Claire
Renaud Chaput
David Beck
Eugen Rochko
mogaminsk
github-actions[bot]
renovate[bot]
Michael Stanclift
nicolas
Matt Jankowski
Tim Rogers
GitHub Actions