29a91b871e
Fix glitch-soc Markdown linting issues ( #2168 )
2 years ago
10469a0b85
Move locale-data back to `app/javascript/mastodon/locales/locale-data` ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2 years ago
dc6befe1a4
Fix migrating from upstream to glitch-soc messing with hide_notifications mute settings ( #2164 )
2 years ago
c3a8f6a0a3
Fix glitch-soc HAML linting issues ( #2166 )
2 years ago
02d5c69404
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2 years ago
aa08a72654
Merge pull request #2161 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
69ca6316ec
[Glitch] Fix inconsistent radius in drawer
...
Port fa98363a27
2 years ago
d13ef49b15
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
0e919397db
Fix unescaped user input in LDAP query ( #24379 )
2 years ago
af01ab7efe
Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
fa98363a27
Fix inconsistent radius in drawer ( #24407 )
2 years ago
a8cd1b1238
Bump glob from 9.3.2 to 9.3.4 ( #24383 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
d909aa3c3b
Bump devise from 4.9.0 to 4.9.2 ( #24393 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
dd3e232126
Bump doorkeeper from 5.6.5 to 5.6.6 ( #24399 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
52089d254d
Bump tzinfo-data from 1.2023.2 to 1.2023.3 ( #24400 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
8e19c44b2c
Align typings with installed versions ( #24410 )
2 years ago
d29cf8a044
[Glitch] Add colour to follow button when hashtag is being followed
...
Port 77bd32a26a
2 years ago
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
8192b0da7c
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
77bd32a26a
Add colour to follow button when hashtag is being followed ( #24361 )
2 years ago
23813e23b3
Bump uri from 0.12.0 to 0.12.1 ( #24341 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
5d67fc09c3
Clean up JS dependencies ( #24377 )
2 years ago
5c499f54e3
Change root Chewy strategy to emit a warning instead of erroring out in production mode ( #24327 )
2 years ago
4909c2e718
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
373e4a8ff0
Move ESLint configs to overrides ( #24370 )
2 years ago
be230be734
Fix build issues caused by #16210 ( #24374 )
2 years ago
4520e6473a
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2 years ago
2f7c3cb628
Update redis_config.rb to remove warning message ( #24352 )
2 years ago
7b15f4006a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
2b11376411
Change search pop-out in web UI ( #24305 )
2 years ago
46483ae849
Fix regressions from change in account row design in web UI ( #24343 )
2 years ago
d5ad8b6422
Fix Redis client and type errors introduced in #24285 ( #24342 )
2 years ago
d874a7a10f
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port 74f56c64fc
2 years ago
a8f0592b72
[Glitch] Move marky to devDependency
...
Port ddb769f0b8
2 years ago
4aaa1772b6
Restore exif-js dependency
2 years ago
3dcba94e68
Migrate glitch-soc's exclusive user settings
2 years ago
280fa3b2c0
Fix invalid/expired invites being processed on sign-up ( #24337 )
2 years ago
01d6f7529f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2 years ago
c6c03b49b2
Add Roadmap to README ( #24288 )
2 years ago
f318f1ef0e
Bump ruby to 3.2.2 due to ReDoS vulnerabilities ( #24320 )
2 years ago
1f19d5e5e8
Add documentation for Rubocop overrides ( #23811 )
2 years ago
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2 years ago
7646ad8a2b
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
500d6f93be
Autofix Rubocop Style/IdenticalConditionalBranches ( #24322 )
2 years ago
83fc97285b
Enable Rubocop Metrics/BlockLength with Excludes ( #24260 )
2 years ago
b4f38edf74
Wrong type for user setting when default is defined by lambda ( #24321 )
2 years ago
68a192e718
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2 years ago
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
e7c3e55874
Fix stale apt index in github actions ( #24319 )
2 years ago
67450cf002
Bump cssnano from 5.1.15 to 6.0.0 ( #24296 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
Claire
Rubicon Rowe
dependabot[bot]
Nick Schonning
Christian Schmidt
Eugen Rochko
Renaud Chaput
fusagiko / takayamaki
Alison Wheeler
Vyr Cossont
Tdxdxoz
Sai