about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-01-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-07Fix force_ssl conditional (#6201)Yamagishi Kazutoshi
2018-01-07Fix unintended cache (#6214)Yamagishi Kazutoshi
2018-01-07Update Simplified Chinese translations (#6215)SerCom_KC
* i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations
2018-01-07Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-masterDavid Yip
2018-01-07Fix unintended cacheYamagishi Kazutoshi
2018-01-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-07Translate Korean (#6212)Jeong Arm
2018-01-06Fixes to search dropdownkibigo!
2018-01-06fix typo in vanilla names.ymlbeatrix
2018-01-06fixed ctrl enterOndřej Hruška
2018-01-06Fix the always-threaded bugOndřej Hruška
2018-01-07Update ja.jsncls7615
2018-01-06Merge pull request #296 from glitch-soc/thread-modebeatrix
Threaded mode~
2018-01-06Merge pull request #302 from KnzkDev/fix/search-popoutbeatrix
Fix search popout
2018-01-06appease eslintbeatrix
2018-01-06Fix search popoutncls7615
2018-01-06Read max_toot_chars from root object. Fixes #297.David Yip
max_toot_chars is present in the root of the initial state object. (Previously, we were trying to read it from the meta child object.)
2018-01-05my global .gitignore excluded this file ;_;kibigo!
2018-01-05Threaded mode~kibigo!
2018-01-05Fixed improper dropdown func binding for #293 + toot button spacingkibigo!
2018-01-05Styling and autosuggest fixes for #293kibigo!
2018-01-05Fixes composer mounting issue with #293kibigo!
2018-01-05Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-01-05Merge pull request #290 from chriswmartin/web-push-updatesbeatrix
Web push updates
2018-01-05Merge pull request #295 from chriswmartin/getting-started-key-fixbeatrix
unique ColumnLink keys in getting_started
2018-01-05Merge pull request #293 from glitch-soc/compose-refactorbeatrix
Compose refactor
2018-01-05Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-05Fix PuSH workers (#6200)ThibG
2018-01-05When fetching an ActivityPub-enabled status, do not re-request it as ↵ThibG
text/html (#6196)
2018-01-05Represent numbers by strings in instance activity API (#6198)TheKinrar
Fixes #6197.
2018-01-05Merge pull request #243 from m4sk1n/glitch-plbeatrix
i18n: 🇵🇱
2018-01-05add key to lists divcwm
2018-01-05change how list ColumnLink keys are determinedcwm
2018-01-05l10n Occitan language: mailer update (#6193)Quenty31
* Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb
2018-01-04WIP <Compose> Refactor; Fin~kibigo!
2018-01-05Fix RFC 5646 Regular Expression (#6190)Yamagishi Kazutoshi
2018-01-04WIP <Compose> Refactor; 1000 tiny editskibigo!
2018-01-04WIP <Compose> Refactor; <ActionsModal>; dropdownskibigo!
2018-01-04WIP <Compose> Refactor; SCSS ed.kibigo!
2018-01-04WIP <Compose> Refactor; <OnboardingModal> ed.kibigo!
2018-01-04WIP <Compose> Refactor; <Drawer> ed.kibigo!
2018-01-04WIPgit status <Compose> Refactor; <Composer> ed.kibigo!
2018-01-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-05Small translation fixes for Serbian (and sr@Latn too) (#6188)Branko Kokanovic
2018-01-05Fix email confirmation link not updating email (#6187)Patrick Figel
A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue.
2018-01-04Fix overflowing audit logs (#6184)Lynx Kotoura
2018-01-04Fallback default thumbnail in instance status API (#6177)Yamagishi Kazutoshi
2018-01-04i18n: Update Polish translationMarcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04Send one Delete of Actor in ActivityPub when account is suspended (#6172)Eugen Rochko