monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,581 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

21581 Commits

Author SHA1 Message Date
Eugen Rochko 8dbcf8a287 [Glitch] Change design of people tab on explore in web UI 
Port 0ec061aa8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:28:17 +02:00
Claire d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Eugen Rochko 333905b2d5 [Glitch] Change mute options to be in dropdown on muted users list in web UI 
Port 74012831f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:15:00 +02:00
Claire bac4026d80 Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream 2024-05-04 15:10:54 +02:00
Claire 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
Claire e7b09486ed
Merge pull request #2699 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a2399046ca
 2024-05-02 12:55:04 +02:00
Claire b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire eeefb7cdbc Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream 2024-05-01 19:42:34 +02:00
Claire 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
Claire 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
Claire df933836ca [Glitch] Fix incorrect label for filtered notifications badge 
Port 66ee0d4a1f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 19:18:06 +02:00
Claire 62b3f284db [Glitch] Fix unfollow button being out of frame on small screens on old browsers 
Port 4117c8f6b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 19:17:28 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
renovate[bot] ac5113d524 [Glitch] Update eslint (non-major) 
Port 37d984b8bf to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 19:04:59 +02:00
Claire e76ddf79bc [Glitch] Add `/` keyboard shortcut to focus the search field 
Port c386c36866 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 18:57:39 +02:00
Claire 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
Renaud Chaput 2d43547934 [Glitch] Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) 
Port 730e2127e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 18:43:37 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 555e33a392 Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict because of our different theming systems.
  Updated accordingly, along with `app/helpers/theme_helper.rb`
  and `app/helpers/theme_helper_spec.rb`.
 2024-05-01 18:38:55 +02:00
Michael Stanclift 3739dda2f6 [Glitch] Add purple border to active compose field search inputs 
Port 1c87cb8019 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:31:39 +02:00
Claire 0fb469e2f3 Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream 2024-05-01 17:30:52 +02:00
nicolas 41c43168fb [Glitch] Makes the star icon rotate around its actual centre axis 
Port c6da3ee828 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:27:59 +02:00
Michael Stanclift b21322b406 [Glitch] Fix blue border on emoji/language search in Safari & Chrome 
Port e284417349 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:27:29 +02:00
Michael Stanclift 4543bb9384 [Glitch] Fix language and emoji search field background colors on light theme 
Port 5d67247061 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:27:10 +02:00
Claire 3503fe1865 Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
Claire 46cc9141c9 [Glitch] Fix contrast in notification request badge 
Port 0b9d4103cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:23:07 +02:00
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:12:57 +02:00
Renaud Chaput c316852a65 [Glitch] Add API types for status and related objects 
Port e47a3d00fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:12:16 +02:00
Renaud Chaput 297c8c37b1 [Glitch] Fix Redux Middleware types 
Port 07635228e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 17:08:44 +02:00
Michael Stanclift 0f756eaed2 [Glitch] Fix search box color on light theme 
Port fa9574086d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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
Claire d52263e0e3 Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependencies as well.
 2024-05-01 17:04:33 +02:00
Michael Stanclift 3b1c8d56b2 [Glitch] Fix light theme header on mobile 
Port 90eb4a5d01 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 16:49:21 +02:00
Michael Stanclift 1783820acd [Glitch] Fix background tint in single column light theme 
Port 430da03160 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 16:48:55 +02:00
Renaud Chaput 375bd52d97 [Glitch] Handle `createAppAsyncThunk` rejected actions in the errors middleware 
Port 69e5771881 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:38 +02:00
Renaud Chaput cc720cd38f [Glitch] Fix `<RelativeTimestamp>` types 
Port 961bb84e4c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 0ab212f6a9 [Glitch] Fix props for `<Button>` 
Port d088964761 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 02f9ce9ce3 [Glitch] Fix PropTypes for some record objects 
Port f2fd1da23f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Claire 5cb4adbf4e [Glitch] Fix language picker and privacy picker not having a backdrop filter 
Port c913e2f3e5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 555f45f249 [Glitch] Fix notifications marker fetch 
Port b9982ce578 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 371c5e59eb [Glitch] Rewrite PIP state in Typescript 
Port 9fbe8d3a0c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 059e10e546 [Glitch] Rewrite markers reducer in Typescript 
Port 27d014a7fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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