about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-12-07Glitch doesn't have a home stylesheet anymorekibigo!
2017-12-07Packaged local_settings styles in commonkibigo!
2017-12-06Fix hide reblogs in glitch frontend (#5909)David Yip
This applies 432761f37574b4e4159283f595e6c094b7bde449 to the glitch copy of the Mastodon frontend.
2017-12-06Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2017-12-06Merge pull request #241 from glitch-soc/no-dm-optionDavid Yip
Add option to remove DMs from home (#126)
2017-12-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-07Remove duplicate annotate (#5910)Yamagishi Kazutoshi
* Remove duplicate annotate * Remove blank line
2017-12-07Add embed_url to preview cards (#5775)Akihiko Odaki
2017-12-07Fix hide reblogs (regression from #5887) (#5909)Yamagishi Kazutoshi
2017-12-06Add option to remove DMs from home (#126)kibigo!
2017-12-06Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)David Yip
2017-12-06Fix common packs when other pack also therekibigo!
2017-12-06Use settings pack for InvitesController (#229)David Yip
2017-12-06Merge pull request #229 from glitch-soc/glitch-themebeatrix
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06Prepend check_enabled_deletion to Settings::DeletesController (#229)David Yip
The specs for Settings::DeletesController include an example that sets Settings.open_deletion to false and expects the "if deletion is not available, redirect to root" logic to run. However, this spec does not set up a user, which means that the spec (intentionally or otherwise) expects this redirection to work with unauthenticated access. We should preserve that behavior. To do so, we prepend the deletion check to the action chain set up by Settings::BaseController, so that said check occurs before the authenticate_user! check.
2017-12-06Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-07i18n: 🇵🇱 (#5903)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-12-06Fix list editor modal on narrow devices (#5904)Lynx Kotoura
2017-12-06Fix extra space between status text and username (#5902)Lynx Kotoura
2017-12-06Break out nested relationship API keys (#5887)aschmitz
* Break out nested relationship API keys This closes #5856 by restoring the existing behavior of the `muting` and `following` keys (returning booleans rather than truthy or false). It adds `showing_reblogs` and `muting_notifications` keys: * `showing_reblogs` returns true if: 1. You've requested to follow the user, with reblogs shown, or 2. You are following the user, with reblogs shown. * `muting_notifications` returns true if you have muted the user and their notifications as well. * Rubocop fix * Fix pulling reblog/mute status from relationships I could swear this had passed tests before, but apparently not. Works now. * More test fixes Really, you'd expect this to be more straightforward.
2017-12-06Fix emoji picker scrollbar (regression from #5046) (#5901)Yamagishi Kazutoshi
2017-12-06Handle submit event of new list form (#5895)Yamagishi Kazutoshi
2017-12-06Search only from followees (#5897)Yamagishi Kazutoshi
2017-12-06Using double splat operator (#5859)Yamagishi Kazutoshi
2017-12-06Remove rabl dependency (#5894)Eugen Rochko
* Remove rabl dependency * Replicate old Oj configuration
2017-12-06Update Japanese translations. (#5893)mayaeh
2017-12-05Lists redis clean-up (#5886)Eugen Rochko
* When list is deleted, remove feed from redis * Clean up list feeds of inactive users
2017-12-05Add list of lists component to web UI (#5811)Eugen Rochko
* Add list of lists component to web UI * Add list adding * Add list removing * List editor modal * Add API account search limited by following=true relation * Rework list editor modal * Remove mandatory pagination of GET /api/v1/lists/:id/accounts * Adjust search input placeholder * Fix rspec (#5890) * i18n: (zh-CN) Add missing translations for #5811 (#5891) * i18n: (zh-CN) yarn manage:translations -- zh-CN * i18n: (zh-CN) Add missing translations for #5811 * Fix some issues - Display loading/missing state for list timelines - Order lists alphabetically in overview - Fix async list editor reset - Redirect to /lists after deleting unpinned list - Redirect to / after pinning a list * Remove dead list columns when a list is deleted or fetch returns 404
2017-12-06Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)SerCom_KC
* i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts
2017-12-05Add aria-autocomplete='list' in Textaria (#5889)Neetshin
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
2017-12-04Various fixeskibigo!
2017-12-04current_theme -> current_flavour (#229)David Yip
2017-12-04Merge branch 'gs-master' into glitch-themeDavid Yip
2017-12-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-04Update mutes.js (#5882)Neetshin
2017-12-04Fixed a name + localizationskibigo!
2017-12-03Fixed image requirekibigo!
2017-12-03Rename themes -> flavours ? ?kibigo!
2017-12-03Fixed typoskibigo!
2017-12-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-03Add keyboard shortcuts link to getting-started navigation (#5874)Lynx Kotoura
* Add keyboard shortcuts link to getting-started navigation * i18n: 🇵🇱 * yarn manage:translations
2017-12-03Add back button to keyboard shortcuts legend column (#5872)Lynx Kotoura
2017-12-02Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-02Remove redundant import statement in SCSS (#5864)cormo
* Remove redudant import statement in SCSS * Fix wrong chmod
2017-12-01Add invite filter (#5862)Yamagishi Kazutoshi
2017-12-01Fix invites form path (#5861)Yamagishi Kazutoshi
2017-12-01Allow admin to deactivate invite created by users (#5860)Yamagishi Kazutoshi
2017-11-30Skins supportkibigo!
2017-12-01Update Japanese translations for KeyboardShortcuts. (#5858)mayaeh
2017-11-30Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins