about summary refs log tree commit diff
path: root/config/locales/en.yml
AgeCommit message (Collapse)Author
2019-08-08add new `reject unknown` policy option to prevent spam & harassment from ↵multiple creatures
large/undermoderated servers
2019-08-03respect 'don't @ me' requestsmultiple creatures
2019-07-31ability to add domain moderation notes, edit existing domain policies ↵multiple creatures
in-place, and process asynchronously
2019-07-23add self-destructing roars & `live`/`lifespan` bangtagsmultiple creatures
2019-07-19fix adult content badge on public profilesmultiple creatures
2019-07-19keep `locked` badge for approves-followers + add `frozen` badge for ↵multiple creatures
admin-locked accts, also federate `frozen` state
2019-07-19add badge to ui for locked accountsmultiple creatures
2019-07-18add missing visibility strings to preferencesmultiple creatures
2019-05-21handle importing posts from json dumpsmultiple creatures
2019-05-21add strings for new import options & change domain block -> domain policymultiple creatures
2019-05-21Strings, Moderation: Replace "blocked domain" with "changed policy for" (re: ↵multiple creatures
commit 6eaf72).
2019-05-21Moderation: add `force sensitive` and `force unlisted` actions. Accounts: ↵multiple creatures
add federatable `adult content` tag. Handle from remote accounts as well.
2019-05-21Strings: correct broken username interpolations while reflecting upon the ↵multiple creatures
dangers of automated nomenclature changes using `sed`.
2019-05-21Buttons expecting users to perform an action should be verbs.multiple creatures
2019-05-21Split boosts/repeats off to their own tab and add to the API.multiple creatures
2019-05-21Correct nomenclature changes that break strings.multiple creatures
2019-05-21Add options to increase size and spacing of context menus and to gently the ↵multiple creatures
kobolds. Also allow showing multiple user roles.
2019-05-21s/Toot/Roar/multiple creatures
2019-05-21restore custom registration messagemultiple creatures
2019-05-21unbreak some translation entriesmultiple creatures
2019-05-21Automatic nomenclature updatemultiple creatures
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/media_attachment.rb
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-01Add site-wide options to show reblogs and replies in local/public timelinesThibaut Girka
Fixes #1021
2019-04-19Add forgotten textThibaut Girka
2019-04-19Allow turning keybase off instance-wideThibaut Girka
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10i18n: Update Japanese translations (#10536)mayaeh
* run i18n-tasks add-missing * Update Japanese translations.
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
2019-04-10Change the groupings of menu items in settings navigation (#10533)Eugen Rochko
* Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations
2019-04-09Add "why do you want to join" field to invite requests (#10524)Eugen Rochko
* Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted
2019-04-08Fix batch actions not working on pending accounts (#10508)ThibG
2019-04-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
2019-04-08i18n: Update Japanese translations (#10494)mayaeh
* Update Japanese translations * Update Japanese translations.
2019-04-07Improve blocked view of profiles (#10491)Eugen Rochko
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067fcca4bf6e71ba1ffb276c451c17c656. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a112ccdddaedb25723fc819dbbcd8e9a. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well
2019-04-06Add batch actions for approving and rejecting pending accounts (#10469)Eugen Rochko
2019-04-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
2019-04-01i18n: Update Japanese translations (#10427)mayaeh
* Update Japanese translations. run yarn manage:translations && i18n-tasks add-missing * Update Japanese translations. * Fix mistake * Change to be concise.
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-28squashed identity proof updates (#10375)Alex Gessner
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
2019-03-28Add order options to relationship manager UI (#10404)Eugen Rochko
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-26Fix HTML validation (#10354)ThibG
* Fix HTML validation * Report first HTML error instead on validation error
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.
2019-03-26Change icons of features on admin dashboard to remove bias (#10366)Eugen Rochko
Red crosses implied that it was bad/unexpected that certain features were not enabled. In reality, they are options, so showing a green or grey power-off icon is more appropriate. Add status of timeline preview as well Fix sample accounts changing too frequently due to wrong query Sample accounts are intended to be sorted by popularity
2019-03-23Change settings description (#10312)Jeong Arm
- site_description is no longer visible on front page - short_description is not fallback to site_description