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 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
Aevann1 2b295f1c5b sneed 2021-08-20 07:52:52 +02:00
Aevann1 70157c8c27 dffd 2021-08-19 07:40:23 +02:00
Aevann1 5057c2934e fggf4 2021-08-19 07:14:52 +02:00
Aevann1 36ae2eda54 dfdf 2021-08-15 06:18:50 +02:00
Aevann1 54ffc1f2a0 dffd 2021-08-15 01:43:31 +02:00
Aevann1 b71d59b5d3 fdfd 2021-08-12 00:28:11 +02:00
Aevann1 7001f11be7 fd 2021-08-12 00:26:04 +02:00
fireworks88 0634ef5894 sex 2021-08-11 22:20:37 +02:00
Aevann1 99dd983387 fd 2021-08-11 21:17:43 +02:00
Aevann1 f9ab99b5d1 gf 2021-08-11 21:05:38 +02:00
Aevann1 0a399bf41c fd 2021-08-11 20:59:09 +02:00
Aevann1 3737b93b0d gf 2021-08-11 20:57:12 +02:00
Aevann1 cc3835851c gf 2021-08-09 00:24:22 +02:00
Aevann1 572ea9c396 gf 2021-08-09 00:16:32 +02:00
Aevann1 b7017e4bd9 fd 2021-08-08 01:03:48 +02:00
Aevann1 acdf0da347 df 2021-08-08 01:03:15 +02:00
Aevann1 5109b21291 fd 2021-08-08 01:02:05 +02:00
Aevann1 2f1bbd6a43 sneed 2021-08-08 01:01:07 +02:00
Aevann1 e925b918f4 fd 2021-08-06 14:57:37 +02:00
Aevann1 e2fa0ecb76 fd 2021-08-06 14:51:41 +02:00
Aevann1 0071ef71a7 fd 2021-08-06 14:49:41 +02:00
Aevann1 10fdaca089 fd 2021-08-06 14:45:09 +02:00
Aevann1 b981888f90 gf 2021-08-06 14:44:24 +02:00
Aevann1 72e5bcaa3b fd 2021-08-06 14:41:26 +02:00
Aevann1 3feff277b4 fd 2021-08-06 14:35:20 +02:00
Aevann1 2dc2c6d731 fd 2021-08-06 14:33:49 +02:00
Aevann1 1479fe68e9 fd 2021-08-06 14:32:35 +02:00
Aevann1 6dd2cfe6f9 fd 2021-08-06 14:31:52 +02:00
Aevann1 9ebd9ef346 fd 2021-08-06 14:31:20 +02:00
Aevann1 05b9a66f0a fd 2021-08-06 14:25:00 +02:00
Aevann1 3222d61b11 gf 2021-08-06 14:23:06 +02:00
Aevann1 e512b15771 fd 2021-08-06 14:22:29 +02:00
Aevann1 933deb10d6 fggfgf 2021-08-05 16:41:32 +02:00
Aevann1 4af2ce2a53 fddf 2021-08-04 17:35:10 +02:00