Commit Graph

2130 Commits (master)

Author SHA1 Message Date
Rachel Fae Fox d1b0463c29 various changes 2020-02-25 16:38:58 +00:00
multiple creatures a50f339b9b improve mingw compatability 2020-01-23 10:27:15 -06:00
Holly 'Frinkel' Lotor 259f0b15fc Merge first smoke test 2020-01-20 16:56:53 -05:00
ThibG b0630ddc82 Original upstream merge 2020-01-20 16:55:55 -05:00
multiple creatures 7e64ce9391 use old ldap/pam strategies for now until full 3.x port 2020-01-15 22:10:41 -06:00
multiple creatures 8c02372012 merge upstream csp changes 2020-01-15 21:30:57 -06:00
multiple creatures 729a32d2a5 update `rack_attack` config 2020-01-15 21:30:22 -06:00
multiple creatures d4b8f90f29 update `devise` config from upstream 2020-01-15 21:30:01 -06:00
multiple creatures 4965722af6 update `paperclip` config from upstream 2020-01-15 21:29:32 -06:00
multiple creatures da06267e7b add `identity` context to json-ld 2020-01-15 21:29:11 -06:00
multiple creatures f49ff8fccc fix "allow unknown packmates" documentation 2020-01-15 14:43:33 -06:00
multiple creatures b4b8eaf61c anti-harassment: add option to toggle whether to allow follows/packmate requests from accounts you've never interacted with before; default to off 2020-01-15 14:24:55 -06:00
multiple creatures 5d600cc670 change test & dev keys to resolve https://github.com/rails/rails/issues/38030 2020-01-15 13:33:19 -06:00
multiple creatures 0d211f31e9 make the external login (ldap/pam/saml/etc) error informative for non-technical users 2020-01-14 14:23:03 -06:00
multiple creatures 67516a07db add new privacy option to auto-defederate after a given timespan + add options to defederate and/or delete past posts + add `defed_in`/`parent:defed_in`/`thread:defed_in` bangtags + ui indicator for posts marked for auto-defederation 2020-01-13 21:57:24 -06:00
multiple creatures 51bab85b07 add privacy option to limit lifespan of public access to post & object urls beyond local followers, default to 90 days 2020-01-12 23:56:43 -06:00
multiple creatures 0f1532aee0 add option for changing the monsterfork api exposure level, defaulting to `full` - if this gives your app indigestion change it to back to `basic` in preferences 2020-01-10 23:04:14 -06:00
multiple creatures 1268277a8c add custom filter master toggle, add media gallery mode, & fix various filter logic + caching bugs 2020-01-10 20:07:15 -06:00
multiple creatures 13b4d7953a add ability to toggle individual filters without deleting them 2020-01-10 14:19:04 -06:00
multiple creatures f03960382b switch (back) to postgres fts engine for fast search & timeline filters 2020-01-10 03:45:29 -06:00
multiple creatures 4c8591fbea dump schema to plain sql 2020-01-10 00:35:53 -06:00
ntl-purism 244a90b45e LDAP & PAM added to OAuth password grant strategy (#7999) (#12390)
When authenticating via OAuth, the resource owner password grant
strategy is allowed by Mastodon, but (without this PR), it does not
attempt to authenticate against LDAP or PAM. As a result, LDAP or PAM
authenticated users cannot sign in to Mastodon with their
email/password credentials via OAuth (for instance, for native/mobile
app users).

This PR fleshes out the authentication strategy supplied to doorkeeper
in its initializer by looking up the user with LDAP and/or PAM when
devise is configured to use LDAP/PAM backends. It attempts to follow the
same logic as the Auth::SessionsController for handling email/password
credentials.

Note #1: Since this pull request affects an initializer, it's unclear
how to add test automation.

Note #2: The PAM authentication path has not been manually tested. It
was added for completeness sake, and it is hoped that it can be manually
tested before merging.
2019-12-31 02:41:24 -06:00
multiple creatures 5f92c6429f add option to only apply phrase filters to timelines 2019-12-21 13:59:38 -06:00
multiple creatures 8312a6e510 add option to use phrase filters as an allow list 2019-12-21 13:22:18 -06:00
multiple creatures 82f98a770b rework hide boosts / show only packmates options to work with timeline streaming 2019-12-19 20:48:20 -06:00
multiple creatures 32d998b623 add preference options to a: hide boosts globally, & b: show only packmates across all timelines - works in all client apps 2019-12-19 19:41:02 -06:00
multiple creatures 1fecec8fb6 remove now-unsed `no_body` translation string 2019-12-19 09:46:02 -06:00
multiple creatures 1633268293 avoid posting when body only has mentions it 2019-12-12 11:10:11 -06:00
multiple creatures a8713ee8b7 add ability for post authors to kick jerks out of their threads 2019-12-12 04:38:56 -06:00
multiple creatures 8975561bfa adjust regex shortcut descriptions 2019-12-10 03:55:47 -06:00
multiple creatures 61e3a90e50 add regex shortcut descriptions for filters 2019-12-10 03:44:43 -06:00
multiple creatures 13f4959034 add accessibility option to make everything lowercase 2019-12-10 03:04:05 -06:00
multiple creatures 5af281b057 add synchronize button to account manager 2019-12-10 02:36:38 -06:00
multiple creatures 6fa9c3eb1b add option to toggle whether regex filters should be applied to mentions 2019-12-07 22:13:32 -06:00
multiple creatures 59253ce0dd clear out dead sidekiq job locks & add lock manager to sidekiq's dashboard to let admins get rid of stuck locks 2019-12-03 14:49:06 -06:00
multiple creatures 9d7ffb7d86 accept mp3s that are actually videos 2019-11-29 15:18:04 -06:00
multiple creatures 08ff7a4850 remove img tag proxy from csp cause a: we don't use that anymore & b: it's breaking stuff 2019-11-29 14:14:02 -06:00
multiple creatures e11ea14bc5 fix breaking typo 2019-11-26 15:31:55 -06:00
Eugen Rochko 23d379e007 Add waiting time to list of pending accounts in admin UI (#10985) 2019-11-19 16:38:32 -06:00
Jeong Arm 2aee833a22 Add missing Korean translations (#10962)
And change some word.
2019-11-19 16:24:22 -06:00
Yamagishi Kazutoshi d724310750 Replace from uglifyjs to terser (#10956) 2019-11-19 16:22:52 -06:00
Marek Ľach 856a8b21eb Small update for sk.yml (#10913) 2019-11-19 16:18:08 -06:00
Yamagishi Kazutoshi 4b1840f4e2 Remove dependency on fibers (#10902) 2019-11-19 16:18:06 -06:00
Eugen Rochko 35d85c1622 Change default to single column UI (#10847)
Keep current setting for users who were active within the last month
2019-11-19 16:15:00 -06:00
mayaeh 84b70ebf55 Update Japanese translations. (#10875)
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-11-19 15:53:28 -06:00
Hinaloe 641bc18f29 Fix undefined method error (#10868) 2019-11-19 15:38:26 -06:00
mayaeh 5f6d21b644 Fix undefined method error. (#10867) 2019-11-19 15:37:37 -06:00
Alix Rossi 37736ec0fb Update simple_form.co.yml (#10862) 2019-11-19 15:37:32 -06:00
ThibG c068f90803 Improve rate limiting (#10860)
* Rate limit based on remote address IP, not on potential reverse proxy

* Limit rate of unauthenticated API requests further

* Rate-limit paging requests to one every 3 seconds
2019-11-19 15:37:05 -06:00
Marek Ľach 6e5ba32fe9 Update simple_form.sk.yml (#10842) 2019-11-19 15:32:30 -06:00