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

58 Commits

Author SHA1 Message Date
Renaud Chaput
9e66c07be7 [Glitch] Fix /share and cleanup and reorganize frontend locale loading 
Port b0780cfeeda641645ea65da257a72ec507e71647 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:18:01 +02:00
Renaud Chaput
9e133e2527 [Glitch] Upgrade react-intl 
Port 44cd88adc4e2f4028dcc2b08b98368f0dc90cee4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:37:08 +02:00
Claire
5ed48e6878 Fix extraneous newlines 2023-05-28 18:06:09 +02:00
Claire
7d7db8977b Fix import order with ESLint 
Port d27216dc4616d80659c0cc5d2a55394e0e1ae874 to glitch-soc
 2023-05-28 16:38:10 +02:00
Claire
6001f5ff36 [Glitch] Use the new JSX transform everywhere 
Port 8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7 to glitch-soc
 2023-05-28 14:18:43 +02:00
Renaud Chaput
3b375ee395 [Glitch] Upgrade to React 18 
Port 8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:45:01 +02:00
Claire
ba73f0ea3a [Glitch] Add polling and automatic redirection to /start on email confirmation 
Port e60414792d86a99c0f401f3c1bab92ee37835d39 to glitch-soc
 2023-05-25 22:37:14 +02:00
Renaud Chaput
e6a7cfd12e [Glitch] Add stricter ESLint rules for Typescript files 
Port 5eeb40bdbe4d5e7c5c60788c0e10311f4d125853 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:43:19 +02:00
Renaud Chaput
526fe33e2f [Glitch] Rework polyfills loading 
Port a3a2414f0ea91c26276728fc7f9d837f81828075 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-09 23:20:24 +02:00
Renaud Chaput
108720d7b0 [Glitch] Dont use CommonJS (require, module.exports) anywhere 
Port 955179fc55f2db2694ab2d1e98d5ae82af430571 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-09 22:28:53 +02:00
Eugen Rochko
6ea9137233 [Glitch] Add client-side validation for taken username in sign-up form 
Port 955ec252a421a5060345815bac0c63e8718bc3d8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 10:47:44 +02:00
Christian Schmidt
7b04c2fb71 [Glitch] Fix tooltip for dates without time 
Port aa136cf2fa177af1fea59279cb8bab0b2a042b2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-09 12:04:17 +02:00
Nick Schonning
0f62451424 [Glitch] HTML string attributes set as booleans 
Port a425915ce7d1148e9505c87889936c4c497061dd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-09 11:56:02 +02:00
Renaud Chaput
81ef21a0c8 [Glitch] Rename JSX files with proper .jsx extension 
Port 44a7d87cb1f5df953b6c14c16c59e2e4ead1bcb9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Francis Murillo
b22da94a65 [Glitch] Render current day formats in the client timezone 
Port c50e9d078aa3c353afc140669f1cedcd354ee53e to glitch-soc

Co-authored-by: Effy Elden <effy@effy.space>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-12-15 20:57:17 +01:00
Claire
eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
 2022-10-30 18:15:28 +01:00
Eugen Rochko
9363e5c24e [Glitch] Change public accounts pages to mount the web UI 
Port 839f893168ab221b08fa439012189e6c29a2721a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko
14ddb85c3b [Glitch] Remove code for rendering public and hashtag timelines outside the web UI 
Port 02ba9cfa35c7b2285950955619ae3431391e9625 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Claire
b728b25c10 Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji 2022-10-11 12:43:19 +02:00
Claire
b75bf336bd Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
Claire
7097a459be Move flavours/glitch/utils/ready to flavours/glitch/ready 2022-10-11 11:31:11 +02:00
Claire
d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2022-10-11 11:31:11 +02:00
Yamagishi Kazutoshi
f4fe985a03 [Glitch] Fix missing await 
Port fc3d248df770024b5ce0f33d93029d71f5051e43 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Yamagishi Kazutoshi
cc93cd5d6c [Glitch] Disable push notification when not logged in 
Port 216dbaedaf587db834cfdd53b896e9c7e1284d9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Claire
f218e633b4 [Glitch] [SSR only] Revamp post filtering system 
Port CSS and JS for Server-Side Rendered pages from 02851848e964675bb59919fa5fd1bdee2c1c29db

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-28 11:35:28 +02:00
Claire
d70e4e3da0 [Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden 
Port 00b45b967e0c92714e1ec54a2d5c924f8b1dd38b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-17 11:04:13 +01:00
Claire
ec4f906618 Fix toggling sidebar on mobile in admin pages 2022-02-16 16:33:23 +01:00
Rens Groothuijsen
59a5193280 [Glitch] Show correct error message if chosen password is too long 
Port 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-12-16 16:26:04 +01:00
Jeong Arm
8b8d58c670 Rename, move, fix code 2021-11-12 19:51:35 +01:00
Jeong Arm
3238e60823 Fix admin sidebar on Mobile layout 2021-11-12 19:51:35 +01:00
Eugen Rochko
7aec1bc308 [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 
Port 07341e7aa60fe7c7d4f298136af99276820940e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-10-14 21:45:01 +02:00
ThibG
9a5825f864 [Glitch] Add honeypot fields and minimum fill-out time for sign-up form 
Port 49eb4d4ddf61e25c5aaab89aa630ddd3c7f3c23d to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-10 09:44:16 +01:00
ThibG
813c84cd6c [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 
Port 4c45b43cb8a3d902c130729d36d559ec9de23d3e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:28:47 +02:00
ThibG
0f71372d63 [Glitch] Add client-side validation in password change forms 
Port 7dc4c742650ac69ec9a4459b656e172283511e4c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-13 22:26:22 +02:00
ThibG
b6c0f1fdc6 [Glitch] Add HTML form validation for the registration form 
Port d70c3ab4c39e642d41138ab693af77dd6c258e8c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-13 22:25:33 +02:00
Thibaut Girka
a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
 2020-05-03 21:23:49 +02:00
Thibaut Girka
9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
 2020-04-05 18:32:06 +02:00
Thibaut Girka
9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 2020-03-22 16:10:44 +01:00
ThibG
fe9a124f5a [Glitch] Fix dates (without time) being rendered as datetimes in public pages 
Port c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-06 21:41:50 +01:00
Thibaut Girka
dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
 2020-01-20 18:31:11 +01:00
Nolan Lawson
ec567337dc [Glitch] fix: support KaiOS arrow navigation on public pages 
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:59:57 +01:00
Eugen Rochko
9e2e623ebe [Glitch] Change single-column mode to scroll the whole page 
Port aa22b38fdbc1842549b6cbc0e0d948f85a71b92a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-05 22:53:20 +02:00
Thibaut Girka
14f797873d Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00
Eugen Rochko
27f922168a [Glitch] Fix page body not being scrollable in admin layout 
Port SCSS changes from b9a8b38844278f26b9d1d1d53256e0781ba3575a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-30 15:58:29 +02:00
nzws✨
2ecc7106d7 [Glitch] Fix eslint error of import/no-extraneous-dependencies 
Port d0c2c5278391b82ba7fa2f230bf237805ff61a0c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-18 17:27:51 +02:00
ThibG
5971ea7466 [Glitch] Add public blocks to /about/blocks 
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
c1231a846a [Glitch] Play animated custom emoji on hover 
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
 2019-07-23 16:24:21 +02:00
Thibaut Girka
9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka
5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka
278ff1318f [Glitch] Add attachment list fallback to public pages 
Port JS changes from 4fb94c758e3bf2e1c0525e9075c2d5dedc14c666 to glitch-soc
 2019-01-13 14:42:50 +01:00