djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-20 06:33:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,628 Commits 69 Branches 22 Tags 412 MiB
Commit Graph

13071 Commits

Author SHA1 Message Date
Claire
6662d604c1 [Glitch] Add loading indicator and empty result message to advanced interface search 
Port 7d3fe2b4c3cd9511df8f8026890c71b2119719f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 16:15:54 +02:00
Renaud Chaput
e62595c966 [Glitch] Remove usage of deprecated defaultTypes on React functional components 
Port b9b4db483cc588a2eb334b63fe6740c8dad9b57b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 16:15:16 +02:00
Claire
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
Renaud Chaput
494d28bb56 [Glitch] Convert entrypoints/sign_up to Typescript 
Port 4527e012daa61dc07258eaedf3e03179b59fca8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:51:58 +02:00
Renaud Chaput
fe7db7905f [Glitch] Convert easy entrypoints files to Typescript 
Port 36909065b544d06e8487f1e0679e595fd01a7f22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:49:30 +02:00
David Beck
defd1e4024 [Glitch] Remove home marker updates 
Port 4f4b77920eeb3ba65346862d489945494dfeab64 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:42:33 +02:00
Claire
a76980a229 Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream 2024-05-04 15:40:07 +02:00
Renaud Chaput
552e09d57f [Glitch] Fix marker thunks to not ignore eslint directives for the whole file 
Port 65093c619fdd1b18a4cf0c288051d8c524d5f434 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:30:18 +02:00
Claire
a4ce53df27 [Glitch] Change moderation warning notification icon 
Port de4a7bf53159f72a9a122bf8df21e8d5f4ad7512 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:29:51 +02:00
Claire
aac59a34ed [Glitch] Add in-app notifications for moderation actions/warnings 
Port 4ef0b48b951d65920d3a3d9cdfd099967c5e4f6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 15:29:29 +02:00
Eugen Rochko
8dbcf8a287 [Glitch] Change design of people tab on explore in web UI 
Port 0ec061aa8f7383330b26b3323d2fafd9ec7663e3 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 74012831f61a36b7f52540c5ccafa0f9692a6596 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
b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +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 66ee0d4a1f35ce4455418921879b8d2f96538d57 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 4117c8f6b88f72a9f2a3177f2c02708b7e05c772 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 37d984b8bf19f86a8a371a97d8a1a000022448b3 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 c386c36866881ac3bd3d0b156264231f7b4c8053 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 730e2127e1fa0e81952bb83d91cede91d8b47b72 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 1c87cb8019bafd2eb5b126ed0e9186ce20e94b1e 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 c6da3ee828ba2f8ddadfbb8b51a6fba90abc6824 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 e2844173499254bd5f460ca2c205d16de228db62 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 5d67247061770bb4228c479dd03845735b849e3a 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 0b9d4103cb5502faee4cc61717aa5454f63bc8f5 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 b4d991adaa82e05a2dd95ae5c08bb374391ef568 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 e47a3d00fe21fa51ee1aeffbfb5e152f1f715fef 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 07635228e2b2182888850cecddd4b09756d9edbc 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 fa9574086d1b2cc16a733cd60677054c67eed48d 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
Michael Stanclift
3b1c8d56b2 [Glitch] Fix light theme header on mobile 
Port 90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16 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 430da0316062d3fabfb74dec68bb6de9d42ee750 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 69e5771881037e52380712dfc029c101f76efe74 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 67442f90393c644064bf34d531bdebe15f88d729 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 4f068d4fcc4d134fcbd56faa8f39c608dd343417 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 961bb84e4c87555bbce930a87291938a988a483a 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 d08896476100e440d340f19540ae964887bc0a57 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 f2fd1da23fa6bc1847bf7d96a76826f36b29ae8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00