4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2 years ago
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2 years ago
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2 years ago
2be88d1930
New Crowdin updates ( #2111 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
2 years ago
40fc917a86
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 4da5f77d92
2 years ago
58291b31fa
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port bae17ebe5e
2 years ago
ce84d163cc
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end, glitch-soc had extra entries at the end.
Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
Not a real conflict, upstream added a parameter (`allowed_mentions`) where
glitch-soc already had an extra one (`content_type`).
Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
2 years ago
d6930b3847
Add API parameter to safeguard unexpect mentions in new posts ( #18350 )
2 years ago
c84f38abc4
chewy from 7.2.4 to 7.2.7 ( #23572 )
2 years ago
45e2936c89
Add tests to indicate inclusion of self replies in statuses endpoint ( #23266 )
2 years ago
f553b064e0
Switch OpenID Connect gems ( #23223 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
eddfb33dfe
Enable ESLint import recommended rules ( #23315 )
2 years ago
db2c58d47a
Enable ESLint no-useless-escape ( #23311 )
2 years ago
4da5f77d92
Fix case-sensitive check for previously used hashtags ( #23526 )
2 years ago
841263a548
Update Ruby to 3.0.5 ( #23544 )
2 years ago
5f56818f9e
Change followed_by link to location=all if account is local on /admin/accounts/:id page ( #23467 )
2 years ago
93d7c26fa5
Bump rubocop from 1.44.1 to 1.45.1 ( #23523 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
cc92c65d83
Add dependency on net-http ( #23571 )
2 years ago
66f2ad483c
Bump sidekiq-scheduler from 5.0.0 to 5.0.1 ( #23569 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
31352f0d2c
Bump sidekiq-scheduler from 4.0.3 to 5.0.0 ( #23212 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
c55568c75a
Add tests for `REST::AccountSerializer` ( #23319 )
2 years ago
7c5d396fca
Replace hamlit-rails with haml-rails ( #23542 )
2 years ago
d874877b27
Update SECURITY.md ( #23545 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2 years ago
c6b7e04120
Sync Node.js to 16.19 patch release ( #23554 )
2 years ago
a1c0573bc6
Yarn cache cleanup right after install in Docker ( #23557 )
2 years ago
0c9d455ea5
Upgrade to Stylelint 15 with Prettier ( #23558 )
2 years ago
ee42505452
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2 years ago
8eb74c88ec
New Crowdin updates ( #2100 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
2 years ago
c812cfa667
Enable EditorConfig trailing whitespace trimming ( #23543 )
2 years ago
e7b81d7d96
Bump blurhash from 0.1.6 to 0.1.7 ( #23517 )
2 years ago
7c45145430
fix metrics format ( #23520 )
2 years ago
c1b823368c
dot is not allowed ( #23519 )
2 years ago
dc02a93d04
Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
87419f9307
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
61c5dfb929
Update changelog ( #23515 )
2 years ago
70c0d754a6
Bump version to 4.1.0 ( #23471 )
...
* Bump version to 4.1.0
* Editorialize changelog some more and highlight API changes
* Update changelog
2 years ago
0c9eac80d8
Fix unbounded recursion in post discovery ( #23506 )
...
* Add a limit to how many posts can get fetched as a result of a single request
* Add tests
* Always pass `request_id` when processing `Announce` activities
---------
Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
2 years ago
719bb799be
Remove DesspSouce config ( #23513 )
2 years ago
bae17ebe5e
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2 years ago
71ae17e8f5
New Crowdin updates ( #23413 )
...
* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
4ceadc65b0
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
a9c220242b
Fix admin-set follow recommandations being case-sensitive ( #23500 )
...
Fixes #23472
2 years ago
67de888bad
Fix server status URL being a required server setting ( #23499 )
2 years ago
f23d30100a
Cleanup unused i18n strings ( #23426 )
...
* Remove partial 422/500 error translations
* Add missing siblings for i18n unused warnings
* Enable i18n unused string checking for all locales
2 years ago
5e37906083
[Glitch] Add scrolling to Compare history modal
...
Port e8cb3ee827
2 years ago
2dfbdc3f9d
[Glitch] Show spinner while loading follow requests
...
Port c1f32c9c14
2 years ago
8fd6c36243
[Glitch] Spell check input fields
...
Port 67744ee779
2 years ago
95e2cab22e
[Glitch] Add setting for status page URL
...
Port 8f590b0a21
2 years ago
85558a5e18
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Minor upstream change, our README is completely different.
Kept ours.
- `lib/tasks/assets.rake`:
glitch-soc has extra code to deal with its theming system,
upstream changed a line that exists in glitch-soc.
Applied upstream changes.
2 years ago
Claire
Nick Schonning
Dean Bassett
Shlee
Varun Sharma
Stan Hu
Jeong Arm
dependabot[bot]
Takeshi Umeda
Eugen Rochko
emilweth
cadars
Christian Schmidt