about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2023-04-04Merge pull request #2161 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-04-04[Glitch] Fix inconsistent radius in drawerRubicon Rowe
Port fa98363a2789f23e110312f23bf4c00234dcd59a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-04Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-04Fix unescaped user input in LDAP query (#24379)Claire
2023-04-04Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-04-04Fix inconsistent radius in drawer (#24407)Rubicon Rowe
2023-04-04Bump glob from 9.3.2 to 9.3.4 (#24383)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04Bump devise from 4.9.0 to 4.9.2 (#24393)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04Bump doorkeeper from 5.6.5 to 5.6.6 (#24399)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04Bump tzinfo-data from 1.2023.2 to 1.2023.3 (#24400)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04Align typings with installed versions (#24410)Nick Schonning
2023-04-03[Glitch] Add colour to follow button when hashtag is being followedChristian Schmidt
Port 77bd32a26abbf8b49caf35dcdf170e312e48a277 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-03Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-04-03Add colour to follow button when hashtag is being followed (#24361)Christian Schmidt
2023-04-03Bump uri from 0.12.0 to 0.12.1 (#24341)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-03Clean up JS dependencies (#24377)Claire
2023-04-03Change root Chewy strategy to emit a warning instead of erroring out in ↵Claire
production mode (#24327)
2023-04-03New Crowdin updates (#24276)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03Move ESLint configs to overrides (#24370)Nick Schonning
2023-04-03Fix build issues caused by #16210 (#24374)Renaud Chaput
2023-04-03[Proposal] Make able to write React in Typescript (#16210)fusagiko / takayamaki
Co-authored-by: berlysia <berlysia@gmail.com> Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-02Update redis_config.rb to remove warning message (#24352)Alison Wheeler
2023-04-01Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-01Change search pop-out in web UI (#24305)Eugen Rochko
2023-04-01Fix regressions from change in account row design in web UI (#24343)Eugen Rochko
2023-04-01Fix Redis client and type errors introduced in #24285 (#24342)Vyr Cossont
2023-03-31[Glitch] Fix: set multiColumn value for /explore StatusesTdxdxoz
Port 74f56c64fc0aa0dce0dc2c267aa8a212569e9673 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31[Glitch] Move marky to devDependencyNick Schonning
Port ddb769f0b84d4bcff22472f236a4ec74c631d0a6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31Restore exif-js dependencyClaire
2023-03-31Migrate glitch-soc's exclusive user settingsClaire
2023-03-31Fix invalid/expired invites being processed on sign-up (#24337)Claire
2023-03-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2023-03-31Add Roadmap to README (#24288)Nick Schonning
2023-03-31Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320)Sai
2023-03-31Add documentation for Rubocop overrides (#23811)Nick Schonning
2023-03-31Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761)Nick Schonning
2023-03-31IndexingScheduler: fetch and import in batches (#24285)Vyr Cossont
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31Autofix Rubocop Style/IdenticalConditionalBranches (#24322)Nick Schonning
2023-03-31Enable Rubocop Metrics/BlockLength with Excludes (#24260)Nick Schonning
2023-03-31Wrong type for user setting when default is defined by lambda (#24321)Christian Schmidt
2023-03-30Change "direct message" nomenclature to "private mention" in web UI (#24248)Eugen Rochko
2023-03-30Change user settings to be stored in a more optimal way (#23630)Eugen Rochko
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30Fix stale apt index in github actions (#24319)Claire
2023-03-30Bump cssnano from 5.1.15 to 6.0.0 (#24296)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-30Fix: set multiColumn value for /explore Statuses (#24314)Tdxdxoz
2023-03-29Fix missing translation in pagination gap tags (#24262)mogamin
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29Fixes launching of the devcontainer and adds support for Docker Desktop (#24303)Robert R George
2023-03-29Bump sass from 1.59.3 to 1.60.0 (#24292)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29Bump rimraf from 4.4.0 to 4.4.1 (#24291)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
generated by cgit-pink (git 2.37.1) at 2024-11-26 03:28:53 +0000