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

7857 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann1 42a7e022f8 fdfd 2021-08-26 15:43:51 +02:00
Aevann1 c4fe5b19a2 gfgf 2021-08-26 15:37:47 +02:00
Aevann1 fce10b47b1 fddf 2021-08-26 15:33:49 +02:00
Aevann1 3da6c0c197 fdfd 2021-08-26 12:39:44 +02:00
Aevann1 5c5a45b6d5 fdfd 2021-08-26 12:39:18 +02:00
Aevann1 9584e0b8e1 fdfd 2021-08-26 12:38:12 +02:00
Aevann1 063dd443c8 fdfd 2021-08-26 12:35:29 +02:00
Aevann1 a85b2dcb26 fdfd 2021-08-26 12:33:26 +02:00
Aevann1 2d5f2642ba gfgf 2021-08-25 19:50:58 +02:00
Aevann1 6d23f50a6d dffd 2021-08-25 19:43:05 +02:00
Aevann1 c40135b39e fdfd 2021-08-25 19:42:35 +02:00
Aevann1 ecadd159f5 fdfd 2021-08-25 19:41:10 +02:00
Aevann1 6e0fe109d7 fdfd 2021-08-25 19:38:37 +02:00
Aevann1 0a1e55106b fdfd 2021-08-25 19:37:29 +02:00
Aevann1 ae891be10c fdfd 2021-08-25 19:36:41 +02:00
Aevann1 38dd49df59 fdfd 2021-08-25 19:35:24 +02:00
Aevann1 88305f694a fdfd 2021-08-25 19:35:12 +02:00
Aevann1 5207d418cd fdfd 2021-08-25 19:34:47 +02:00
Aevann1 2d25383cf6 fddf 2021-08-25 19:28:57 +02:00
Aevann1 e103c6ae86 fggf 2021-08-25 19:26:37 +02:00
Aevann1 ab75913051 fdfd 2021-08-25 19:23:38 +02:00
Aevann1 25042653e1 fddf 2021-08-25 19:18:38 +02:00
Aevann1 aecba85c98 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-25 19:18:13 +02:00
Aevann1 a9438ef2cd gfgf 2021-08-25 19:18:06 +02:00
fireworks88 3c6d539daf sex 2021-08-25 14:22:20 +02:00
fireworks88 4a4e7f7b94 reports - py 2021-08-25 14:15:53 +02:00
Aevann1 ce54ffee7d fddf 2021-08-24 20:10:08 +02:00
Aevann1 9a3e5debb5 fdfd 2021-08-24 19:56:02 +02:00
Aevann1 38fe0808ec vcvc 2021-08-24 19:49:47 +02:00
Aevann1 79eb562e3e css 2021-08-24 19:45:07 +02:00
Aevann1 f94ff8cb9e fdfd 2021-08-24 06:38:26 +02:00
Aevann1 b0cc46e04e gfgf 2021-08-24 06:37:30 +02:00
Aevann1 2b9b20a20c fddf 2021-08-24 06:32:05 +02:00
Aevann1 c8f9ce90a8 fdfd 2021-08-23 21:23:31 +02:00
Aevann1 e66b63b92f fdfd 2021-08-23 21:16:03 +02:00
Aevann1 9a0159eb50 fdfd 2021-08-23 21:15:42 +02:00
Aevann1 304606ca0b fddf 2021-08-23 21:14:38 +02:00
Aevann1 087d4e0214 dfdf 2021-08-23 21:12:14 +02:00
Aevann1 33b1b1288b fdfd 2021-08-23 21:10:49 +02:00
Aevann1 53083395da gfgf 2021-08-23 21:08:34 +02:00
Aevann1 12b90f1509 dfdf 2021-08-23 21:03:42 +02:00
Aevann1 c752f18095 dffd 2021-08-23 19:53:50 +02:00
Aevann1 dbee54930f Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-23 19:49:02 +02:00
Aevann1 cfeb786008 fdfd 2021-08-23 19:48:55 +02:00
fireworks88 5af7ea5b61 Merge pull request #24 from Aevann1/gold 
add gold award
 2021-08-23 11:48:38 +00:00
fireworks88 7d41cf9ccd duwiuishsuehgdz 2021-08-23 13:16:24 +02:00
Aevann1 7878d397ea sneed 2021-08-23 12:24:20 +02:00
Aevann1 8a3b38c930 fdfd 2021-08-23 12:16:11 +02:00
Aevann1 bbef96bda1 fdfd 2021-08-23 12:14:59 +02:00
Aevann1 50a2674fc3 fdfd 2021-08-23 12:00:05 +02:00
Aevann1 16a655a518 fdfd4 2021-08-22 23:51:40 +02:00
fireworks88 86fa3fb655 duwiuishsuehgdz 2021-08-22 22:37:13 +02:00
Aevann1 097946c8d4 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-22 22:31:18 +02:00
Aevann1 2a2c512639 fdfd 2021-08-22 22:31:12 +02:00
fireworks88 c8b073fb41 duwiuishsuehgdz 2021-08-22 22:27:56 +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 60d4b3a356 fdfd 2021-08-22 21:33:06 +02:00
Aevann1 521e9e38bd fdfd 2021-08-22 21:13:08 +02:00
Aevann1 75850e8c18 fddf 2021-08-22 21:11:43 +02:00
Aevann1 1adc1c3cdb fdfd 2021-08-22 20:43:20 +02:00
Aevann1 7b8711cd21 fdfd 2021-08-22 19:55:18 +02:00
Aevann1 e87cbc0047 fdfd 2021-08-22 19:37:18 +02:00
Aevann1 b6e78a0f4d fdfd 2021-08-22 19:36:34 +02:00
Aevann1 9acf0ead77 fddf 2021-08-22 19:35:45 +02:00
Aevann1 58ead3050a dffd 2021-08-22 19:35:32 +02:00
Aevann1 4d13606613 fddf 2021-08-22 19:32:14 +02:00
Aevann1 a9bcadef61 fddf 2021-08-22 18:57:03 +02:00
Aevann1 cf409d5d3b fgfg 2021-08-22 18:55:55 +02:00
Aevann1 f3524470ac dfdf 2021-08-22 18:54:34 +02:00
Aevann1 7a70cfb31c fdfd 2021-08-22 18:52:43 +02:00
Aevann1 b148e36e7f dfdf 2021-08-22 18:51:39 +02:00
Aevann1 d7bb874315 dfdf 2021-08-22 18:50:59 +02:00
Aevann1 9ced3889fb fdfd 2021-08-22 18:49:41 +02:00
Aevann1 80df0eac20 fgfg 2021-08-22 18:46:52 +02:00
Aevann1 042a49b4e7 dfdf 2021-08-22 18:34:22 +02:00
Aevann1 60500fb140 dffd 2021-08-22 18:33:18 +02:00
Aevann1 fe85a44f12 fdfd 2021-08-22 18:05:30 +02:00
Aevann1 4352b78c4e fdfd 2021-08-22 18:04:54 +02:00
Aevann1 79ae25215e fdfd 2021-08-22 18:04:38 +02:00
Aevann1 a40399bda0 fdfd 2021-08-22 18:02:12 +02:00
Aevann1 c512fb236f dfdf 2021-08-22 17:56:00 +02:00
Aevann1 7ab9e9bbe7 fdfd 2021-08-22 17:50:59 +02:00
Aevann1 7417d74999 dfdf 2021-08-22 17:44:51 +02:00
Aevann1 afc48c03a6 fggf 2021-08-22 17:41:19 +02:00
Aevann1 16077fa457 fggf 2021-08-22 17:36:28 +02:00
Aevann1 f18f6be588 fggf 2021-08-22 17:11:41 +02:00
Aevann1 b1df8f0c95 fdfd 2021-08-22 15:18:05 +02:00
Aevann1 456131b085 df 2021-08-22 15:15:13 +02:00
Aevann1 530a75bb75 dfdf 2021-08-22 15:15:10 +02:00
Aevann1 11c2480764 fdfd 2021-08-22 15:10:05 +02:00
atrc445 a68e85d451 count snappy/autojanny 2021-08-22 13:58:41 +02:00
atrc445 663363b041 sort by comments in the database 2021-08-22 13:33: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
Aevann1 659ae686e2 dffd 2021-08-22 10:00:15 +02:00
Aevann1 87496dd603 Merge pull request #22 from Aevann1/constants 
move often duplicated constants to a new file
 2021-08-22 09:41:59 +02:00
Aevann1 f83203e97e df 2021-08-22 09:29:36 +02:00
atrc445 d3f3c0b6a7 Merge branch 'master' into constants 2021-08-21 23:10:23 +02:00
Aevann1 08b4cd6e03 dffd 2021-08-21 14:57:16 +02:00
Aevann1 a36cc8d982 fdfd 2021-08-21 14:51:19 +02:00
Aevann1 c6d9f236eb df 2021-08-21 14:30:52 +02:00
atrc445 6a36d3c1b5 create const.py 2021-08-21 13:06:28 +02:00
Aevann1 cbd53cecce gf 2021-08-20 07:55:53 +02:00
Aevann1 418e608f52 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-20 07:53:35 +02:00
Aevann1 2b295f1c5b sneed 2021-08-20 07:52:52 +02:00
atrc445 5a2afff7bb fix filtering in notificaitons/userpages 2021-08-19 21:41:59 +02:00
Aevann1 6cb6d54d91 dffd 2021-08-19 21:22:10 +02:00
Aevann1 74f6001f68 fd 2021-08-19 20:32:37 +02:00
Aevann1 ba959f0c92 fd 2021-08-19 18:16:08 +02:00
Aevann1 89187b7454 fddf 2021-08-19 18:13:10 +02:00
Aevann1 62e5388eff fdfd 2021-08-19 18:10:44 +02:00
Aevann1 6d324f27aa ds 2021-08-19 18:09:48 +02:00
Aevann1 3d091db859 fdfd 2021-08-19 17:11:35 +02:00
Aevann1 ed88939e8b fd 2021-08-19 17:07:58 +02:00
Aevann1 e252b0bf85 fd 2021-08-19 17:07:05 +02:00
Aevann1 61b1b047ea fd 2021-08-19 17:06:00 +02:00
Aevann1 a3c81add72 dffd 2021-08-19 17:05:31 +02:00
Aevann1 1ed2f77d2b fdfd 2021-08-19 16:32:24 +02:00
Aevann1 3962678a51 dffd 2021-08-19 15:27:36 +02:00
Aevann1 5172210934 erer 2021-08-19 14:46:22 +02:00
Aevann1 73ae27e6c7 fdfd 2021-08-19 08:22:40 +02:00
Aevann1 f13c4c105c fdfd 2021-08-19 08:14:17 +02:00
Aevann1 ef43ba3c59 fdfd 2021-08-19 07:54:40 +02:00
Aevann1 89b66bc375 fdfd 2021-08-19 07:51:42 +02:00
Aevann1 8298c4522c fdfd 2021-08-19 07:49:50 +02:00
Aevann1 49eaa721ce fddf 2021-08-19 07:48:38 +02:00
Aevann1 5e2917a77d dffd 2021-08-19 07:45:22 +02:00
Aevann1 70157c8c27 dffd 2021-08-19 07:40:23 +02:00
Aevann1 c66e651343 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-19 07:14:55 +02:00
Aevann1 5057c2934e fggf4 2021-08-19 07:14:52 +02:00
dio 8457b34237 Make it so I can send messages again 2021-08-18 13:29:58 -05:00
Aevann1 393c0fe2fe sneed 2021-08-18 19:07:23 +02:00
Aevann1 010e4a4b0b gffg 2021-08-18 19:02:34 +02:00
Aevann1 464e7ef2af fdfd 2021-08-18 17:32:27 +02:00
Aevann1 feba1413e8 fdfd 2021-08-18 02:32:36 +02:00
Aevann1 9af7e60e2c fddf 2021-08-18 02:31:48 +02:00
Aevann1 f71b17bb77 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-08-17 23:47:49 +02:00
Aevann1 bc9e738a43 fd 2021-08-17 23:47:46 +02:00
atrc445 6dc8f457b9 fix titles and flairs 2021-08-17 23:43:49 +02:00
Aevann1 d0613bf316 sneed 2021-08-17 16:51:04 +02:00
Aevann1 e4bde1c5c3 fdfd 2021-08-16 23:20:57 +02:00
Aevann1 af3379e814 sneed 2021-08-16 23:11:06 +02:00
Aevann1 2a4dfb405f ffdfd 2021-08-16 00:37:35 +02:00
Aevann1 48bf361028 css 2021-08-16 00:35:54 +02:00
Aevann1 36ae2eda54 dfdf 2021-08-15 06:18:50 +02:00
Aevann1 f6d7c9e29c fggf 2021-08-15 05:17:45 +02:00
Aevann1 d47550195a sneed 2021-08-15 05:05:10 +02:00
Aevann1 15c6d9344a fddf 2021-08-15 00:45:56 +02:00
Aevann1 bfefc48baf dfdf 2021-08-15 00:09:10 +02:00
Aevann1 51fa1d60f8 fddf 2021-08-14 23:57:48 +02:00
Aevann1 d5986097cb dffd 2021-08-14 23:53:23 +02:00
Aevann1 e020f9e82a dffd 2021-08-14 23:52:18 +02:00
Aevann1 7fa33403b4 fdfd 2021-08-14 23:49:33 +02:00
Aevann1 2978afda56 dfdf 2021-08-14 23:47:12 +02:00
Aevann1 a23bdfc1f6 fdfd 2021-08-14 23:43:26 +02:00
Aevann1 1ce5e63961 dfdf 2021-08-14 23:33:41 +02:00
Aevann1 03fef87088 dfdf 2021-08-14 23:23:07 +02:00
Aevann1 3b8288d605 fdfd 2021-08-13 23:37:22 +02:00
Aevann1 710391455c fdfd 2021-08-13 23:35:21 +02:00
Aevann1 033f5a6e7f fdfd 2021-08-13 23:12:11 +02:00
Aevann1 809c02fae1 fddf 2021-08-13 23:11:55 +02:00
Aevann1 5bbf0cc4c0 fd 2021-08-13 23:05:04 +02:00
Aevann1 2f23ff1db8 sneed 2021-08-13 22:49:34 +02:00
Aevann1 a43d7254ca fdfd 2021-08-13 21:27:21 +02:00
Aevann1 bbb7046a76 fdfd 2021-08-13 20:53:11 +02:00
Aevann1 fcc24bdc92 fdfd 2021-08-13 04:55:52 +02:00
Aevann1 24e73a59e4 fddfdf 2021-08-13 04:44:05 +02:00
Aevann1 8c7c5ec4c4 dfdfd 2021-08-13 04:43:38 +02:00
Aevann1 0c2fcc50b4 fdfd 2021-08-13 04:35:17 +02:00
Aevann1 253b17dbdf fddf 2021-08-13 04:04:26 +02:00
Aevann1 30f2f4c01d dffd 2021-08-13 04:01:54 +02:00
Aevann1 80224309f0 dfdf 2021-08-13 03:55:23 +02:00
Aevann1 abda32d753 fdfddf 2021-08-13 03:38:51 +02:00
Aevann1 6acb07bc92 fddf 2021-08-13 03:29:21 +02:00
Aevann1 472011f8c2 fdfd 2021-08-13 03:26:44 +02:00
Aevann1 9a461bc9a5 fd 2021-08-13 02:07:07 +02:00
Aevann1 5c1e1df91e dfdf 2021-08-13 01:23:33 +02:00
Aevann1 06bbddbdcc fd 2021-08-13 01:19:00 +02:00
Aevann1 fdffecd8c7 fdfd 2021-08-12 00:27:07 +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 cbcc93a0d2 fd 2021-08-11 21:57:29 +02:00
Aevann1 326bc0b0da fdfd 2021-08-11 21:46:57 +02:00
Aevann1 3737b93b0d gf 2021-08-11 20:57:12 +02:00
Aevann1 a41252d23a fd 2021-08-11 20:30:25 +02:00
Aevann1 9eb77d7cd0 gf 2021-08-11 19:28:51 +02:00
Aevann1 04a8ecd81a fd 2021-08-11 19:06:56 +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 0be55f9592 gf 2021-08-11 05:33:09 +02:00
Aevann1 ac8807a9a2 gf 2021-08-11 05:24:13 +02:00
Aevann1 c541359f56 fg 2021-08-11 05:21:02 +02:00
Aevann1 a05440a0f8 gf 2021-08-11 05:12:07 +02:00
Aevann1 78bf11342c fd 2021-08-11 04:54:52 +02:00
fireworks88 6ee0529180 sex 2021-08-09 23:05:17 +02:00
fireworks88 c7ecf65c96 sex 2021-08-09 23:03:36 +02:00
Aevann1 12884146aa fd' 2021-08-09 21:04:19 +02:00
Aevann1 d0e1af0fa7 fd 2021-08-09 20:58:01 +02:00
Aevann1 a76ea8c7a6 fd 2021-08-09 14:21:29 +02:00
Aevann1 44a8e4df9a Merge pull request #10 from Aevann1/dramacoin-transfers 
dramacoin transfers
 2021-08-09 14:18:35 +02:00
not-a-code-cel 3c1bc00ca1 remove erroneous white space 2021-08-08 21:21:37 -07:00
not-a-code-cel a7a83f4a6e Definitely pasted into the wrong function, on user profile pic delete null the highres url 2021-08-08 21:20:36 -07:00
not-a-code-cel bc5f9913f4 Nulls highres profile picture url after profile pic is deleted from the profile. 2021-08-08 21:07:02 -07:00
atrc445 df364f530c reapply dramacoin-transfers on top of master 2021-08-08 20:26:15 +02:00
Aevann1 add068d6d2 fd 2021-08-08 17:16:14 +02:00
Aevann1 65497a4f1b fd 2021-08-08 17:14:53 +02:00
Aevann1 5a29963965 fd 2021-08-08 14:44:54 +02:00
Aevann1 53390f7b2d gf 2021-08-08 01:23:10 +02:00
Aevann1 bde627c206 fd 2021-08-08 01:14:54 +02:00
Aevann1 b4a1fce122 gf 2021-08-08 01:14:32 +02:00
Aevann1 738e4bfdb5 fd 2021-08-08 01:12:35 +02:00
Aevann1 c4154ffa96 fd 2021-08-08 01:11:49 +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 f2606b5095 fd 2021-08-07 23:34:27 +02:00
Aevann1 562eb00b27 fd 2021-08-07 17:34:45 +02:00
Aevann1 912983c007 fg 2021-08-07 17:33:36 +02:00
Aevann1 5686f46a4a gfgf 2021-08-07 17:19:53 +02:00
Aevann1 b5bc60b7d4 sneed 2021-08-07 14:20:00 +02:00
Aevann1 383cbc44ba fd 2021-08-07 13:33:09 +02:00
Aevann1 ccd28d7bc1 fd 2021-08-07 13:30:57 +02:00
Aevann1 be47b3f489 fd 2021-08-07 13:26:11 +02:00
Aevann1 ffb7976547 dfd 2021-08-07 13:25:05 +02:00
Aevann1 b0f3bcf496 fd 2021-08-07 13:23:01 +02:00
Aevann1 70cdd9a1b9 fd 2021-08-07 13:21:16 +02:00
Aevann1 fa3e742a60 fdfd 2021-08-06 22:47:15 +02:00
Aevann1 70783d2ba0 Merge pull request #9 from atrc445/fix-seed-db 
make comments and private messages work without pusher api key
 2021-08-06 21:19:31 +02:00
Aevann1 8a2f4030c8 df 2021-08-06 17:56:45 +02:00
Aevann1 631626f07e fd 2021-08-06 17:36:54 +02:00
Aevann1 6b30d8b1ea fd 2021-08-06 15:14:07 +02:00
Aevann1 e5f018ff39 fd 2021-08-06 14:47:25 +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 a15276268e fd 2021-08-06 14:39:56 +02:00
Aevann1 cba234083b fd 2021-08-06 14:39:24 +02:00
Aevann1 fe16d45145 gtr 2021-08-06 14:39:06 +02:00
Aevann1 1010ed626e gf 2021-08-06 14:37:45 +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 9ebd9ef346 fd 2021-08-06 14:31:20 +02:00
Aevann1 e512b15771 fd 2021-08-06 14:22:29 +02:00
atrc445 62a7ef70ed Merge branch 'master' into fix-seed-db 2021-08-05 21:31:41 +02:00
Aevann1 8e7294be22 fdfd 2021-08-05 19:32:24 +02:00
Aevann1 90c8129128 fdfd 2021-08-05 19:31:44 +02:00
Aevann1 111630dc0b fdfd 2021-08-05 16:58:25 +02:00
Aevann1 28389b0d3f fdfd 2021-08-05 16:44:22 +02:00
Aevann1 89423077ef fdfd 2021-08-05 16:43:54 +02:00
Aevann1 ac42193546 fdfd 2021-08-05 16:42:56 +02:00
Aevann1 933deb10d6 fggfgf 2021-08-05 16:41:32 +02:00
Aevann1 e45bda21b8 fdfd 2021-08-04 18:51:16 +02:00
Aevann1 33a2d3402b fdfd 2021-08-04 18:51:14 +02:00
Aevann1 bdafb6f01a fdfd 2021-08-04 18:00:57 +02:00
Aevann1 4af2ce2a53 fddf 2021-08-04 17:35:10 +02:00