about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2019-06-04Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-04Add missing Korean translations (#10962)Jeong Arm
And change some word.
2019-06-04Replace from uglifyjs to terser (#10956)Yamagishi Kazutoshi
2019-06-03Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
2019-06-01Small update for sk.yml (#10913)Marek Ľach
2019-05-30Remove dependency on fibers (#10902)Yamagishi Kazutoshi
2019-05-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-30Change default to single column UI (#10847)Eugen Rochko
Keep current setting for users who were active within the last month
2019-05-29Update Japanese translations. (#10875)mayaeh
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-28Fix undefined method error (#10868)Hinaloe
2019-05-28Fix undefined method error. (#10867)mayaeh
2019-05-28Update simple_form.co.yml (#10862)Alix Rossi
2019-05-27Improve rate limiting (#10860)ThibG
* Rate limit based on remote address IP, not on potential reverse proxy * Limit rate of unauthenticated API requests further * Rate-limit paging requests to one every 3 seconds
2019-05-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.
2019-05-26Update simple_form.sk.yml (#10842)Marek Ľach
2019-05-26I18n: Update Czech translation (#10832)Aditoo17
2019-05-25Add responsive panels to the single-column layout (#10820)Eugen Rochko
* Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-20Update sk.yml (#10788)Marek Ľach
* Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * normalize
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-20sk.yml grammar update (#10786)Marek Ľach
* sk.yml grammar update * bundle exec i18n-tasks normalize
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19Small corrections for sk translation (#10784)Marek Ľach
2019-05-19I18n: Update Czech translation (#10781)Aditoo17
2019-05-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-17Add option for default toot content-typeThibaut Girka
2019-05-17i18n: Update Corsican translation (#10770)Alix Rossi
* i18n: update Corsican translation * Fix typo in co.yml
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-15Update simple_form.fr.yml (#10756)manuelviens
Remplacement des ' par des ’
2019-05-14Record account suspend/silence time and keep track of domain blocks (#10660)ThibG
* Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive
2019-05-14Update slovak simple_forms (#10763)Marek Ľach
2019-05-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-10i18n: Update French translations (#10747)Alix Rossi
* Update French JSON * i18n: Update fr.yml * i18n: Update simple_form.fr.yml * Update simple_form.fr.yml * Update fr.yml
2019-05-10i18n: Update Corsican translations (#10746)Alix Rossi
* i18n: Update Corsican translations * Update co.yml * Fix a translation in co.yml
2019-05-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system
2019-05-09Update simple_form.fr.yml (#10726)manuelviens
* Minor modif and add Modified '' by ’ and added invite_request * Update simple_form.fr.yml Modifications suggérées par ThibG * Update simple_form.fr.yml Remplacement des ' par des ’. * Update simple_form.fr.yml Ajout de deux petits espaces devant sessions:
2019-05-09Add strings for Slovak (#10734)Marek Ľach
* Add strings for Slovak * Update sk.yml
2019-05-09Update fr.yml (#10727)manuelviens
* Update fr.yml Added missing lines * Update fr.yml Application des modifications de ThibG * Update fr.yml Modifications proposées par ThibG
2019-05-07i18n Update Catalan translation (#10719)spla
* Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translation * i18n Update Catalan translation
2019-05-06i18n: Update Japanese translations (#10706)mayaeh
* Update Japanese translations. run yarn manage:translations This commit includes translations by some users that were done at the transifex. * Reduce translation text because it becomes two lines.
2019-05-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-05Minor Slovak locale update (#10705)Marek Ľach
2019-05-05I18n: Update Czech translation 🇨🇿 (#10704)Aditoo17
* I18n: Update Czech translation * Tiny fix
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/media_attachment.rb
2019-05-04i18n: Update Corsican translation (#10692)Alix Rossi
2019-05-04Fix CSP when PAPERCLIP_ROOT_URL is set to a different hostThibaut Girka
2019-05-04Fix CSP when dealing with S3 hostsThibaut Girka
2019-05-03Provide a link to existing domain block when trying to block an ↵ThibG
already-blocked domain (#10663) * When trying to block an already-blocked domain, provide a link to the block * Fix styling for links in flash messages * Allow blocks to be upgraded but not downgraded
2019-05-03Bump rack-attack from 5.4.2 to 6.0.0 (#10599)dependabot[bot]
* Bump rack-attack from 5.4.2 to 6.0.0 Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * fix payload[:request]
generated by cgit-pink (git 2.37.1) at 2024-11-01 17:11:02 +0000