8a131fb7bc
Fix `@rails/ujs` imports
2023-10-24 20:23:31 +02:00
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
e67c28a5fe
[Glitch] Remove redundant ready() wrapper
...
Port bb51c0676d
2023-08-24 20:35:22 +02:00
57a4e7927a
[Glitch] Add client-side timeout on resend confirmation button
...
Port 2f932cb2bb
2023-08-12 09:38:57 +02:00
9e66c07be7
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
2023-06-10 16:18:01 +02:00
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2023-05-25 23:45:01 +02:00
ba73f0ea3a
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port e60414792d
2023-05-25 22:37:14 +02:00
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2023-05-25 21:43:19 +02:00
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2023-05-09 23:20:24 +02:00
108720d7b0
[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
...
Port 955179fc55
2023-05-09 22:28:53 +02:00
6ea9137233
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 955ec252a4
2023-04-22 10:47:44 +02:00
7b04c2fb71
[Glitch] Fix tooltip for dates without time
...
Port aa136cf2fa
2023-04-09 12:04:17 +02:00
0f62451424
[Glitch] HTML string attributes set as booleans
...
Port a425915ce7
2023-04-09 11:56:02 +02:00
81ef21a0c8
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port 44a7d87cb1
2023-02-25 14:35:31 +01:00
b22da94a65
[Glitch] Render current day formats in the client timezone
...
Port c50e9d078a
2022-12-15 20:57:17 +01:00
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
9363e5c24e
[Glitch] Change public accounts pages to mount the web UI
...
Port 839f893168
2022-10-28 19:24:02 +02:00
14ddb85c3b
[Glitch] Remove code for rendering public and hashtag timelines outside the web UI
...
Port 02ba9cfa35
2022-10-28 19:24:02 +02:00
b728b25c10
Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji
2022-10-11 12:43:19 +02:00
b75bf336bd
Move more modules from flavours/glitch/utils to flavours/glitch
2022-10-11 12:25:45 +02:00
7097a459be
Move flavours/glitch/utils/ready to flavours/glitch/ready
2022-10-11 11:31:11 +02:00
d3879c07b1
Rename flavours/glitch/util into flavours/glitch/utils
2022-10-11 11:31:11 +02:00
f4fe985a03
[Glitch] Fix missing await
...
Port fc3d248df7
2022-10-09 18:23:15 +02:00
cc93cd5d6c
[Glitch] Disable push notification when not logged in
...
Port 216dbaedaf
2022-10-09 18:23:15 +02:00
f218e633b4
[Glitch] [SSR only] Revamp post filtering system
...
Port CSS and JS for Server-Side Rendered pages from 02851848e9
2022-06-28 11:35:28 +02:00
d70e4e3da0
[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
...
Port 00b45b967e
2022-02-17 11:04:13 +01:00
ec4f906618
Fix toggling sidebar on mobile in admin pages
2022-02-16 16:33:23 +01:00
59a5193280
[Glitch] Show correct error message if chosen password is too long
...
Port 66baa629ea
2021-12-16 16:26:04 +01:00
8b8d58c670
Rename, move, fix code
2021-11-12 19:51:35 +01:00
3238e60823
Fix admin sidebar on Mobile layout
2021-11-12 19:51:35 +01:00
7aec1bc308
[Glitch] Add graphs and retention metrics to admin dashboard ( #16829 )
...
Port 07341e7aa6
2021-10-14 21:45:01 +02:00
9a5825f864
[Glitch] Add honeypot fields and minimum fill-out time for sign-up form
...
Port 49eb4d4ddf
2020-12-10 09:44:16 +01:00
813c84cd6c
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
...
Port 4c45b43cb8
2020-10-21 21:28:47 +02:00
0f71372d63
[Glitch] Add client-side validation in password change forms
...
Port 7dc4c74265
2020-08-13 22:26:22 +02:00
b6c0f1fdc6
[Glitch] Add HTML form validation for the registration form
...
Port d70c3ab4c3
2020-08-13 22:25:33 +02:00
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
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
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
fe9a124f5a
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port c31d61d7f2
2020-02-06 21:41:50 +01:00
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
ec567337dc
[Glitch] fix: support KaiOS arrow navigation on public pages
...
Port 1e232e455c
2019-11-06 14:59:57 +01:00
9e2e623ebe
[Glitch] Change single-column mode to scroll the whole page
...
Port aa22b38fdb
2019-10-05 22:53:20 +02:00
14f797873d
Fix menu in settings/admin pages
2019-09-30 17:01:16 +02:00
27f922168a
[Glitch] Fix page body not being scrollable in admin layout
...
Port SCSS changes from b9a8b38844
2019-09-30 15:58:29 +02:00
2ecc7106d7
[Glitch] Fix eslint error of import/no-extraneous-dependencies
...
Port d0c2c52783
2019-09-18 17:27:51 +02:00
5971ea7466
[Glitch] Add public blocks to /about/blocks
...
Port SCSS changes from 9b6a5ed109
2019-08-19 21:56:25 +02:00
Claire