272 Commits (4116cc4e8363d224144cccc9d56ff949bef7e7df)

Author SHA1 Message Date
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
7 years ago
Eugen Rochko 03c8890e09 Validate that e-mail resolves with MX and it's not blacklisted (#7631)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 8913ccb434 Store home feeds for 7 days instead of 14 (#7354)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 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
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
nullkal fe417663d9 Use request.remote_ip instead of request.ip (#4744)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Eugen Rochko a09a4a5899 Add rake task mastodon:feeds:build to regenerate all active users' feeds (#4303)
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
Eugen Rochko 7d8fd050eb Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
Eugen Rochko 4e7288d18a Fix boolean columns sometimes having a null value (#4162)
7 years ago
Yamagishi Kazutoshi 865f5170a8 Add setting a always mark media as sensitive (#4136)
7 years ago
Damien Erambert 387de88e2f Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Eugen Rochko c465c5b3a8 Add overview of active sessions (#3929)
7 years ago
Sorin Davidoi 1280559503 Revocable sessions (#3616)
7 years ago
Eugen Rochko 9ea895f05f Correct validators so that existing error messages would look correct (#3668)
8 years ago
Eugen Rochko 006594e181 Fix db:seed - only run some validations when the field was changed (#3592)
8 years ago
Matt Jankowski eea027c5c2 Update Rails to version 5.1.1 (#3121)
8 years ago
Akihiko Odaki 20d016f430 Refactor User and spec (#3431)
8 years ago
Atsushi Yamamoto 4547e3585a Add preference setting for delete toot modal (#3368)
8 years ago
Matt Jankowski 8c11626321 Add coverage for ReportFilter and AccountFilter (#3236)
8 years ago
Matt Jankowski 0eb8b00cc9 Specs for cleanup workers (#3235)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
Matt Jankowski 6619cfe934 Conditional validations no longer accept strings for if/unless (#3124)
8 years ago
alpaca-tc 41295c0bbd Order by symbol value (#3077)
8 years ago
Matt Jankowski bddb03a089 Improve allowed language handling (#2897)
8 years ago
Kaylee fae1ed48e3 Add option to disable two factor auth in admin accounts panel. (#2584)
8 years ago
yhirano e5eb070430 annotate models (#2697)
8 years ago
Ash Furrow eb7db6f8da Admin UI for confirming users (#2245)
8 years ago
Eugen Rochko 336fd904db Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
Matt Jankowski 7a7a2d591f Remove unused methods (#1730)
8 years ago
alpaca-tc 4f0d96aa5e Required foreign keys (#2003)
8 years ago
Patrick Figel 2fb1f07888 Add gif auto-play/pause preference
8 years ago
Patrick Figel 15b393201e Add recovery code support for two-factor auth (#1773)
8 years ago
blackle e7d77f4e13 Allow user to disable the boost confirm dialog in preferences
8 years ago
Eugen Rochko 0cb5a2a0a7 Add digest e-mails
8 years ago
Eugen Rochko b1f2683ecc Add API modifiers to limit returned toots from public/hashtag timelines
8 years ago
Eugen Rochko 9b8670c939 Added optional two-factor authentication
8 years ago
Eugen Rochko 6d98465db2 Extend rails-settings-cached to merge db-saved hash values with defaults
8 years ago
Eugen Rochko 7e7c2bbb0f Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
8 years ago
Eugen Rochko cef68b9b1c Follow requests send e-mail notifications, but are excluded from notifications API
8 years ago
Eugen Rochko e5e702a976 Adding configurable e-mail blacklist
8 years ago
Eugen Rochko ea0846645a Fix #65 - Options to block notifications from people you don't follow/who don't follow you
8 years ago
Eugen Rochko 59d7fe4c05 Fix #168 - Turn off e-mail notifications by default
8 years ago
Eugen Rochko f07b0dc82f Remove unneeded indices, improve error handling in background workers, don't needlessly reload reblogged status, send Devise e-mails asynchronously
8 years ago
Eugen Rochko b8e6ca45e5 Add user locale setting
8 years ago
Eugen Rochko e71b152d89 Fix rubocop issues, introduce usage of frozen literal to improve performance
8 years ago
Eugen Rochko 082e57fc13 Adding hashtag model
8 years ago
Eugen Rochko d51efdd1dc Adding user settings (model and mailer), no form yet
8 years ago
Eugen Rochko fc198a8b4c Adding e-mail confirmations
8 years ago
Eugen Rochko b3c7c8700d Fix most pages on small screens
8 years ago
Eugen Rochko 188c6f326b Making public pages responsive, removing reblogs/favs counts from them
8 years ago
Eugen Rochko 927333f4f8 Improve code style
8 years ago
Eugen Rochko 15f51dbf8c Better styling for selected status in detailed view
8 years ago
Eugen Rochko 1215ab57ff Some extra scopes for user sorting
8 years ago
Eugen Rochko 10ba09f546 Upgrade to Rails 5.0.0.1
8 years ago
Eugen Rochko ff2cbc0753 Remember me enabled by default
9 years ago
Eugen Rochko da4b675aca Fix favourite handling in ProcessInteractionService
9 years ago
Eugen Rochko e24bfbde1a Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections
9 years ago
Eugen Rochko 6fec8afc3f Bind oauth applications to users
9 years ago
Eugen Rochko 6045b6cb18 Customizing devise views and controllers
9 years ago
Eugen Rochko 7e93da3f8d Removing grape and adding devise
9 years ago
Eugen Rochko 0e8f59c16f Refactoring Grape API methods into normal controllers & other things
9 years ago
Eugen Rochko 24646d5769 Adding views for the profile and entry pages
9 years ago
Eugen Rochko 1dad72bf13 Fixes and general progress
9 years ago
Eugen Rochko 709c6685a9 Made some progress
9 years ago