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

7537 Commits

Author SHA1 Message Date
Claire 666760f450 Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.
 2024-05-14 20:47:14 +02:00
Renaud Chaput 1bf661cddb
Fix missing prop warning for `<Account>` (#30291) 2024-05-14 18:15:42 +00:00
github-actions[bot] 3a7aec2807
New Crowdin Translations (automated) (#30254) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-13 11:30:41 +00:00
David Lapshin cb93c1edf0
Add active animation to header settings button (#30221) 2024-05-13 09:19:42 +00:00
Chee Aun f65a6d50f1 [Glitch] Fix typo 
Port c36a8786c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-11 22:44:41 +02:00
Claire f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
github-actions[bot] c9557bdd3b
New Crowdin Translations (automated) (#30215) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-10 09:34:48 +00:00
Chee Aun c36a8786c1
Fix typo (#30224) 2024-05-10 09:19:27 +00:00
Claire f7dadc9f0b Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream 2024-05-07 12:13:02 +02:00
github-actions[bot] ed556db395
New Crowdin Translations (automated) (#30201) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-07 09:36:16 +00:00
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2024-05-06 17:53:51 +02:00
github-actions[bot] 9be2c02e52
New Crowdin Translations (automated) (#30169) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-06 08:36:29 +00:00
Renaud Chaput c59f6ef5b8 [Glitch] Convert `entrypoints/two_factor_authentication` to Typescript 
Port 9e260014c7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 16:30:24 +02:00
mogaminsk b6ada33ad4 [Glitch] Fix word breaking in filtered notifications badge 
Port 616e2f2666 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 16:30:05 +02:00
Claire 3789d9f825 Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Claire 4b82dc84f5 [Glitch] Change width breakpoint for mobile placement behavior 
Port 26e10aa203 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-04 16:16:22 +02:00
Claire 6662d604c1 [Glitch] Add loading indicator and empty result message to advanced interface search 
Port 7d3fe2b4c3 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 b9b4db483c 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 4527e012da 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 36909065b5 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 4f4b77920e 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 65093c619f 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 de4a7bf531 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 4ef0b48b95 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 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
Renaud Chaput 9e260014c7
Convert `entrypoints/two_factor_authentication` to Typescript (#30105) 2024-05-02 12:02:13 +00:00
mogaminsk 616e2f2666
Fix word breaking in filtered notifications badge (#30114) 2024-05-02 09:40:18 +00:00
github-actions[bot] 309f352e6a
New Crowdin Translations (automated) (#30140) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-02 08:57:30 +00: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 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
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