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

21299 Commits (7208edbd37a90e3b417c3846c7cc2ec099e1e0ba)

Author SHA1 Message Date
Eugen Rochko 3631ddbfc9 [Glitch] Change icons in navigation panel to be filled when active in web UI 
Port 16c856729b

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 18:09:07 +01:00
Renaud Chaput 6440651976 [Glitch] Use the server setting to get the max number of poll options in UI 
Port b9722dfe2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:38:07 +01:00
Eugen Rochko efbc8cba17 [Glitch] Change dropdown menu icon to not be replaced by close icon when open in web UI 
Port 2347ea813e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:36:07 +01:00
Eugen Rochko 777510a696 [Glitch] Add hints for rules 
Port 5b3a8737d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:34:02 +01:00
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Matt Jankowski 24319836de
Convert request-based setup into factory setup in push/subscriptions request spec (#29489) 2024-03-11 15:46:25 +00:00
Matt Jankowski a38e424185
Use unchanging github links in docs/comments (#29545) 2024-03-11 15:14:55 +00:00
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
Eugen Rochko 19efa1b9f1
Change action button to be last on profiles in web UI (#29533) 2024-03-11 14:33:48 +00:00
Eugen Rochko 16c856729b
Change icons in navigation panel to be filled when active in web UI (#29537) 2024-03-11 13:35:23 +00:00
Jeong Arm 4a6ddbc9c0
Normalize idna domain before account unblock domain (#29530) 2024-03-11 09:28:08 +00:00
Matt Jankowski a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation (#29527) 2024-03-11 09:16:19 +00:00
Renaud Chaput b9722dfe2b
Use the server setting to get the max number of poll options in UI (#29490) 2024-03-11 09:13:35 +00:00
renovate[bot] 6984f94044
Update dependency autoprefixer to v10.4.18 (#29475) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 09:05:07 +00:00
Eugen Rochko 2347ea813e
Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532) 2024-03-11 08:57:23 +00:00
Eugen Rochko 5b3a8737d6
Add hints for rules (#29539) 2024-03-11 08:57:07 +00:00
Matt Jankowski 98ef38e34e
Ensure unique values in fabricators (#29515) 2024-03-11 08:53:24 +00:00
renovate[bot] 6f8ec6d7f8
Update dependency test-prof to v1.3.2 (#29528) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 08:50:54 +00:00
renovate[bot] 7b89d6842e
Update DefinitelyTyped types (non-major) (#29543) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 08:49:07 +00:00
renovate[bot] df3798a6fa
Update dependency eslint-plugin-jsdoc to v48.2.1 (#29544) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 08:49:04 +00:00
github-actions[bot] f85168b189
New Crowdin Translations (automated) (#29467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-11 07:37:04 +00:00
gunchleoc 81400b02b1
Add nds locale to posting languages (#27434) 2024-03-10 10:25:13 +00:00
Claire bb3ad2b2a9
Merge pull request #2669 from ClearlyClaire/glitch-soc/reduce-upstream-differences 
Reduce code differences with upstream
 2024-03-08 23:10:02 +01:00
Claire 46152a19a6 Convert logo.jsx to Typescript 2024-03-08 12:46:49 +01:00
Sunny Ripert 2b4e9fbc71 [Glitch] Add form element on focal point modal 
Port 8515bc7962 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-08 12:43:59 +01:00
Claire 98cf4b7ba0 Reduce code differences with upstream 2024-03-08 12:42:03 +01:00
neetshin 6996b96fab [Glitch] Make columns-area unscrollable when modal opened 
Port 2091ae92be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-08 11:50:23 +01:00
Claire a79bd2cd11 Make some CSS differences with upstream more explicit 2024-03-08 11:47:34 +01:00
Claire d09ab957d4 Remove duplicate `captcha_enabled` key in `app/models/form/admin_settings.rb` 2024-03-08 11:38:01 +01:00
Claire e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional (#2666) 2024-03-08 11:35:18 +01:00
Eugen Rochko e85a2aa18d
Fix interaction settings migration error when encountering no settings (#29529) 2024-03-08 09:10:07 +00:00
github-actions[bot] d002458c7b
New Crowdin Translations (automated) (#2661) 
* New Crowdin translations

* Fix bogus translations

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-07 22:39:48 +01:00
Claire f407505f75
Merge pull request #2667 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 653ce43abe
 2024-03-07 19:04:33 +01:00
renovate[bot] e8605a69d2
Update omniauth packages (#25306) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-03-07 18:02:24 +00:00
renovate[bot] 509528e2dc
Update dependency pg to v1.5.6 (#29477) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-07 17:33:54 +00:00
Eugen Rochko 50b17f7e10
Add notification policies and notification requests (#29366) 2024-03-07 14:53:37 +00:00
Mashiro 1fc6edfa84 [Glitch] Fix unhandled nullable attachments limitation counter 
Port b8bd94ca8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-07 13:01:21 +01:00
Claire 442a5cb66c Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream 2024-03-07 12:59:51 +01:00
Claire 3f239facff
Update flavor screenshots (#2664) 2024-03-07 12:59:00 +01:00
Renaud Chaput 653ce43abe
Update `json-jwt` gem to fix CVE-2023-51774 (#29520) 2024-03-07 11:11:14 +00:00
gunchleoc c01f4cebed
Add Mohawk to posting languages (#27115) 2024-03-07 11:04:31 +00:00
gunchleoc 995e15c24a
Add Jawi Malay to posting languages (#29098) 2024-03-07 11:03:41 +00:00
Claire 8c9341a67b
Further reduce pointless CSS differences with upstream (#2665) 2024-03-06 22:13:23 +01:00
Claire a11151d58f
Update our README and include upstream's (#2663) 2024-03-06 22:12:57 +01:00
Mashiro b8bd94ca8e
Fix unhandled nullable attachments limitation counter (#29183) 2024-03-06 12:53:54 +00:00
Claire 8f4cc711c2
Merge pull request #2662 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f89512fbed
 2024-03-05 20:56:08 +01:00
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
 2024-03-05 16:25:50 +01:00
renovate[bot] f89512fbed
Update dependency rack-cors to v2.0.2 [SECURITY] (#29507) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 15:09:52 +01:00
renovate[bot] 7265d47342
Update peter-evans/create-pull-request action to v6.0.1 (#29503) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:42:49 +00:00
renovate[bot] 4c138ee4eb
Update DefinitelyTyped types (non-major) (#29502) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:42:26 +00:00