glitchier-soc

Commit Graph

Author	SHA1	Message	Date
alfe	83ae40e192	[Glitch] Rewrite `<LoadMore />` as FC and TS Port `fb5bf5cbf8` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	1 year ago
Claire	88c5ad3136	[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for / Port `1483a3ddfe` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
S.H	5a961f84cf	[Glitch] Fix not shown announcements in hometimeline. Port `a6c898f501` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	475185a2ee	[Glitch] Fix design issues with recent react-intl upgrade Port `c2c396157f` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Darius Kazemi	a8a30f1298	[Glitch] Add exclusive lists Port `bacb674921` to glitch-soc Co-authored-by: Liam Cooke <liam@liamcooke.com> Co-authored-by: John Holdun <john@johnholdun.com> Co-authored-by: Effy Elden <effy@effy.space> Co-authored-by: Lina Reyne <git@lina.pizza> Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	bf23afa059	[Glitch] Add card with who invited you to join when displaying rules on sign-up Port SCSS from `0766c9a631` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Jed Fox	753385d3e0	[Glitch] Fix spacing of middle dots in the detailed status meta section Port `acc419b81b` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	d8b0a732aa	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.	1 year ago
Renaud Chaput	9e66c07be7	[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading Port `b0780cfeed` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	734e186717	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did not port the changes as I want to try something a bit different.	1 year ago
S.H	a4d7a17089	[Glitch] Fix using Date.now() instead of intl.now() Port `b3f9a0da52` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	1 year ago
Claire	9af04d5a46	[Glitch] Add a confirmation screen when suspending a domain Port `e9385e93e9` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
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
Eugen Rochko	67d17ce194	Add `legal` as report category (#23941 )	1 year ago
Eugen Rochko	e4fd9503ec	Change design of dropdowns in web UI (#25107 )	1 year ago
Nick Schonning	c66250abf1	Autofix Rubocop Regex Style rules (#23690 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
alfe	fb5bf5cbf8	Rewrite `<LoadMore />` as FC and TS (#25259 )	1 year ago
Claire	6833732852	Fix autocomplete suggestions being cut off in compose form (#25275 )	1 year ago
Eugen Rochko	4eda233e09	Add webhook templating (#23289 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Eugen Rochko	0ddc895282	Change follow button in account row to be more obvious in web UI (#24956 )	1 year ago
Matt Jankowski	af135bddd0	Update `Admin::Metrics::Measure` classes for Rails 7 (#25236 )	1 year ago
Claire	1483a3ddfe	Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279 )	1 year ago
Matt Jankowski	3b21c13dcc	Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes (#25277 )	1 year ago
S.H	a6c898f501	Fix not shown announcements in hometimeline. (#25251 )	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	c2c396157f	Fix design issues with recent react-intl upgrade (#25272 )	1 year ago
Darius Kazemi	bacb674921	Add exclusive lists (#22048 ) Co-authored-by: Liam Cooke <liam@liamcooke.com> Co-authored-by: John Holdun <john@johnholdun.com> Co-authored-by: Effy Elden <effy@effy.space> Co-authored-by: Lina Reyne <git@lina.pizza> Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	0daf78f903	Add `allow_other_host: true` to backups controller (#25266 )	1 year ago
Eugen Rochko	4a5464f360	Change "Follow 7 people" to "Find at least 7 people to follow" in web UI (#24954 )	1 year ago
Claire	ee771f5bad	Fix closeModal invocation (#2239 ) Fixes #2238 Some call sites where missed in `382b2a506a`	1 year ago
Jed Fox	768b00c4d0	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )	1 year ago
Claire	0766c9a631	Add card with who invited you to join when displaying rules on sign-up (#23475 )	1 year ago
Claire	94329f28e1	Change wording of “Content cache retention period” setting to highlight destructive implications (#23261 )	1 year ago
Jed Fox	acc419b81b	Fix spacing of middle dots in the detailed status meta section (#25247 )	1 year ago
Renaud Chaput	b0780cfeed	Fix `/share` and cleanup and reorganize frontend locale loading (#25240 )	1 year ago
Claire	5fae2de454	Fix overflow behavior of account rows (#25131 )	1 year ago
Claire	8884d1ece0	Add support for importing lists (#25203 )	1 year ago
S.H	b3f9a0da52	Fix using Date.now() instead of intl.now() (#25234 )	1 year ago
Matt Jankowski	f84037ae2b	Remove unused #hash_to_object method in SettingsHelper (#25213 )	1 year ago
Claire	e9385e93e9	Add a confirmation screen when suspending a domain (#25144 )	1 year ago

1 2 3 4 5 ...

11152 Commits (83ae40e192db86a72a6092c8b99d5f3594d93ca6)