about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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-23Disable Code Climate maintainability checks (#5798)Devon Blandin
- Migrate `.codeclimate.yml` to version 2 structure - Disable Code Climate [maintainability checks][] https://docs.codeclimate.com/docs/advanced-configuration [maintainability checks]: http://blog.codeclimate.com/blog/2017/10/12/10-point-technical-debt-assessment This commit upgrades the Code Climate configuration file and disables the new maintainability checks. Once this PR is merged, we can experiment with the new checks via pull requests (the PR will report new issues) or via the [Code Climate CLI][cli], which [now also supports the new maintainability checks][cli-support]. [cli]: https://github.com/codeclimate/codeclimate [cli-support]: https://codeclimate.com/changelog/5a0e488824cfa902a300091c
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-21Styling fixeskibigo!
2017-11-21Update statuses on hidden toggle (Fixes #227)kibigo!
2017-11-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-21i18n: Update Polish translation - front-end added (#231)Marcin Mikołajczak
* i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21Add Japanese translations. (#5769)mayaeh
2017-11-21update code of conduct email addressbeatrix
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-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-21Add tests for Remotable (#5768)ysksn
2017-11-20Fixed duplicating URL of photo type of oEmbed (#5763)abcang
2017-11-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-19Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)abcang
2017-11-19Fix N+1 at notification (#5752)abcang
2017-11-19Update .following_map examples with show-reblogs information.David Yip
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-19Add tests for AccountInteractions (#5751)ysksn
* Add tests for class methods of AccountInteractions * Add tests for instance methods of AccountInteractions
2017-11-19Remove translations of default theme (#5741)Lynx Kotoura
2017-11-19Add a test for Settings::Extend#settings (#5720)ysksn
2017-11-19Add tests for Status#title (#5718)ysksn
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-18Enabled vanilla thmeekibigo!
2017-11-18Public pack fixkibigo!
2017-11-18Media stylingkibigo!
2017-11-18Font styles are now packagifiedkibigo!
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 pull request #208 from yipdw/keyword-mutebeatrix
Run keyword mutes on hashtags
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-18Make it possible to bind streming service to 0.0.0.0 (#5744)Baptiste Gelez
2017-11-17Sets default theme to glitchkibigo!
2017-11-17Removed glitch testskibigo!
2017-11-17Restore vanilla componentskibigo!
2017-11-17Forking glitch themekibigo!
2017-11-17Merge pull request #223 from ↵beatrix
glitch-soc/glitchsoc/feature/configurable-status-size Make character limit configurable (from tootsuite/mastodon#5697)
2017-11-17Merge pull request #224 from yipdw/merge-upstreamDavid Yip
Merge upstream (tootsuite/mastodon#5703)
2017-11-17Update annotations on Follow, FollowRequest, and Mute.David Yip
Follow and FollowRequest had conflicts in their schema annotations, so I ran latest migrations and let annotate_models fix them up.
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
2017-11-17Merge pull request #222 from yipdw/merge/tootsuite/masterDavid Yip
Merge upstream (e28b33c.. 94c5a11)
2017-11-17Merge remote-tracking branch ↵David Yip
'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size