carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
20,479 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

384 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
Aevann1 315dcef46a hfg 2022-02-14 21:02:05 +02:00
Aevann1 83552eb1db df 2022-02-14 04:47:28 +02:00
Aevann1 8db4b363f8 nb 2022-02-14 00:35:55 +02:00
Aevann1 0e9a765358 dfg 2022-02-13 04:45:09 +02:00
Aevann1 bf3e14bba3 big big chungus big chungus big chungus 2022-02-13 03:08:12 +02:00
Aevann1 ac2e06b10f fgd 2022-02-13 00:23:41 +02:00
Aevann1 dec1f0d8ab fgd 2022-02-12 23:02:34 +02:00
Aevann1 03f1a106b4 dude subdramas lmao 2022-02-10 22:35:16 +02:00
Aevann1 c8893fc27b xcv 2022-02-10 18:11:14 +02:00
Aevann1 3b51b37535 vxc 2022-02-07 17:24:37 +02:00
Aevann1 0491bd3c5d dfs 2022-02-07 14:55:37 +02:00
Aevann1 486023e7cb cxv 2022-02-07 14:38:45 +02:00
Aevann1 be13ba1810 cvx 2022-02-07 14:26:11 +02:00
Aevann1 820d8387f9 xv 2022-02-07 13:39:26 +02:00
Aevann1 1eeebf9400 crisis 2022-02-05 23:09:17 +02:00
Aevann1 6101e01688 fd 2022-02-05 19:51:42 +02:00
Aevann1 50e9e3061a dfs 2022-02-05 16:36:10 +02:00
Aevann1 a666a2d12a fds 2022-02-05 13:10:16 +02:00
Aevann1 d301d733c5 fsd 2022-02-04 20:35:39 +02:00
Aevann1 7fadf2d7ba xvc 2022-02-04 16:49:27 +02:00
Aevann1 04a1b875ef sfd 2022-02-04 11:15:59 +02:00
Aevann1 35f7813d3d dfs 2022-02-04 06:24:12 +02:00
Aevann1 7379d777e6 dgf 2022-02-04 05:06:49 +02:00
Aevann1 7d5fc1b090 sdf 2022-01-30 15:40:11 +02:00
Aevann1 e79fb81819 gdfdfg 2022-01-29 15:43:29 +02:00
Aevann1 c7bab4ec6c fsd 2022-01-28 23:42:09 +02:00
Aevann1 716b4ee2ea czx 2022-01-28 22:02:35 +02:00
Aevann1 cfb33e90d8 vvvvvvvvvvvvvvv 2022-01-27 19:04:02 +02:00
Aevann1 8b381284c6 yolo 2022-01-24 01:06:34 +02:00
Aevann1 594fbfd41c vcxxcv 2022-01-23 18:54:57 +02:00
Aevann1 67f524ecaa dfsfs 2022-01-22 18:41:48 +02:00
Aevann1 71f3cf4a65 fdssfd 2022-01-22 18:22:31 +02:00
Aevann1 9c1c225ed9 cxzxzc 2022-01-22 12:14:15 +02:00
Aevann1 0233c58a2e cxvxcv 2022-01-21 22:56:56 +02:00
Aevann1 30bd0902fa czxczx 2022-01-21 16:40:01 +02:00
Aevann1 3afab45df5 fsd 2022-01-19 11:21:20 +02:00
Aevann1 81078c5877 fds 2022-01-19 11:07:16 +02:00
Aevann1 0f58d70cce 100000000k 2022-01-19 08:20:05 +02:00
Aevann1 7a9a78c027 bbb 2022-01-17 13:47:30 +02:00
Aevann1 e59bcfc467 bb 2022-01-14 06:38:27 +02:00
Aevann1 7aede92a46 bbb 2022-01-14 06:15:41 +02:00
Aevann1 9ae0a6ef24 bbb 2022-01-14 04:33:27 +02:00
Aevann1 6ecf15476a g 2022-01-14 01:29:15 +02:00
Aevann1 3e44777483 bfg 2022-01-12 05:41:23 +02:00
Aevann1 b5762b2e86 fv 2022-01-12 03:19:13 +02:00
Aevann1 84ad798f37 bb 2022-01-11 00:53:48 +02:00
Aevann1 101aa43006 fds 2022-01-06 22:30:08 +02:00
Aevann1 ea8ed285de fds 2022-01-06 21:09:37 +02:00
Aevann1 4f314382ac sfd 2022-01-06 21:05:13 +02:00
Aevann1 3533dbb17b fds 2022-01-06 03:25:04 +02:00
Aevann1 d2a6691c24 fd 2022-01-06 03:24:03 +02:00
Aevann1 89798803af dfs 2021-12-30 07:27:22 +02:00
Aevann1 89150935b6 fsd 2021-12-28 16:52:57 +02:00
Aevann1 dfb9aa2cfd fsd 2021-12-28 16:46:07 +02:00
Aevann1 bb182a0807 fds 2021-12-27 04:09:06 +02:00
Aevann1 19bacd8357 pins logic rework 2021-12-26 03:03:21 +02:00
Aevann1 39e0ad5cf9 sdf 2021-12-25 01:00:09 +02:00
Aevann1 177c280668 fsdfsd 2021-12-19 00:17:00 +02:00
Aevann1 6594777e0f fsdfsd 2021-12-18 05:13:46 +02:00
Aevann1 daf790e150 fsdsfd 2021-12-17 19:55:11 +02:00
Aevann1 fbbae48405 fsddfs 2021-12-17 08:20:22 +02:00
Aevann1 b3b193c45f fdsfds 2021-12-17 08:13:40 +02:00
Aevann1 ae6c8d9ee7 fdsfsd 2021-12-17 08:07:57 +02:00
Aevann1 fe89c82198 sffsd 2021-12-17 05:25:05 +02:00
Aevann1 28babbee6b sdf 2021-12-16 19:59:30 +02:00
Aevann1 b8350f1aba fsdsfd 2021-12-15 21:30:26 +02:00
Aevann1 e3f2eccf8a fsdfds 2021-12-14 02:54:19 +02:00
Aevann1 1894821b34 fsdfsd 2021-12-13 23:27:25 +02:00
Aevann1 0fdaccdbbc sfdfsd 2021-12-11 05:32:43 +02:00
Aevann1 4a881347ad fdsfds 2021-12-11 04:58:04 +02:00
Aevann1 eb53748480 fdsfsd 2021-12-11 04:41:14 +02:00
Aevann1 34657d207d dfsfsd 2021-12-11 04:27:46 +02:00
Aevann1 b316577d76 sfd 2021-12-08 01:09:43 +02:00
Aevann1 6bdbd8117e fdsdsf 2021-12-05 22:22:57 +02:00
Aevann1 76ead80d6d fsdfsd 2021-12-05 21:45:08 +02:00
Aevann1 13bd73d4d8 sfdfsd 2021-12-05 20:58:46 +02:00
Aevann1 81a6bcfdc0 fsdfsd 2021-12-04 22:48:10 +02:00
Aevann1 b5f63cd071 dfsfsd 2021-12-02 22:14:44 +02:00
Aevann1 f066ab94c9 dsads 2021-12-02 20:45:03 +02:00
Aevann1 7debf6766c sfdds 2021-12-01 19:25:28 +02:00
Aevann1 9f62ea6351 fdfsd 2021-11-30 18:37:28 +02:00
Aevann1 63f09542e5 fdsfds 2021-11-30 16:18:16 +02:00
Aevann1 c7a5d6e80a gd 2021-11-26 23:24:47 +02:00
Aevann1 aeea97941c 1 2021-11-26 21:28:55 +02:00
Aevann1 2de302006a fdfd 2021-11-23 21:28:29 +02:00
Aevann1 038ae1cb75 dfsdsf 2021-11-23 15:48:10 +02:00
Aevann1 119c547dc6 fsdfds 2021-11-23 02:04:13 +02:00
Aevann1 de2bd771b1 dfs 2021-11-23 00:49:06 +02:00
Aevann1 a518ca7fc3 fdsfsd 2021-11-23 00:41:36 +02:00
Aevann1 f42a2c0472 sfdfds 2021-11-22 19:50:34 +02:00
Aevann1 d2e33671c3 sdf 2021-11-22 16:32:39 +02:00
Aevann1 a84cb6f20a gffg 2021-11-22 16:31:07 +02:00
Aevann1 4b256b649b sdfsdf 2021-11-21 14:32:49 +02:00
CaringCleaner 05c33e163f teddit urls 2021-11-19 23:05:28 +00:00
Aevann1 65d2090cd8 fdsfsd 2021-11-18 16:21:19 +02:00
Aevann1 6713493d5f splash 2021-11-16 23:21:53 +02:00
Aevann1 8a49ee0dc3 gffg 2021-11-16 00:13:29 +02:00
Aevann1 9c8db82f34 fdsfds 2021-11-13 23:44:07 +02:00
Aevann1 f919dc52fb dfsfsd 2021-11-13 23:12:07 +02:00
Aevann1 afab230985 fdsfds 2021-11-13 23:10:57 +02:00
Aevann1 9ec7856091 fddffd 2021-11-13 23:07:59 +02:00
Aevann1 8ae70b9b04 \ 2021-11-11 20:58:09 +02:00
Aevann1 1f996ecad7 fdfd 2021-11-07 15:37:26 +02:00
Aevann1 8e4daecc2d fdssfd 2021-11-06 19:30:39 +02:00
Aevann1 9e449dd8b0 redundant 2021-11-06 17:52:48 +02:00
Aevann1 e5dfdd701e enemies and fixes 2021-11-06 17:21:05 +02:00
Aevann1 35ee7873a3 whatever 2021-11-05 23:30:54 +02:00
Aevann1 c4ea7837b7 fdsdfs 2021-11-05 22:10:51 +02:00
Aevann1 81c2555caf fdfsdfds 2021-11-05 20:29:05 +02:00
Aevann1 16032ec1aa sigs toggle 2021-11-04 19:24:43 +02:00
Aevann1 159dd1387e fdsfsd 2021-11-04 17:12:17 +02:00
Aevann1 cf7c31879c misc 2021-10-26 23:31:39 +02:00
Aevann1 0cb242354b bruh 2021-10-25 16:47:19 +02:00
Aevann1 6e1216d7b3 misc 2021-10-23 16:35:35 +02:00
Aevann1 cc35cd3633 yolo 2021-10-22 02:19:23 +02:00
Aevann1 8d00745dc3 fd 2021-10-20 16:37:46 +02:00
Yo Mama 35e77adb26 Now uses regex censor in the title too 2021-10-20 01:54:23 +02:00
Aevann1 9c7878d7c9 fds 2021-10-20 01:43:11 +02:00
Yo Mama af8da42c73 Changes from regex censor v1 2021-10-18 22:46:57 +02:00
Aevann1 bc042d59cc gd 2021-10-18 18:09:15 +02:00
Aevann1 88b8358880 fdsfs 2021-10-18 18:06:57 +02:00
Aevann1 3b87fe7250 dfsfds 2021-10-18 03:26:30 +02:00
Yo Mama a831a24aa4 Merge branch 'master' into regex-censor 
# Conflicts:
#	.gitignore
#	docker-compose.yml
#	files/classes/comment.py
#	files/classes/submission.py
#	files/helpers/const.py
#	requirements.txt
 2021-10-16 21:29:36 +02:00
Yo Mama b345cedf2a Fixed not passing the logged user to the censor 2021-10-16 20:56:12 +02:00
Yo Mama 5f7824b6c7 First 'working' version of the word-censor 2021-10-16 20:06:21 +02:00
Aevann1 4249412f55 ghfgf 2021-10-15 16:39:32 +02:00
Aevann1 efa408ab2c fd 2021-10-15 16:08:27 +02:00
Captain 85397c9243 add, 'private' json to submission 2021-10-13 23:11:52 +02:00
Aevann1 9dbcbc9cd5 fdsfds 2021-10-10 06:25:34 +02:00
Aevann1 e69dbd0ed1 gdfsd 2021-10-08 04:14:54 +02:00
Aevann1 b0bee4c081 dfdf 2021-10-07 06:17:50 +02:00
Aevann1 409f77d021 dfssdf 2021-10-07 06:03:54 +02:00
Aevann1 f139b07189 fgdg 2021-10-07 00:38:15 +02:00
Aevann1 e9310939e5 fgdgd 2021-10-07 00:12:04 +02:00
Aevann1 32cbc010e4 fdsfsd 2021-10-06 02:04:35 +02:00
Aevann1 2f708e34bd d 2021-10-06 01:11:17 +02:00
Aevann1 a5ce637b50 fgg 2021-10-05 21:15:48 +02:00
Aevann1 ee9774042f dfsfsd 2021-10-05 21:12:31 +02:00
Aevann1 0ff1bde411 sdfsdf 2021-10-05 21:09:47 +02:00
Aevann1 69aa9e3239 dfsfds 2021-10-02 22:58:14 +02:00
Aevann1 75da66e769 dsfsdf 2021-10-01 08:35:45 +02:00
Aevann1 88ca58e1de dfsfsd 2021-10-01 08:34:09 +02:00
Aevann1 90d15361a7 dsffsd 2021-10-01 08:26:59 +02:00
Aevann1 47a0acab80 hfghf 2021-09-30 21:40:33 +02:00
Aevann1 44c28c9416 gfd 2021-09-29 18:50:52 +02:00
Aevann1 800acd97e0 fds 2021-09-28 05:59:33 +02:00
Aevann1 8c04bfd319 squashing 2021-09-28 04:44:47 +02:00
Aevann1 e3c206965f gd 2021-09-25 04:04:06 +02:00
Aevann1 b5f6517717 fsd 2021-09-24 05:26:54 +02:00
Aevann1 0c9816c185 d 2021-09-24 04:00:11 +02:00
Aevann1 75d83b7a4b fds 2021-09-23 23:42:02 +02:00
Aevann1 29a182540a fds 2021-09-23 21:45:11 +02:00
Aevann1 89abf2d26d fds 2021-09-23 21:22:18 +02:00
Aevann1 643a998e5b fsd 2021-09-23 21:16:44 +02:00
Aevann1 b4287b2477 fd 2021-09-23 19:28:30 +02:00
Aevann1 1af15ed76c fdsfs 2021-09-23 17:43:09 +02:00
Aevann1 67c496a6d2 fsd 2021-09-23 00:54:13 +02:00
Aevann1 fdb50fc88d sex 2021-09-22 20:36:03 +02:00
Aevann1 c93e49d417 fs 2021-09-22 17:01:18 +02:00
Aevann1 fc4b89bfbc fsdfs 2021-09-22 16:51:36 +02:00
Aevann1 6d6ef21a0f fdsfsd 2021-09-22 00:44:18 +02:00
Aevann1 470118696f fdsfs 2021-09-21 23:27:32 +02:00
Aevann1 d666bfaa95 fdsfs 2021-09-20 23:19:33 +02:00
Aevann1 7ffef1002e fdsfsd 2021-09-20 15:30:50 +02:00
Aevann1 886fff86b5 dfsfsd 2021-09-19 22:06:52 +02:00
Aevann1 4a9638d055 fdfsfds 2021-09-19 21:54:28 +02:00
Aevann1 b5db325d22 fsdfs 2021-09-19 20:31:31 +02:00
Aevann1 bc55dda81b fsdsfd 2021-09-19 20:28:31 +02:00
Aevann1 649d6b10c2 fsdfs 2021-09-19 20:25:40 +02:00
Aevann1 0ff6a26335 dfsfsd 2021-09-19 20:22:57 +02:00
Aevann1 3be328de00 sfd 2021-09-18 21:52:31 +02:00
Aevann1 a956d2a149 fsfsd 2021-09-18 21:45:17 +02:00
Aevann1 176524785f fd 2021-09-17 16:07:08 +02:00
Aevann1 7c1c90d9d0 sdfsfd 2021-09-17 14:36:39 +02:00
Aevann1 4e18f2ead3 re 2021-09-13 17:58:52 +02:00
Aevann1 e92c5db120 fd 2021-09-13 14:06:22 +02:00
Aevann1 93917e3147 fd 2021-09-12 10:02:04 +02:00
Aevann1 19d85aaeb5 fd 2021-09-12 08:12:44 +02:00
Aevann1 02731bafe4 fd 2021-09-12 05:04:29 +02:00
Aevann1 203fb0ef69 fd 2021-09-12 01:57:44 +02:00
Aevann1 4caff1ab4b fd 2021-09-12 01:40:58 +02:00
Aevann1 cdf54f591b fd 2021-09-10 07:36:31 +02:00
Aevann1 58b1584d93 fd 2021-09-10 07:35:59 +02:00
Aevann1 dbe2088fc7 fd 2021-09-10 07:30:04 +02:00
Aevann1 0ec50061a0 fd 2021-09-10 07:28:09 +02:00
Aevann1 c268a7e306 Revert "fd" 
This reverts commit 076bd37070.
 2021-09-09 16:15:27 +02:00
Aevann1 076bd37070 fd 2021-09-09 16:13:15 +02:00
fireworks88 cb422ba6ea fd 2021-09-06 22:57:10 +02:00
fireworks88 2fc8faae14 ijdjoiefjrje 2021-09-05 21:19:48 +02:00
fireworks88 78ed273716 shit 2021-09-05 15:51:16 +02:00
fireworks88 1f5e5b4fd0 highlight 2021-09-05 15:50:33 +02:00
Aevann1 8a7fb6767b fd 2021-09-05 13:45:47 +02:00
Aevann1 d48fe6de0f fd 2021-09-05 13:44:14 +02:00
Aevann1 255eb4edaa fd 2021-09-05 13:41:08 +02:00
Aevann1 52b6951b7b gf 2021-09-05 13:37:23 +02:00
Aevann1 1904bcf272 dffd 2021-09-03 15:52:37 +02:00
atrc445 f14eda2f7a add comment count column to submissions 
ALTER TABLE submissions add column comment_count integer default 0;
update submissions set comment_count=(select count(id) from comments where parent_submission=submissions.id);
 2021-08-22 13:31:01 +02:00
atrc445 d3f3c0b6a7 Merge branch 'master' into constants 2021-08-21 23:10:23 +02:00
Aevann1 ebb34e29a3 df 2021-08-21 14:30:54 +02:00
atrc445 6a36d3c1b5 create const.py 2021-08-21 13:06:28 +02:00