about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
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-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-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: 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-29Requeue expiration notification (#24311)Christian Schmidt
2023-03-27Fix user archive takeout when using OpenStack Swift or S3 providers with no ↵Claire
ACL support (#24200)
2023-03-27Move marky to devDependency (#24258)Nick Schonning
2023-03-27New Crowdin updates (#24130)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27Refactor styles to use logical properties for positioning (#23944)Eugen Rochko
2023-03-27Serialize status webhook events in REST API format (#24243)Vyr Cossont
2023-03-27[Glitch] Remove legacy decorators syntaxneatchee
Port d1b057a0ac41a5756b6a416d2f290b086cb59220 to glitch-soc
2023-03-26[Glitch] Remove isNaN polyfillNick Schonning
Port b46125224c26bc0144659b4319ea416b01289961 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-26Merge branch 'main' into glitch-soc/mainClaire
2023-03-26Fix typo in _login_activity.html.haml (#24263)mogamin
2023-03-26Move link header setting to after_action (#24251)Matt Jankowski
2023-03-26Add allow_other_host in redirects which may go outside app (#24252)Matt Jankowski
2023-03-26Update retention model sql query (#24249)Matt Jankowski
2023-03-25Change media upload limits and remove client-side resizing (#23726)Eugen Rochko
2023-03-25Change design of account rows in web UI (#24247)Eugen Rochko
2023-03-24Add missing parenthesis (#24238)Yamagishi Kazutoshi
2023-03-24Remove legacy decorators syntax (#18357)Yamagishi Kazutoshi
2023-03-23Remove isNaN polyfill (#24224)Nick Schonning
2023-03-23Fix broken links in account gallery (#24218)Christian Schmidt
2023-03-22[Glitch] Fit the max-width of media in .prose to parent boxmogamin
Port 0a9def5498d9630bb9ebf1585f76b2af5fad5169 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2023-03-22Fix Rails cache namespace being overriden with `v2` for cached statuses (#24202)Claire
2023-03-22Remove unused InstancePresenter methods (#24206)Matt Jankowski
2023-03-21Refactoring relations_map (#24195)Takeshi Umeda
2023-03-20Fit the max-width of media in .prose to parent box (#24180)mogamin
2023-03-20Remove references to non-existent actions (#24183)Matt Jankowski
2023-03-19Add getting-started-misc to route (#2141)Plastikmensch
* 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>
2023-03-19Webhooks for local status.create, status.update, account.update (#24133)Vyr Cossont
2023-03-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-03-17Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142)Jean byroot Boussier
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17Include config/ and update all rubcop deps (#23963)Nick Schonning
2023-03-17Link to the Identity provider's account settings from the account settings ↵CSDUMMI
(#24100) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16[Glitch] Replace `Status#translatable?` with language matrix in separate ↵Christian Schmidt
endpoint Port bd047acc356671727c112336bb237f979bba517d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2023-03-16Add warning for object storage misconfiguration (#24137)Claire
2023-03-16Change user backups to use expiring URLs for download when possible (#24136)Eugen Rochko
2023-03-16New Crowdin updates (#23904)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16Replace `Status#translatable?` with language matrix in separate endpoint ↵Christian Schmidt
(#24037)
2023-03-16Refactor monkey-patching of `PrivateAddressCheck` (#24122)Eugen Rochko
2023-03-16Autofix Rubocop Style/RedundantArgument (#23798)Nick Schonning
2023-03-15Fix more haml-lint Rubocop (#24107)Nick Schonning
2023-03-15[Glitch] Center the text itself in upload areaRodion Borisov
Port a52ccd7ad98d7d60dffb520c0397ba8aa4c2eb9d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
generated by cgit-pink (git 2.37.1) at 2024-12-12 20:39:16 +0000