Commit Graph

10445 Commits (a50f339b9b9a35872fbf3e7840d48a43774c11e0)

Author SHA1 Message Date
multiple creatures a50f339b9b improve mingw compatability 2020-01-23 10:27:15 -06:00
multiple creatures a4565cb1c3 update schema 2020-01-23 10:26:53 -06:00
multiple creatures 9d84d4fb7b allow the use of `node` 13 2020-01-23 10:26:26 -06:00
Holly 'Frinkel' Lotor 4c146300ff Fix change breaking sharekey functionality 2020-01-22 01:57:23 -05:00
multiple creatures 8b96e669e9 bump monsterfork version 2020-01-21 01:08:23 -06:00
multiple creatures 5c796f8cf6 resolve stray merge conflict between tfonline/monsterfork strings 2020-01-20 23:10:12 -06:00
multiple creatures edf5be3cfe bump supported `node` version to `13 2020-01-20 23:01:42 -06:00
multiple creatures b2e391d268 fix code typo 2020-01-20 22:41:26 -06:00
Holly 'Frinkel' Lotor 7dc114f589 More smoke testing, I believe the stability is passable now 2020-01-20 16:58:12 -05:00
Holly 'Frinkel' Lotor e37c5a967a More smoke testing, merge in request pool from upstream 2020-01-20 16:57:59 -05: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 9447566b8e add chest floof to monsterfork api & outgoing federation 2020-01-19 00:22:45 -06:00
multiple creatures f083ab1a27 make sure there are actually media attachments before trying to match againist the `filter_undescribed?` setting 2020-01-17 14:29:24 -06:00
Holly "Frinkeldoodle" Lotor b93a9a126b Fix issue fetching new accts 2020-01-17 16:46:10 +00:00
multiple creatures d2acdf2ea6 Merge pull request 'Port CacheConcern from upstream to define render_with_cache' (#13) from blueraccoon/port-cacheconcern into master
Reviewed-on: https://monsterware.dev/monsterpit/mastodon/pulls/13
2020-01-17 10:36:42 +00:00
Holly "Frinkeldoodle" Lotor 7b4381b4bd Comment out reference to var that hasn't been ported yet 2020-01-17 07:33:31 +00:00
Holly "Frinkeldoodle" Lotor 503158b0cf Fix typo 2020-01-17 07:33:20 +00:00
Holly "Frinkeldoodle" Lotor 93151f0c51 Port render_with_cache, CacheConcern from upstream 2020-01-17 07:32:59 +00:00
multiple creatures 753d064951 `backtrace` -> `e.backtrace` 2020-01-16 00:13:28 -06:00
multiple creatures c657d9deda bump ruby version to 2.6.5 2020-01-16 00:02:33 -06:00
multiple creatures df0a08c3d2 lock `paperclip` at 6.0 2020-01-15 23:12:55 -06:00
multiple creatures 874e7adbe1 port commit `7e2bff995` from upstream to fix broken attachment downloading 2020-01-15 23:02:03 -06:00
multiple creatures f35851e777 port instances controller from upstream 2020-01-15 22:28:57 -06:00
multiple creatures 299ee19966 port new application controller error handlers from upstream 2020-01-15 22:19:29 -06: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 310844bf3d update jsonld helper from upstream 2020-01-15 19:29:52 -06:00
multiple creatures 5b1c214984 update json-ld contexts 2020-01-15 19:21:02 -06:00
multiple creatures d8b87ec487 handle passing `0` to `lifespan` & `defed_in` bangtags to unset the auto-destruct/auto-defederate flag for a post 2020-01-15 16:42:43 -06:00
multiple creatures f49ff8fccc fix "allow unknown packmates" documentation 2020-01-15 14:43:33 -06:00
multiple creatures 37ae8a96c1 fix tired dev operating `vim` without adequate coffee & breaking code 2020-01-15 14:34:06 -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 f40c1ae07e break up preferences with more page sections 2020-01-15 13:38:24 -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 257b33c2ad update `rack` to `2.2.0@f690bb714` until github.com/rack/rack/pull/1428 makes it into the next release 2020-01-15 11:04:41 -06:00
multiple creatures bcbfe4282d update ruby & node dependencies to latest versions (that won't make things break) 2020-01-15 10:23:30 -06:00
multiple creatures 1d6cc95109 fix "leading decorators must be attached to a class declaration" 2020-01-15 10:21:12 -06:00
multiple creatures a82072b8c0 work around sprockets 4 being a jerk 2020-01-15 10:19:56 -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 8d32723567 skip duplicate redis check 2020-01-14 02:42:31 -06:00
multiple creatures 0ce978a11d behave like `block anon` when checking whether local users can read a community or public post made in invisible mode 2020-01-14 02:42:31 -06:00
multiple creatures a9c30694cd fix check for "filter if in reply to blocker" setting 2020-01-14 02:42:31 -06:00
multiple creatures c236bbe60b fix the "include past roars" buttons 2020-01-14 02:42:17 -06:00
multiple creatures 14326f5fd0 differentiate local-only posts in the web app 2020-01-14 00:13:52 -06:00
multiple creatures d824237629 use `update` instead of assignment on `delete_after=` & `defederate_after=` 2020-01-13 23:24:02 -06:00