e9fd7d9e02
[Glitch] Update display_media typing to string
...
Port a334f64652
2 years ago
bd52e88774
[Glitch] Set marginRight as string
...
Port 37e98d9d56
2 years ago
499485585e
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port d5a6c93808
2 years ago
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
af57bcd3cf
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2 years ago
a159e8e5e1
Move marky to devDependency ( #24258 )
2 years ago
5b9c983305
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
5ec33534f8
Refactor styles to use logical properties for positioning ( #23944 )
2 years ago
13db7d0075
Serialize status webhook events in REST API format ( #24243 )
2 years ago
a73b29e8cc
[Glitch] Remove legacy decorators syntax
...
Port e272fc91e4
2 years ago
57e9fc7e5a
[Glitch] Remove isNaN polyfill
...
Port 169b9c9b13
2 years ago
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2 years ago
c88fc5179b
Fix typo in _login_activity.html.haml ( #24263 )
2 years ago
85e90f4b7d
Move link header setting to after_action ( #24251 )
2 years ago
cc5208f020
Add allow_other_host in redirects which may go outside app ( #24252 )
2 years ago
4e6cf24ce9
Update retention model sql query ( #24249 )
2 years ago
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2 years ago
f185c40714
Change design of account rows in web UI ( #24247 )
2 years ago
8b68ca7e61
Add missing parenthesis ( #24238 )
2 years ago
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2 years ago
169b9c9b13
Remove isNaN polyfill ( #24224 )
2 years ago
61e7fe2e2a
Fix broken links in account gallery ( #24218 )
2 years ago
aa45960804
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 6ffb8609f9
2 years ago
d11d2dda17
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2 years ago
12eb6740d1
Fix Rails cache namespace being overriden with `v2` for cached statuses ( #24202 )
2 years ago
4e4b2bc78e
Remove unused InstancePresenter methods ( #24206 )
2 years ago
df68ba2e6a
Refactoring relations_map ( #24195 )
2 years ago
6ffb8609f9
Fit the max-width of media in .prose to parent box ( #24180 )
2 years ago
7a82026971
Remove references to non-existent actions ( #24183 )
2 years ago
5569c86171
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
d1b3f02926
Webhooks for local status.create, status.update, account.update ( #24133 )
2 years ago
bcac7a5e06
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
dfc075c9d4
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2 years ago
8d05167e5f
Include config/ and update all rubcop deps ( #23963 )
2 years ago
e7c5ccafca
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
bb60db4471
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port 7583523bf0
2 years ago
488cd37f1a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2 years ago
3b17f2f718
Add warning for object storage misconfiguration ( #24137 )
2 years ago
ef0c6a43ed
Change user backups to use expiring URLs for download when possible ( #24136 )
2 years ago
83f302c101
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
7583523bf0
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2 years ago
f0734513f4
Refactor monkey-patching of `PrivateAddressCheck` ( #24122 )
2 years ago
0717d1b058
Autofix Rubocop Style/RedundantArgument ( #23798 )
2 years ago
994cb73f56
Fix more haml-lint Rubocop ( #24107 )
2 years ago
20af3cc038
[Glitch] Center the text itself in upload area
...
Port 100ada1e2b
2 years ago
08685405f1
[Glitch] add modal message when editing toot
...
Port c4c1c8aecc
2 years ago
f39d9ab256
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2 years ago
30328759da
Setup haml-lint CI with todo config ( #23524 )
2 years ago
8a618c8eca
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2 years ago
5f11a64dbc
Fix incorrect post links in strikes when the account is remote ( #23611 )
2 years ago
bde1c7aa96
Fix dashboard crash on ElasticSearch server error ( #23751 )
2 years ago
cfc04637b5
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2 years ago
23bce96f0c
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2 years ago
5f9f43d051
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2 years ago
100ada1e2b
Center the text itself in upload area ( #24029 )
2 years ago
170d3a0bc8
Unescape HTML entities ( #24019 )
2 years ago
8ea6707b2b
Remove unused TOCGenerator ( #23986 )
2 years ago
c4c1c8aecc
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2 years ago
aadb1317a5
Remove sidebar dead code ( #23984 )
2 years ago
980472efc8
Fix unconfirmed accounts being registered as active users ( #23803 )
2 years ago
e7e90a5e63
Do not strip tags from `Setting.site_short_description` ( #23975 )
2 years ago
5f94d33a67
Refactor glitch-soc rich text SCSS
2 years ago
a813ea3c25
[Glitch] Only offer translation for supported languages
...
Port cc0c37cd69
2 years ago
81aac88f65
[Glitch] Switched bookmark and favourites around
...
Port f5fe444913
2 years ago
05763031f1
[Glitch] Fix duplicate “Publish” button on mobile
...
Port 3faa229d8d
2 years ago
a6363c3a2a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2 years ago
f7a679a4f5
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2 years ago
b50a08b15b
[Glitch] Add `lang` attribute to media and poll options
...
Port 41655e16ea
2 years ago
f731ba595b
Enable Rubocop for app/views ( #23874 )
2 years ago
50b76430b4
Do not leave Mastodon when clicking “Back” ( #23953 )
2 years ago
471346fd3a
User mailer spec coverage improvements ( #23905 )
2 years ago
c48dd42fa8
Misc coverage improvements for validators ( #23928 )
2 years ago
08c2938b4a
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2 years ago
24b0410744
Remove implied StandardError rescue ( #23942 )
2 years ago
fe098d35c2
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2 years ago
8f79c53cd6
Change `ActivityPub::DeliveryWorker` retries to be spread out more ( #21956 )
2 years ago
cc0c37cd69
Only offer translation for supported languages ( #23879 )
2 years ago
5acc02793a
Fix external authentication not running onboarding code for new users ( #23458 )
2 years ago
db0bbe5cb7
Add mail headers to avoid auto-replies ( #23597 )
2 years ago
05ef604007
Fix error when displaying post history of a trendable post in the admin interface ( #23574 )
2 years ago
f5fe444913
Switched bookmark and favourites around ( #23701 )
2 years ago
6943192f5e
Fix server error when failing to follow back followers from `/relationships` ( #23787 )
2 years ago
3faa229d8d
Fix duplicate “Publish” button on mobile ( #23804 )
2 years ago
7bc43c91a0
Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )
2 years ago
16c8144b1c
Add support for incoming rich text ( #23913 )
2 years ago
a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
35cbd0685d
Fix deprecation warning about merging conditions ( #23618 )
2 years ago
5bf8f34842
Spec coverage for HomeHelper ( #23907 )
2 years ago
096f622340
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
19be243493
Autofix Rubocop Style/HashConversion ( #23852 )
2 years ago
9cf4671ba1
Remove unused admin/announcements helper ( #23899 )
2 years ago
1d248c3f57
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2 years ago
385ae6681d
Fix single-record invalid condition on PollVote ( #23810 )
2 years ago
41655e16ea
Add `lang` attribute to media and poll options ( #23891 )
2 years ago
42f73a411c
Move misc rules from components/index.scss to components/misc.scss
2 years ago
59b7c6e3d8
Fix glitch-soc SCSS code style and refactor closer to upstream
2 years ago
5eaad2ae5b
[Glitch] Add `lang` attribute to preview card
...
Port e56145661c
2 years ago
650ea1316a
[Glitch] Increase contrast of upload progress background
...
Port 808c9a7cf4
2 years ago
213b82d0a4
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 1f844d0d18
2 years ago
5548b2c73f
[Glitch] Add `lang` tag to native language names in language picker
...
Port 82c464d4d0
2 years ago
295d193e7f
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port ae3812d182
2 years ago
Nick Schonning
Claire
Christian Schmidt
Matt Jankowski
Eugen Rochko
Rubicon Rowe
fusagiko / takayamaki
Vyr Cossont
Tdxdxoz
mogamin
neatchee
Yamagishi Kazutoshi
Takeshi Umeda
Plastikmensch
Jean byroot Boussier
CSDUMMI
Rodion Borisov
PauloVilarinho
Terry Garcia
Tim Lucas
Botao Wang
Renaud Chaput