about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2023-02-18Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-02-18[Glitch] Upgrade to Stylelint 15 with PrettierNick Schonning
Port 0c9d455ea5540e854c2d879cd1df015ea493f622 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18[Glitch] Enable ESLint no-useless-escapeNick Schonning
Port db2c58d47ae0db8490a30cd3846f30e615c382b5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18[Glitch] Enable ESLint import recommended rulesClaire
Port eddfb33dfea6a17e71377d95498b557dd0194477 to glitch-soc
2023-02-18New Crowdin updates (#2111)Claire
* 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
2023-02-13[Glitch] Fix case-sensitive check for previously used hashtagsDean Bassett
Port 4da5f77d929d6b83c134cae1eefbc8ba2db752f8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13[Glitch] Fix attached media uploads not being cleared when replying to a postClaire
Port bae17ebe5eab02879599ae8516cf6b3f6736b450 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2023-02-13Add API parameter to safeguard unexpect mentions in new posts (#18350)Claire
2023-02-13chewy from 7.2.4 to 7.2.7 (#23572)Shlee
2023-02-13Add tests to indicate inclusion of self replies in statuses endpoint (#23266)Varun Sharma
2023-02-13Switch OpenID Connect gems (#23223)Stan Hu
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13Enable ESLint import recommended rules (#23315)Nick Schonning
2023-02-13Enable ESLint no-useless-escape (#23311)Nick Schonning
2023-02-13Fix case-sensitive check for previously used hashtags (#23526)Dean Bassett
2023-02-13Update Ruby to 3.0.5 (#23544)Nick Schonning
2023-02-13Change followed_by link to location=all if account is local on ↵Jeong Arm
/admin/accounts/:id page (#23467)
2023-02-13Bump rubocop from 1.44.1 to 1.45.1 (#23523)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-13Add dependency on net-http (#23571)Claire
2023-02-13Bump sidekiq-scheduler from 5.0.0 to 5.0.1 (#23569)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-13Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)dependabot[bot]
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>
2023-02-13Add tests for `REST::AccountSerializer` (#23319)Claire
2023-02-13Replace hamlit-rails with haml-rails (#23542)Nick Schonning
2023-02-13Update SECURITY.md (#23545)Takeshi Umeda
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-02-13Sync Node.js to 16.19 patch release (#23554)Nick Schonning
2023-02-13Yarn cache cleanup right after install in Docker (#23557)Nick Schonning
2023-02-13Upgrade to Stylelint 15 with Prettier (#23558)Nick Schonning
2023-02-12fix hashtag ordering (#2107)Dean Bassett
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12New Crowdin updates (#2100)Claire
* 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]
2023-02-12Enable EditorConfig trailing whitespace trimming (#23543)Nick Schonning
2023-02-11Bump blurhash from 0.1.6 to 0.1.7 (#23517)Eugen Rochko
2023-02-11fix metrics format (#23520)emilweth
2023-02-11dot is not allowed (#23519)emilweth
2023-02-10Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-02-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-10Update changelog (#23515)Claire
2023-02-10Bump version to 4.1.0 (#23471)Claire
* Bump version to 4.1.0 * Editorialize changelog some more and highlight API changes * Update changelog
2023-02-10Fix unbounded recursion in post discovery (#23506)Claire
* 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>
2023-02-10Remove DesspSouce config (#23513)Nick Schonning
2023-02-10Fix attached media uploads not being cleared when replying to a post (#23504)Claire
2023-02-11New Crowdin updates (#23413)Eugen Rochko
* 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>
2023-02-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-10Fix admin-set follow recommandations being case-sensitive (#23500)Claire
Fixes #23472
2023-02-10Fix server status URL being a required server setting (#23499)Claire
2023-02-09Cleanup unused i18n strings (#23426)Nick Schonning
* Remove partial 422/500 error translations * Add missing siblings for i18n unused warnings * Enable i18n unused string checking for all locales
2023-02-09[Glitch] Add scrolling to Compare history modalcadars
Port e8cb3ee827d3bd20b0ad28dfc7358afaa43b4dad to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09[Glitch] Show spinner while loading follow requestsChristian Schmidt
Port c1f32c9c1470d7d38342e211ff5ca326e12494fb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09[Glitch] Spell check input fieldsChristian Schmidt
Port 67744ee779b97ea07e91dd076e1df25e362ff33d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09[Glitch] Add setting for status page URLEugen Rochko
Port 8f590b0a211716bcbfc0f2278a452469f3346f55 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
generated by cgit-pink (git 2.37.1) at 2024-11-27 01:35:09 +0000