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

2076 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann1 3137bb43f2 fds 2021-09-23 22:05:04 +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 c0939815ac fsd 2021-09-23 21:20:47 +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 2622097de1 fds 2021-09-23 18:08:31 +02:00
Aevann1 1af15ed76c fdsfs 2021-09-23 17:43:09 +02:00
Aevann1 fa7cb304e3 force push 2021-09-23 10:44:26 +02:00
Aevann1 739f873fff fds 2021-09-23 01:52:18 +02:00
Aevann1 e0dfa39460 fds 2021-09-23 01:42:43 +02:00
Aevann1 0206edde5d fsdsf 2021-09-23 01:41:51 +02:00
Aevann1 67c496a6d2 fsd 2021-09-23 00:54:13 +02:00
Aevann1 8576fa5269 sf 2021-09-22 20:39:12 +02:00
Aevann1 fdb50fc88d sex 2021-09-22 20:36:03 +02:00
Aevann1 ffebc53bf8 fd 2021-09-22 18:52:54 +02:00
Aevann1 449f483502 fds 2021-09-22 17:23:57 +02:00
Aevann1 c93e49d417 fs 2021-09-22 17:01:18 +02:00
Aevann1 4abdf69a84 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-09-22 16:51:38 +02:00
Aevann1 fc4b89bfbc fsdfs 2021-09-22 16:51:36 +02:00
Aevann1 eba946aece Update mod_logs.py 2021-09-22 15:03:46 +02:00
Aevann1 6d6ef21a0f fdsfsd 2021-09-22 00:44:18 +02:00
Aevann1 be92fb7de7 fdsfsd 2021-09-22 00:12:30 +02:00
Aevann1 0b4c699e08 fds 2021-09-22 00:11:21 +02:00
Aevann1 38305331b6 fdsfs 2021-09-22 00:11:06 +02:00
Aevann1 c35cec2d8f fsd 2021-09-22 00:08:49 +02:00
Aevann1 783eae21b3 fsdfs 2021-09-22 00:07:37 +02:00
Aevann1 652c1d31c3 fdsfs 2021-09-22 00:05:06 +02:00
Aevann1 afc4f1702c dfssdf 2021-09-22 00:02:27 +02:00
Aevann1 470118696f fdsfs 2021-09-21 23:27:32 +02:00
Aevann1 b161576ae8 fds 2021-09-21 21:33:17 +02:00
Aevann1 b222005391 fsdfsd 2021-09-21 21:18:16 +02:00
Aevann1 ababa11721 fdsfsd 2021-09-21 21:07:12 +02:00
Aevann1 d666bfaa95 fdsfs 2021-09-20 23:19:33 +02:00
Aevann1 54e8fa9284 fgddfg 2021-09-20 22:48:11 +02:00
Aevann1 bd3f0ff2e6 fdsfsd 2021-09-20 16:57:43 +02:00
Aevann1 0fbd8f1909 fdsfs 2021-09-20 16:31:58 +02:00
Aevann1 7ffef1002e fdsfsd 2021-09-20 15:30:50 +02:00
Aevann1 4e36e42419 fsfsd 2021-09-20 15:14:42 +02:00
Aevann1 7a0951aaa4 dfs 2021-09-20 15:11:10 +02:00
Aevann1 e8070d40bf fds 2021-09-20 14:32:38 +02:00
Aevann1 ec3021704c fdsfs 2021-09-19 22:18:29 +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 60950a9288 fdsf 2021-09-19 21:47:58 +02:00
Aevann1 45c07c8b9a fdsfsd 2021-09-19 21:09:52 +02:00
Aevann1 2ba06b04c0 fds 2021-09-19 21:09:28 +02:00
Aevann1 16b48632a5 fdsfsd 2021-09-19 21:07:41 +02:00
Aevann1 8f53dd986e dfs 2021-09-19 20:57:12 +02:00
Aevann1 20ce85165c fdsfsd 2021-09-19 20:56:40 +02:00
Aevann1 ee1f2e1e25 fsdfsf 2021-09-19 20:46:03 +02:00
Aevann1 5e716cac7c fsfs 2021-09-19 20:38:24 +02:00
Aevann1 cf4b9dcbf3 dfs 2021-09-19 20:32:09 +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 3b7ad10d0e sdfsdf 2021-09-19 20:27:00 +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 ca67562791 fsd 2021-09-19 20:07:21 +02:00
Aevann1 96df336e6a fds 2021-09-19 20:05:35 +02:00
Aevann1 118a440733 fsd 2021-09-19 16:29:39 +02:00
Aevann1 8f49860a04 sdf 2021-09-19 16:27:30 +02:00
Aevann1 b65f81bbcc fdsfs 2021-09-19 15:08:47 +02:00
Aevann1 a7afac33d5 gfd 2021-09-19 15:01:16 +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 1f6a4b0130 fsfs 2021-09-18 15:25:04 +02:00
Aevann1 176524785f fd 2021-09-17 16:07:08 +02:00
Aevann1 da9c48080e fd 2021-09-17 16:07:05 +02:00
Aevann1 35a6a2fa28 fdfd 2021-09-17 16:01:47 +02:00
Aevann1 2c57637bd7 fd 2021-09-17 15:40:13 +02:00
Aevann1 2cd93e6516 fddf 2021-09-17 14:41:04 +02:00
Aevann1 4c448ac6fa fdfd 2021-09-17 14:37:48 +02:00
Aevann1 7c1c90d9d0 sdfsfd 2021-09-17 14:36:39 +02:00
Aevann1 e8a6eb4e5d dfdf 2021-09-17 14:22:10 +02:00
Aevann1 1a59f95d5e fdfd 2021-09-17 14:20:07 +02:00
Aevann1 b71e25a7ff fsdsfd 2021-09-17 14:09:05 +02:00
Aevann1 17649026eb Revert "fdfd" 
This reverts commit 3939bc2436.
 2021-09-17 14:07:17 +02:00
Aevann1 3939bc2436 fdfd 2021-09-17 14:04:36 +02:00
Aevann1 2dce325a5a fddf 2021-09-17 13:52:42 +02:00
Aevann1 9f6b5783b0 fdfd 2021-09-17 13:44:09 +02:00
Aevann1 1aa81273d5 sfd 2021-09-17 10:29:05 +02:00
Aevann1 88ca2d6206 fd 2021-09-16 19:02:58 +02:00
Aevann1 4bcd67a107 fd 2021-09-14 19:38:40 +02:00
Aevann1 f778aebf57 fd 2021-09-14 15:40:16 +02:00
Aevann1 35a1eea4ca fd 2021-09-14 15:33:10 +02:00
Aevann1 aac7e56c29 fd 2021-09-14 15:20:41 +02:00
Aevann1 15c727dc20 fd 2021-09-14 06:49:25 +02:00
Aevann1 a4dcd70787 fd 2021-09-14 06:37:44 +02:00
Aevann1 c09614bf1b gf 2021-09-14 06:36:12 +02:00
Aevann1 9241f17021 fd 2021-09-14 00:01:21 +02:00
Aevann1 8aec44b386 fd 2021-09-14 00:00:48 +02:00
Aevann1 14742ec344 fd 2021-09-13 23:43:34 +02:00
Aevann1 c724f5e87c fd 2021-09-13 23:05:00 +02:00
Aevann1 0c97ade24d fd 2021-09-13 23:04:28 +02:00
Aevann1 b75152cc27 fd 2021-09-13 20:28:20 +02:00
Aevann1 50b2f06fc2 fd 2021-09-13 18:36:55 +02:00
Aevann1 c3c6a7bbce fd 2021-09-13 18:36:05 +02:00
Aevann1 4e18f2ead3 re 2021-09-13 17:58:52 +02:00
Aevann1 bc0e608b4f fd 2021-09-13 16:44:28 +02:00
Aevann1 28f1fdaee4 fd 2021-09-13 16:42:34 +02:00
Aevann1 0bca87c7cc fd 2021-09-13 16:42:01 +02:00
Aevann1 721dd29b83 fd 2021-09-13 16:37:46 +02:00
Aevann1 4a7424da4e fd 2021-09-13 16:37:20 +02:00
Aevann1 42cfa91c77 fd 2021-09-13 16:36:58 +02:00
Aevann1 50ccb3db84 fd 2021-09-13 16:36:00 +02:00
Aevann1 49c8869e81 fd 2021-09-13 16:34:37 +02:00
Aevann1 53f2fd466c fd 2021-09-13 16:30:46 +02:00
Aevann1 09312e41a6 fd 2021-09-13 16:29:30 +02:00
Aevann1 47fe4ca887 fd 2021-09-13 16:28:56 +02:00
Aevann1 bfd0d04d9f fg 2021-09-13 16:24:06 +02:00
Aevann1 e92c5db120 fd 2021-09-13 14:06:22 +02:00
fireworks88 fdfe8e54f3 ds 2021-09-12 21:29:36 +02:00
fireworks88 284ee7bd60 nig 2021-09-12 21:20:57 +02:00
fireworks88 fb3b5ea453 club ban 2021-09-12 20:25:59 +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 d9bac39da2 fd 2021-09-12 03:10:46 +02:00
Aevann1 28582f0b33 fd 2021-09-12 03:07:18 +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 c2fd01ff4e fd 2021-09-11 05:49:59 +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
Aevann1 41ea61f4a1 fd 2021-09-09 06:40:06 +02:00
Aevann1 a0d35cda82 fd 2021-09-09 06:39:54 +02:00
Aevann1 6498f3c2b9 fd 2021-09-08 19:58:35 +02:00
Aevann1 b616d8f4ac fd 2021-09-08 12:57:56 +02:00
Aevann1 5e441e94f3 fd 2021-09-08 11:00:44 +02:00
Aevann1 c48e7716a7 gf 2021-09-08 10:37:27 +02:00
Aevann1 a58e49dad1 fd 2021-09-08 05:22:52 +02:00
Aevann1 51c1bc34ed fd 2021-09-08 05:19:52 +02:00
Aevann1 19c3c395b4 fd 2021-09-07 04:41:21 +02:00
Aevann1 cce3235568 fd 2021-09-07 00:40:39 +02:00
Aevann1 d30c290f50 Merge branch 'master' into videos2 2021-09-07 00:03:28 +02:00
fireworks88 cb422ba6ea fd 2021-09-06 22:57:10 +02:00
Aevann1 36f3ce2a5d fd 2021-09-06 19:03:14 +02:00
Aevann1 0261046113 fd 2021-09-06 18:32:06 +02:00
Aevann1 da9b3fefb5 sneed 2021-09-06 18:17:48 +02:00
Aevann1 6917cc3a8f fd 2021-09-05 21:20:32 +02:00
fireworks88 2fc8faae14 ijdjoiefjrje 2021-09-05 21:19:48 +02:00
Aevann1 2b490437fa gf 2021-09-05 19:42:39 +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
atrc445 e4e13996d8 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-09-05 12:01:23 +02:00
atrc445 b099cbe26d :marseyjanny: 2021-09-05 11:49:48 +02:00
Aevann1 d56b3b18da fd 2021-09-05 11:48:13 +02:00
Aevann1 8297d20579 fd 2021-09-04 18:30:39 +02:00
Aevann1 d597ffe198 fd 2021-09-04 02:52:13 +02:00
Aevann1 59c888ceb6 fd 2021-09-04 00:26:18 +02:00
Aevann1 bf26b5b256 fd 2021-09-04 00:21:47 +02:00
Aevann1 6781e782c1 fd 2021-09-03 23:13:32 +02:00
Aevann1 a585c6b903 fdfd 2021-09-03 23:04:15 +02:00
Aevann1 d44d4f7cf1 fdfd 2021-09-03 23:04:04 +02:00
Aevann1 c0279fa97a fd 2021-09-03 22:52:40 +02:00
Aevann1 1904bcf272 dffd 2021-09-03 15:52:37 +02:00
Aevann1 abd53ef4b9 fd 2021-09-02 00:47:13 +02:00
Aevann1 a7ada023c9 fddf 2021-09-01 21:03:05 +02:00
Aevann1 bdd5fa0a99 fdfd 2021-09-01 18:26:02 +02:00
Aevann1 c6f54cd1b4 fdfd 2021-09-01 18:19:23 +02:00
Aevann1 6aef678408 fdfd 2021-09-01 18:18:16 +02:00
Aevann1 78286a4d5e fggf 2021-09-01 18:16:31 +02:00
Aevann1 2023bfc7fc dfdf 2021-09-01 17:51:27 +02:00
Aevann1 1eecd2d47e fddf 2021-09-01 01:09:00 +02:00
Aevann1 37232c4763 fdfd 2021-08-31 23:13:34 +02:00
Aevann1 f7cfaa184e fdfd 2021-08-31 18:32:04 +02:00
Aevann1 f7bb240a64 fdfd 2021-08-31 18:31:48 +02:00
Aevann1 bb54289575 gfgf 2021-08-31 18:26:17 +02:00
Aevann1 a2a20648bd fdfd 2021-08-31 18:25:13 +02:00
Aevann1 e0da13397f fddf 2021-08-31 18:23:34 +02:00
Aevann1 efdc8a0a6f fdfd 2021-08-31 17:56:13 +02:00
Aevann1 511144998a fdfd 2021-08-31 17:54:19 +02:00
Aevann1 8c5310d859 hggh4 2021-08-30 23:19:10 +02:00
Aevann1 ea70b69194 fdfd 2021-08-28 00:10:03 +02:00
Aevann1 aba1bb533c gfgffg 2021-08-27 18:52:57 +02:00
Aevann1 5c16b183f3 fdfd 2021-08-26 23:12:38 +02:00
Aevann1 2d5f2642ba gfgf 2021-08-25 19:50:58 +02:00
Aevann1 33b1b1288b fdfd 2021-08-23 21:10:49 +02:00
Aevann1 70b9d52db7 fdfd 2021-08-23 21:09:32 +02:00
Aevann1 53083395da gfgf 2021-08-23 21:08:34 +02:00
Aevann1 bad68f7dba fdfd 2021-08-23 20:54:57 +02:00
Aevann1 3c85ad185b fdfd 2021-08-23 20:52:56 +02:00
Aevann1 a3f31c2970 fdfd 2021-08-23 20:49:26 +02:00
Aevann1 1244348036 fdfd 2021-08-23 20:49:05 +02:00
Aevann1 00fa071354 fdfd 2021-08-23 20:48:11 +02:00
Aevann1 f21740c956 fdfd 2021-08-23 20:47:08 +02:00
Aevann1 8354cf5765 fdfd 2021-08-23 20:45:28 +02:00
Aevann1 79ebc74d4d fdfd 2021-08-23 20:44:39 +02:00
Aevann1 2d3a9b2e20 ghhg 2021-08-23 20:42:19 +02:00
Aevann1 c752f18095 dffd 2021-08-23 19:53:50 +02:00
fireworks88 a0a14eac79 duwiuishsuehgdz 2021-08-23 13:05:56 +02:00
fireworks88 85bf11e607 uhfewuifurhfiurewhu 2021-08-22 22:11:48 +02:00
fireworks88 83954f5a0e Merge remote-tracking branch 'origin/master' 2021-08-22 22:03:15 +02:00
fireworks88 b813a5caf0 uhfewuifurhfiurewhu 2021-08-22 22:03:01 +02:00
Aevann1 9d50f0f1f2 gfgf 2021-08-22 20:26:19 +02:00
Aevann1 d3354b7572 fdfd 2021-08-22 20:25:50 +02:00
Aevann1 58ead3050a dffd 2021-08-22 19:35:32 +02:00
Aevann1 456131b085 df 2021-08-22 15:15:13 +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 ab2a7d1bac fg 2021-08-21 09:01:02 +02:00
Aevann1 2b295f1c5b sneed 2021-08-20 07:52:52 +02:00
Aevann1 6cb6d54d91 dffd 2021-08-19 21:22:10 +02:00
Aevann1 c72e91427d df 2021-08-19 20:47:22 +02:00
Aevann1 2f49ef4067 fddf 2021-08-19 20:45:27 +02:00
Aevann1 fe1fa7d9e7 sneed 2021-08-19 16:01:48 +02:00
Aevann1 3962678a51 dffd 2021-08-19 15:27:36 +02:00
Aevann1 52d8a9c517 dffd 2021-08-19 07:47:09 +02:00
Aevann1 5e2917a77d dffd 2021-08-19 07:45:22 +02:00
Aevann1 6abda65e2d dfdf 2021-08-19 07:44:11 +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 c6647916d7 fggf 2021-08-17 23:53:19 +02:00
Aevann1 2a4dfb405f ffdfd 2021-08-16 00:37:35 +02:00
atrc445 fc85aab39e fix controversial sorting setting for comments 2021-08-15 21:17:19 +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 4e2bc61d12 fddf 2021-08-13 23:28:06 +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 c09c79705c Merge remote-tracking branch 'origin/master' 2021-08-11 22:20:54 +02:00
fireworks88 0634ef5894 sex 2021-08-11 22:20:37 +02:00
Aevann1 8a75cd07a8 gffgfg 2021-08-11 22:11:55 +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 9eb77d7cd0 gf 2021-08-11 19:28:51 +02:00
Aevann1 187f309ccd Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-11 19:01:25 +02:00
Aevann1 7e76d21ac0 fd 2021-08-11 19:01:19 +02:00
fireworks88 6382a63dfd sex 2021-08-11 17:15:51 +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 c6edcb97eb fd 2021-08-08 20:32:18 +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 b9515ab1c1 gf 2021-08-07 17:53:09 +02:00
Aevann1 d7deaa8a8f fd 2021-08-07 17:50:15 +02:00
Aevann1 cfe90af57d dg 2021-08-07 17:40:42 +02:00
Aevann1 877c8f7ec8 fd 2021-08-07 17:24:24 +02:00
Aevann1 5686f46a4a gfgf 2021-08-07 17:19:53 +02:00
Aevann1 70cdd9a1b9 fd 2021-08-07 13:21:16 +02:00
Aevann1 e925b918f4 fd 2021-08-06 14:57:37 +02:00
Aevann1 baa7ac770d fd 2021-08-06 14:52:15 +02:00
Aevann1 e2fa0ecb76 fd 2021-08-06 14:51:41 +02:00
Aevann1 fc70de6fc0 fd 2021-08-06 14:50:24 +02:00
Aevann1 0071ef71a7 fd 2021-08-06 14:49:41 +02:00
Aevann1 e5f018ff39 fd 2021-08-06 14:47:25 +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 991a72ab42 fd 2021-08-06 14:44:22 +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 bdafb6f01a fdfd 2021-08-04 18:00:57 +02:00
Aevann1 4af2ce2a53 fddf 2021-08-04 17:35:10 +02:00