glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	b27a9a5903	Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	8188522bde	[Glitch] Fix prev/next buttons color in media viewer Port `675672feb6` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Christian Schmidt	7e25fd9b0c	[Glitch] Translate CW, poll options and media descriptions Port `69057467cb` to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	93c714417f	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.	1 year ago
Renaud Chaput	9e133e2527	[Glitch] Upgrade react-intl Port `44cd88adc4` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	85722a918d	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.	1 year ago
dependabot[bot]	7fc1297c3e	[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 Port `89d6341c80` to glitch-soc Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	5e876c2901	[Glitch] Fix `null` signUp URL in various places Port `14bb6bb29a` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
y.takahashi	4993b6e800	[Glitch] Handle Surrogate Pairs in truncate() Port `64b960b6b3` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	1 year ago
Claire	ee771f5bad	Fix closeModal invocation (#2239 ) Fixes #2238 Some call sites where missed in `382b2a506a`	1 year ago
Claire	e9385e93e9	Add a confirmation screen when suspending a domain (#25144 )	1 year ago
Renaud Chaput	675672feb6	Fix prev/next buttons color in media viewer (#25231 )	1 year ago
Christian Schmidt	69057467cb	Translate CW, poll options and media descriptions (#24175 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	44cd88adc4	Upgrade react-intl (#24906 )	1 year ago
dependabot[bot]	89d6341c80	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	14bb6bb29a	Fix `null` signUp URL in various places (#25190 )	1 year ago
y.takahashi	64b960b6b3	Handle Surrogate Pairs in truncate() (#25148 )	1 year ago
Claire	5ed48e6878	Fix extraneous newlines	1 year ago
fusagiko / takayamaki	382b2a506a	[Glitch] Rewrite actions/modal and reducers/modal with typescript Port `38c6216082` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
たいちひ	6a592083f1	[Glitch] Fix export style of `<LoadGap />` based on `<Domain />` Port `4197b5e4c8` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	0009b4b574	[Glitch] Update inconsistent `defaultMessage` Port `e58c36d308` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	0669783da8	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Eugen Rochko	e7dc375aab	[Glitch] Change share action from being in action bar to being in dropdown in web UI Port `1caa5ff39e` to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	7bec63e6e2	[Glitch] Fix `null` signUp URL handling from #25014 Port `40b948a1fb` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
たいちひ	017fbc7a74	[Glitch] Rewrite `<LoadGap />` as FC and TS Port `7336f3648b` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	0e7466717f	Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	1 year ago
Claire	7d7db8977b	Fix import order with ESLint Port `d27216dc46` to glitch-soc	1 year ago
Claire	1cd7f5ff17	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.	1 year ago
Claire	9e5278ea7b	[Glitch] Add support for custom sign-up URLs Port `ca66e61b93` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	8f380a33fc	[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe Port `100840c06e` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	6dbd44faea	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	1 year ago
Claire	a0bc0619ca	[Glitch] Use JSX syntax for Fragments Port `5a16bd7bf4` to glitch-soc	1 year ago
Claire	8278907ff7	Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream	1 year ago
Claire	6001f5ff36	[Glitch] Use the new JSX transform everywhere Port `8f66126b10` to glitch-soc	1 year ago
Claire	9381f78166	Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream	1 year ago
Claire	1347ca6eb0	fixup! [Glitch] Upgrade to React 18	1 year ago
たいちひ	60c7e559d8	[Glitch] Rewrite `<TimelineHint />` as FC and TS Port `9a472efe7c` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
たいちひ	6746e5d430	[Glitch] Rewrite `<Skeleton/>` as FC and TS Port `8066118d1f` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	892b3c16f5	[Glitch] Allow scripts in post embed previews Port `711a037660` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	3b375ee395	[Glitch] Upgrade to React 18 Port `8d6aea3326` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	45d7358100	Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream	1 year ago
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	1 year ago
Claire	ad1098970b	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. - `app/views/admin/settings/registrations/show.html.haml`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. Additional changes: - `Gemfile`: Upstream added hcaptcha dependency in another place in the file. - `config/settings.yml`: Upstream added the `captcha_enabled` setting in another place in the file.	1 year ago
Claire	ba73f0ea3a	[Glitch] Add polling and automatic redirection to `/start` on email confirmation Port `e60414792d` to glitch-soc	1 year ago
Claire	f959f6cdbb	Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream	1 year ago
Claire	b0ec3bfcf9	[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline Port `7b54e47d03` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Christian Schmidt	4a1f4cb6a2	[Glitch] Fix UI crash in moderation interface when opening the media modal Port `5241f7b2fd` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Eugen Rochko	d728222121	[Glitch] Change "Sign in" to "Login" Port `3869e8c210` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago

1 2 3 4 5 ...

6224 Commits (b27a9a590367d498b8fab922bfe9863b63b47f65)