about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
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-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-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-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-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-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-19Merge remote-tracking branch 'tootsuite/master'David Yip
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!
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-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-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
2017-11-17Merge pull request #221 from glitch-soc/local-only-policybeatrix
Update StatusPolicy to check current_account for local_only? toots.
2017-11-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-17Merge pull request #218 from glitch-soc/themed-prefetchingDavid Yip
Themed preloading
2017-11-17Increase contrast of Admin badges (#5740)Lynx Kotoura
To comply WCAG 2.0 guidelines on contrast ratio.
2017-11-17Fix regression #5467: fixes emoji copy (#5739)Clworld