about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
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]
2019-05-01Add site-wide options to show reblogs and replies in local/public timelinesThibaut Girka
Fixes #1021
2019-05-01Minor fixes to the French translation (#10662)ThibG
2019-04-26New string added for Slovak translation (#10637)Marek Ľach
2019-04-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-23Fix stoplight logging to stderr separate from Rails logger (#10624)Eugen Rochko
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
2019-04-21i18n: Fix misleading strings in Polish translation (#10615)marcin mikołajczak
2019-04-21Small fix Dutch translation (#10612)jeroenpraat
* Small fix Dutch translation * Better descriptive titles See #10611
2019-04-21i18n: Update Catalan translation (#10559)Yamagishi Kazutoshi
* 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
2019-04-21Update NL (Dutch) translation (#10601)jeroenpraat
* Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml
2019-04-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-19Add forgotten textThibaut Girka
2019-04-19Allow turning keybase off instance-wideThibaut Girka
2019-04-18Some new strings for Slovak (#10596)Marek Ľach
2019-04-16Update sk.yml translation again (#10589)Marek Ľach
* Update sk.yml * Update sk.yml * Update sk.yml
2019-04-16Important Slovak grammar fixes (#10585)Marek Ľach
* Important grammar fixes for SK Devise translation * Important Slovak grammar fixes * Update devise.sk.yml * Important Slovak grammar fixes Last batch for today :-) * Update devise.sk.yml * Update sk.yml * Update sk.yml * Update sk.yml
2019-04-15Updates the Slovak translation further (#10584)Marek Ľach
2019-04-15i18n: Update Corsican translation (#10583)Alix Rossi
generated by cgit-pink (git 2.37.1) at 2024-07-04 22:03:25 +0000