about summary refs log tree commit diff
path: root/app/controllers
AgeCommit message (Expand)Author
2018-06-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-24Add tests for remote_unfollows_controller (#7879)Shuhei Kitagawa
2018-06-21Fix confirmations_controllerThibaut Girka
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-21Replace bypass option with bypass_sign_in (#7867)Shuhei Kitagawa
2018-06-17Allow selecting default posting language instead of auto-detect (#7828)Eugen Rochko
2018-06-17Change language opt-out to language opt-in (#7823)Eugen Rochko
2018-06-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-15Add autofollow option to invites (#7805)Eugen Rochko
2018-06-12Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-...David Yip
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-09Add tests for intents_controller (#7763)Shuhei Kitagawa
2018-06-09Fix domain hiding logic (#7765)Eugen Rochko
2018-06-04Add apply-to-mentions option to keyword mute UI. #454.David Yip
2018-06-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-06-04Remove trending hashtags (#7711)Eugen Rochko
2018-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-29Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)Eugen Rochko
2018-05-28optimize direct timeline (#7614)tateisu
2018-05-27Track trending tags (#7638)Eugen Rochko
2018-05-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-26Catch ActionController::UnknownFormat and return HTTP 406 (#7621)Eugen Rochko
2018-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-22Yeah, it was supposed to be #create?Eugen Rochko
2018-05-22Enforce order on authorized applications page (#7587)Eugen Rochko
2018-05-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-21Remove small pagination limit from context API (#7564)Eugen Rochko
2018-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-19Ensure push subscription is immediately removed when application is revoked (...Eugen Rochko
2018-05-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-18Add preference to hide following/followers lists (#7532)Eugen Rochko
2018-05-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-17Ensure unfilled fields are shown when errors are shown (#7523)Eugen Rochko
2018-05-17HTTP signatures spec no longer requires algorithms field (#7525)Eugen Rochko
2018-05-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-16Do not use permitted_for scope when querying pinned statuses (#7510)Akihiko Odaki
2018-05-16Raise Mastodon::RaceConditionError if Redis lock failed (#7511)Akihiko Odaki
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-13Fix 404 for GET /api/v1/push/subscription (#7472)Eugen Rochko
2018-05-13Add GET /api/v1/push/subscription REST API (#7471)Eugen Rochko
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-11Update session activation time (fixes #5605) (#7408)ThibG
2018-05-11Add tests for invites controller (#7441)Shuhei Kitagawa
2018-05-11Add REST API for Web Push Notifications subscriptions (#7445)Eugen Rochko
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
2018-05-07Bot nameplates (#7391)Eugen Rochko
2018-05-07Fix distribute_add_activity and distribute_remove_activity (#7393)abcang
2018-05-06Add resend confirmation for admin (#7378)Shuhei Kitagawa
2018-05-05Improve admin UI for accounts (#7360)Eugen Rochko