mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,782 Commits
69 Branches
20 Tags
358 MiB
Commit Graph

21782 Commits (e853355f245765d7d77a3c6e39acd06e19ec0283)

Author SHA1 Message Date
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
Matt Jankowski b7902225d6
Use built-in github annotation output for `stylelint` (#30165) 2024-05-03 14:56:48 +00:00
Claire 33368e3e79
Change ActiveRecordEncryption variable to be more explicit (#30151) 2024-05-03 09:26:24 +00:00
Râu Cao 9aa31be8d3
Fix local account search on LDAP login being case-sensitive (#30113) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-03 09:22:48 +00:00
github-actions[bot] d5444a2c6c
New Crowdin Translations (automated) (#30160) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-03 09:15:06 +00:00
renovate[bot] 9380805fc1
Update dependency rubocop-rspec to v2.29.2 (#30158) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-03 08:48:09 +00:00
renovate[bot] 4b2054ee57
Update Yarn to v4.2.1 (#30153) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 21:22:26 +00:00
Claire 253ead3aa7
Fix not being able to block a subdomain of an already-blocked domain through the API (#30119) 2024-05-02 20:56:21 +00:00
Renaud Chaput 9e260014c7
Convert `entrypoints/two_factor_authentication` to Typescript (#30105) 2024-05-02 12:02:13 +00: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
mogaminsk 616e2f2666
Fix word breaking in filtered notifications badge (#30114) 2024-05-02 09:40:18 +00:00
Matt Jankowski 88882fbbee
Move Rails/HABTM cop out of todo (#30118) 2024-05-02 09:40:05 +00:00
Matt Jankowski 1e7d5d2957
Update `devise-two-factor` to version 5.0.0 (#28325) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-02 09:31:41 +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
Matt Jankowski 2447497a4c
Status length validation spec updates (#30132) 2024-05-02 08:31:06 +00:00
renovate[bot] d97d31cce6
Update dependency irb to v1.13.0 (#30143) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:28:13 +00:00
renovate[bot] ac1d830e6c
Update dependency aws-sdk-s3 to v1.149.0 (#30136) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:27:47 +00:00
renovate[bot] 474e5ffaae
Update dependency dotenv to v3.1.1 (#30133) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:15:49 +00:00
renovate[bot] 62992ba54a
Update dependency sass to v1.76.0 (#30138) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:14:45 +00:00
renovate[bot] a9dd68b90a
Update dependency react-redux to v9.1.2 (#30146) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:00:43 +00: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