475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
1 year ago
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
1 year ago
bf23afa059
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from 0766c9a631
1 year ago
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
1 year ago
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
9e66c07be7
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
1 year ago
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
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
1 year ago
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
1 year ago
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
1 year ago
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
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
1 year ago
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
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
1 year ago
3b21c13dcc
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
1 year ago
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
1 year ago
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
1 year ago
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
1 year ago
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
1 year ago
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
1 year ago
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
0daf78f903
Add `allow_other_host: true` to backups controller ( #25266 )
1 year ago
4a5464f360
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
1 year ago
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
1 year ago
768b00c4d0
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
1 year ago
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
1 year ago
94329f28e1
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
1 year ago
acc419b81b
Fix spacing of middle dots in the detailed status meta section ( #25247 )
1 year ago
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
5fae2de454
Fix overflow behavior of account rows ( #25131 )
1 year ago
8884d1ece0
Add support for importing lists ( #25203 )
1 year ago
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
1 year ago
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
44cd88adc4
Upgrade react-intl ( #24906 )
1 year ago
00c222377d
Remove unused Settings::Extend module ( #25214 )
1 year ago
b7d995cb00
Disable some metrics cops ( #25215 )
1 year ago
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
1 year ago
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
14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
1 year ago
8c183a9831
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
1 year ago
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
1 year ago
Claire
Darius Kazemi
Jed Fox
Renaud Chaput
S.H
Christian Schmidt
Matt Jankowski
dependabot[bot]
y.takahashi
Eugen Rochko