about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-11-26Do not filter the status collection after muting and blocking (#5815)Akihiko Odaki
Filtering the status collection wipes out even the profiles of muted and blocked accounts. However, the behavior is inconsistent with the server- side behavior.
2017-11-26i18n: (zh-CN) Add translations for #5746 & #5750 (#5816)SerCom_KC
2017-11-25Allow to open a modal for embedded photo (#5777)Akihiko Odaki
2017-11-25Rename ariaLabel property of Dropdown to title (#5813)Akihiko Odaki
DropdownMenu has ariaLabel property, but it is actually applied to title property of IconButton. Keep it consistent.
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-25Add Japanese translations (#5810)Yamagishi Kazutoshi
* yarn manage:translations * Add Japanese translation for #5087 * Add Japanese translation for #5616 * Add Japanese translation for #5746 * Add Japanese translation for #5750
2017-11-25status: preserve visibility attribute when reblogging (infoleak fix) (#5789)William Pitcock
this should fix *all* remaining visibility-related mastodon ostatus infoleaks. thanks to @csaurus@gnusocial.de for pointing out the infoleak.
2017-11-25Display list column (#5750)Eugen Rochko
2017-11-24Fix unnecessary order (#5807)abcang
2017-11-24Don't remove originals of boosted toots from timeline (#5479)sdukhovni
* Don't remove originals of boosted toots from timeline * Remove unused argument to updateTimeline
2017-11-24Add tests for Streamable (#5771)ysksn
2017-11-24Add index of account and reblog to statuses (#5785)abcang
2017-11-24Add tests for AccountRelationshipsPresenter (#5805)ysksn
2017-11-24i18n: Update ja translations (#5804)mayaeh
* Add Japanese translations. * Update Japanese translations. * Fix japanese translation.
2017-11-24Do not require onClose property in NavigationBar (#5802)Akihiko Odaki
NavigationBar can be used as mock as it is in OnboardingModal. In such a case, onClose property is not required.
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-21Minor fixeskibigo!
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-20Finalized theme loading and stuffkibigo!
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-18Merge remote-tracking branch 'cybre/theme_win95' into glitch-themekibigo!
2017-11-18WIP static themeingkibigo!