970001fd77
[Glitch] HTML string attributes set as booleans
...
Port 4ba81aa8dd
2 years ago
9558de3b67
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2 years ago
0cbf19affd
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2 years ago
69a94bf6e1
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
172a4ad9f4
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2 years ago
2d9cb47a4b
Fix glitch-soc HAML linting issues ( #2166 )
2 years ago
07497b9956
Fix tooltip for dates without time ( #24244 )
2 years ago
c9fed25d56
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2 years ago
d30c48c975
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2 years ago
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2 years ago
b2e306d3db
Fix account header image missing in low-res ( #24433 )
2 years ago
66cbd18531
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
0174059370
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
caf209b28b
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2 years ago
2507c0a462
Fix height of announcements not being updated when using reduced animations ( #24354 )
2 years ago
a334f64652
Update display_media typing to string ( #24416 )
2 years ago
37e98d9d56
Set marginRight as string ( #24422 )
2 years ago
d5a6c93808
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2 years ago
24919590a0
Enable Stylelint property-no-unknown ( #24404 )
2 years ago
0679fcd2f1
Fix styling regressions from RTL layout refactor ( #24415 )
2 years ago
53376db94c
Ensure tabIndex is number instead of string ( #24409 )
2 years ago
4ba81aa8dd
HTML string attributes set as booleans ( #24408 )
2 years ago
f49d2ec5a3
[Glitch] Fix inconsistent radius in drawer
...
Port ffa9249c1e
2 years ago
8364f82281
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
6ccd12b521
Fix unescaped user input in LDAP query ( #24379 )
2 years ago
ffa9249c1e
Fix inconsistent radius in drawer ( #24407 )
2 years ago
72a1dd736a
Align typings with installed versions ( #24410 )
2 years ago
90ecb96dba
[Glitch] Add colour to follow button when hashtag is being followed
...
Port d5da587d27
2 years ago
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
d5da587d27
Add colour to follow button when hashtag is being followed ( #24361 )
2 years ago
1c1bbbebd6
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
d0bf149232
Move ESLint configs to overrides ( #24370 )
2 years ago
4866812b28
[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
b12fcd3d7a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
d22e712648
Change search pop-out in web UI ( #24305 )
2 years ago
4e63f1e64b
Fix regressions from change in account row design in web UI ( #24343 )
2 years ago
15f9f8962e
Fix Redis client and type errors introduced in #24285 ( #24342 )
2 years ago
f9cc42d6db
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port d339684df5
2 years ago
bba0493afe
[Glitch] Move marky to devDependency
...
Port a159e8e5e1
2 years ago
bb5b3182f0
Migrate glitch-soc's exclusive user settings
2 years ago
db2b09bdd4
Fix invalid/expired invites being processed on sign-up ( #24337 )
2 years ago
1a0c54554f
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
5f1a0f550b
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2 years ago
3cf19b953f
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
41190c8172
Wrong type for user setting when default is defined by lambda ( #24321 )
2 years ago
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2 years ago
c75fccf033
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2 years ago
a9715ecd73
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2 years ago
72b4973f50
Requeue expiration notification ( #24311 )
2 years ago
Nick Schonning
Claire
Christian Schmidt
Matt Jankowski
Eugen Rochko
Rubicon Rowe
fusagiko / takayamaki
Vyr Cossont
Tdxdxoz
mogamin