about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-12-04Merge branch 'gs-master' into glitch-themeDavid Yip
2017-12-04Fixed a name + localizationskibigo!
2017-12-03Rename themes -> flavours ? ?kibigo!
2017-12-02Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-02Add Japanese translations for invite filter. (#5869)mayaeh
2017-12-02i18n: 🇵🇱 (#5865)Marcin Mikołajczak
2017-12-01Add invite filter (#5862)Yamagishi Kazutoshi
2017-11-30Skins supportkibigo!
2017-11-29Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-29i18n: 🇵🇱 (#5851)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-29Update Japanese translations. (#5844)mayaeh
2017-11-28Normalize pl translation.David Yip
2017-11-28Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-28Show "expired" in invite index (#5838)Yamagishi Kazutoshi
* Show "expired" in invite index * "Force expire" -> "Deactivate"
2017-11-28Fix account migration feature (#5837)nullkal
* Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting
2017-11-28i18n: 🇵🇱 (#5841)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-27Merge remote-tracking branch 'tootsuite/master'David Yip
2017-11-27Normalize config/locales/en.yml.David Yip
2017-11-27Add UI for setting up account migration (#5832)Eugen Rochko
2017-11-27Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-27i18n: Update ja translation for consumable invites. (#5829)mayaeh
* Add Japanese translation for consumable invites. * Add Japanese translation. * Update Japanese translation.
2017-11-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-27Add consumable invites (#5814)Eugen Rochko
* Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly
2017-11-27Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-25Updated Catalan strings (#5801)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
2017-11-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-25Change navigation link for moderators (#5812)Yamagishi Kazutoshi
2017-11-24i18n: Update ja translations (#5804)mayaeh
* Add Japanese translations. * Update Japanese translations. * Fix japanese translation.
2017-11-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-24Add logging of admin actions (#5757)Eugen Rochko
* Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize
2017-11-23Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-23i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)SerCom_KC
2017-11-21Minor fixeskibigo!
2017-11-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-21Add Japanese translations. (#5769)mayaeh
2017-11-21i18n: Update Polish translation - back-end (#230)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21Update and fix Catalan translation (#5773)Joan Montané
* Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-20Finalized theme loading and stuffkibigo!
2017-11-19Merge remote-tracking branch 'tootsuite/master'David Yip
2017-11-19i18n: Update ja translation for moderator badge. (#5731)mayaeh
* Update Japanese translation for moderator badge. * Follows English notation
2017-11-19Remove translations of default theme (#5741)Lynx Kotoura
2017-11-19Add “staff” badge to admin user pages (#5735)Yamagishi Kazutoshi
* Allow staff badge to change from setting to hidden * i18n: Update Polish translation
2017-11-18Merge pull request #226 from glitch-soc/glitch-themebeatrix
Glitch/Vanilla themes
2017-11-18i18n: Update Polish translation (#5749)Marcin Mikołajczak
2017-11-18Profile redirect notes (#5746)Eugen Rochko
* Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues
2017-11-18Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-18Updating Chinese (Simplified) translations (#5725)SerCom_KC
* i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `静音` to `隐藏` * i18n: (zh-CN) Add translations for #5087 & #5669 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translation for #5728
2017-11-17Sets default theme to glitchkibigo!
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
* Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests