Commit Graph

10457 Commits (master)

Author SHA1 Message Date
Rachel Fae Fox d1b0463c29 various changes 2020-02-25 16:38:58 +00:00
multiple creatures 353558c59f shorten poll add button labels 2020-02-03 13:30:05 -06:00
multiple creatures 2198000607 button to add the spiderman discard option to polls 2020-02-03 13:21:16 -06:00
multiple creatures 0a5e08ebe7 **MAJOR**: fix access policy short-circuit bug caused by `fa8437f49` & `cb38a5899` - **if you are running a monsterfork revision between `fa8437f49` and `389125d89` upgrade or apply this patch immediately! 2020-02-01 10:52:51 -06:00
multiple creatures 389125d894 use upstream spam detection 2020-01-30 02:35:15 -06:00
multiple creatures ba0febd3c1 remove no-longer-used `subscriptions` prop from `SuspendAccountService` 2020-01-28 09:20:16 -06:00
multiple creatures 5622a7fa5e remove no-longer-used `stream_entries` prop from `SuspendAccountService` 2020-01-28 09:11:05 -06:00
multiple creatures ab16388714 restore monsterfork hashtag parsing behavior 2020-01-26 01:04:51 -06:00
multiple creatures cb38a58997 fix breaking the server trying to fix replies not showing up >.>; 2020-01-25 17:34:01 -06:00
multiple creatures 2e50d64956 fix manifests json (thanks @@Frinkeldoodle@transfur.online) 2020-01-25 17:25:49 -06:00
multiple creatures fa8437f49a fix replies not showing up 2020-01-25 17:23:35 -06:00
multiple creatures def687fe62 use platform-agnotic procfile 2020-01-23 11:54:24 -06:00
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