215 Commits (9f065b7df91c7ed1a2242a16ed6a06f6287ca65f)

Author SHA1 Message Date
Eugen Rochko a1bceb2cb6 Add responsive panels to the single-column layout (#10820)
5 years ago
Thibaut Girka e21662d370 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 4ad004d2ef Fix “invited by” not showing up for invited accounts in admin interface (#10791)
5 years ago
Thibaut Girka 7aece1eec5 Add option for default toot content-type
5 years ago
Thibaut Girka 422dd06806 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG f1a3135809 Record account suspend/silence time and keep track of domain blocks (#10660)
5 years ago
Thibaut Girka 73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko c3b1f6963b Change e-mail whitelist/blacklist to not be checked when invited (#10683)
5 years ago
ThibG af3971a0e6 Check that an invite link is valid before bypassing approval mode (#10657)
5 years ago
Eugen Rochko b1e10ed1b3 Fix approved column being set to nil instead of false (#10642)
5 years ago
Eugen Rochko be7bab1fd9 Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)
6 years ago
Thibaut Girka cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 13c1b5bac8 Add preference to disable e-mails about new pending accounts (#10529)
6 years ago
Eugen Rochko 7eb05b8724 Add "why do you want to join" field to invite requests (#10524)
6 years ago
Thibaut Girka e97d76632d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8865d64bce If registrations have been re-opened when user confirms account, approve (#10349)
6 years ago
Thibaut Girka 741766a01d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73fb7bfa0f Admission-based registrations mode (#10250)
6 years ago
Eugen Rochko 3592fc182d Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)
6 years ago
Thibaut Girka 76949bc007 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Hinaloe 2ab3932110 correct opt-out showing application (#10086)
6 years ago
ThibG dfb101cd45 Make displaying application used to toot opt-in (#9897)
6 years ago
Thibaut Girka bb035bb0ab Make storing and displaying application used to toot opt-in
6 years ago
Thibaut Girka edb28be20b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e259f244c6 Fix SSO authentication not working due to missing agreement boolean (#9915)
6 years ago
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9a98e3fe76 Fix code style of regeneration-related code (#9843)
6 years ago
Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6936271536 Improve e-mail digest (#9689)
6 years ago
Eugen Rochko 8958e58bd4 Improve admin UI for account view (#9643)
6 years ago
Eugen Rochko bbf9f4f93b Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka cabf2772ea Add a per-user setting to hide followers count
6 years ago
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8d3910afdd Improve e-mail MX validator and add tests (#9489)
6 years ago
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 097d866028 Add setting to not aggregate reblogs (#9248)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 305556274a Redesign admin accounts index (#9340)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ふぁぼ原 bb8afc4608 Add a new preference to always hide all media (#8569)
6 years ago
Matt Sweetman 674865731a Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
Thibaut Girka 7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quint Guvernator 476ba6e4f0 Fix low-hanging rubocop gripes (#8458)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 413a28499d Allow mods to disable login, improve message when login disabled (#8329)
6 years ago
Thibaut Girka c043697caa Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 315ce688be Reduce user active duration from 7 days to 2 days (#8282)
6 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
6 years ago
Thibaut Girka 3dc4f8e2ca Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 03c8890e09 Validate that e-mail resolves with MX and it's not blacklisted (#7631)
6 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
6 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
6 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
6 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
6 years ago
Eugen Rochko 8913ccb434 Store home feeds for 7 days instead of 14 (#7354)
6 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
6 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 4fc9827b69 bugfixes and gem update (#6831)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko f35356609b Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 555e7205da Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel bc5487a1c2 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
ysksn 475b7cecb5 Delegate some methods of User to @settings (#5706)
7 years ago
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago