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

978 Commits (f19f34bc4938b5948d99311f6deef734d60cb3c7)

Author SHA1 Message Date
Aevann1 cbf7405c97 unpin award 2021-10-21 01:37:53 +02:00
Aevann1 2383019663 fsd 2021-10-20 23:06:25 +02:00
Aevann1 a6a39db291 gf 2021-10-20 22:17:10 +02:00
Aevann1 efa408ab2c fd 2021-10-15 16:08:27 +02:00
Aevann1 d6a6faeb61 dfssf 2021-10-13 22:37:23 +02:00
Aevann1 1119094349 dfsfds 2021-10-13 17:21:25 +02:00
Aevann1 bc9c2d6a5f grfd] 2021-10-12 19:31:05 +02:00
Aevann1 9e4604fb35 fdsfds 2021-10-12 07:23:17 +02:00
Aevann1 bb0cf8c6c2 fdsdfs 2021-10-10 06:10:45 +02:00
Aevann1 01b6461c66 dsf 2021-10-10 06:08:18 +02:00
Aevann1 bceee90555 fdsfsd 2021-10-10 06:07:06 +02:00
Aevann1 4e7d14a014 dfsdfs 2021-10-10 06:05:39 +02:00
Aevann1 b0cf28b15c dfsfsd 2021-10-09 09:22:52 +02:00
Aevann1 e69dbd0ed1 gdfsd 2021-10-08 04:14:54 +02:00
Aevann1 28c5502d94 fdsfds 2021-10-08 03:41:25 +02:00
Aevann1 82ff6c45a9 dfsfds 2021-10-08 03:40:47 +02:00
Aevann1 fd2d6def63 fdsfsd 2021-10-08 03:40:09 +02:00
Aevann1 3233424c83 dsffds 2021-10-08 03:38:32 +02:00
Aevann1 74cb7017d4 dsfsdf 2021-10-08 03:37:50 +02:00
Aevann1 b2231a23bb dsfsdf 2021-10-07 23:15:44 +02:00
Aevann1 f09d25fd04 fdsfsd 2021-10-07 08:04:29 +02:00
Aevann1 b849e480e5 dfsfds 2021-10-06 23:43:23 +02:00
Aevann1 d420a9b5b5 fdsfsd 2021-10-06 23:42:20 +02:00
Aevann1 68b5e76f3b df 2021-10-06 23:34:08 +02:00
Aevann1 ecd799e897 dfsfds 2021-10-06 23:33:40 +02:00
Aevann1 17fa47e30c fgg 2021-10-05 17:02:51 +02:00
Aevann1 b51486e751 dsffds 2021-10-04 23:17:35 +02:00
Aevann1 665866ba6b fdsfds 2021-10-04 09:28:05 +02:00
Aevann1 1a21a70e59 dfsfsd 2021-10-03 21:36:29 +02:00
Aevann1 90d15361a7 dsffsd 2021-10-01 08:26:59 +02:00
Aevann1 c469ff387b fds 2021-09-30 22:56:25 +02:00
Aevann1 47a0acab80 hfghf 2021-09-30 21:40:33 +02:00
Aevann1 33a7ebf0dc fsd 2021-09-27 23:46:35 +02:00
Aevann1 8e8af3b60a fds 2021-09-27 02:17:35 +02:00
Aevann1 b9e9e6cf12 fds 2021-09-25 20:29:41 +02:00
Aevann1 ba9ea8ff8c fds 2021-09-25 01:12:44 +02:00
Aevann1 3031cc3280 fds 2021-09-24 20:37:44 +02:00
Aevann1 ff28472c20 sfd 2021-09-24 20:36:24 +02:00
Aevann1 9043d95e7a fsd 2021-09-24 18:18:55 +02:00
Aevann1 c79da04884 fds 2021-09-24 05:15:14 +02:00
Aevann1 cd827b6ce2 fds 2021-09-24 05:07:49 +02:00
Aevann1 b4287b2477 fd 2021-09-23 19:28:30 +02:00
Aevann1 93fa545ffb fd 2021-09-23 19:18:33 +02:00
Aevann1 0206edde5d fsdsf 2021-09-23 01:41:51 +02:00
Aevann1 235e2926b9 fsd 2021-09-23 00:27:09 +02:00
Aevann1 fdb50fc88d sex 2021-09-22 20:36:03 +02:00
Aevann1 3e39c2911f fdsfs 2021-09-22 17:35:20 +02:00
Aevann1 cc2b4ba788 dfdf 2021-09-22 17:33:49 +02:00
Aevann1 6e74bead20 fds 2021-09-22 17:31:33 +02:00
Aevann1 2c6eed250b fds 2021-09-22 17:30:45 +02:00
Aevann1 cf823e0efd fsfs 2021-09-22 17:27:33 +02:00
Aevann1 449f483502 fds 2021-09-22 17:23:57 +02:00
Aevann1 eb69e6fbf8 fsfs 2021-09-21 23:54:44 +02:00
Aevann1 42175df126 fd] 2021-09-21 23:06:48 +02:00
Aevann1 b222005391 fsdfsd 2021-09-21 21:18:16 +02:00
Aevann1 5410dfbea3 dffs 2021-09-20 22:51:49 +02:00
Aevann1 33d9602b84 fsdfsf 2021-09-20 22:50:35 +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 5e716cac7c fsfs 2021-09-19 20:38:24 +02:00
Aevann1 ef5633ebee sdf 2021-09-19 16:27:31 +02:00
Aevann1 731351e5a2 fsddsf 2021-09-19 15:11:34 +02:00
Aevann1 6fb3fd33da fdsf 2021-09-19 15:09:09 +02:00
Aevann1 3397263412 fds 2021-09-19 15:01:28 +02:00
Aevann1 a7afac33d5 gfd 2021-09-19 15:01:16 +02:00
Aevann1 25089d758d fds 2021-09-19 14:59:10 +02:00
Aevann1 833058c2d1 fsfsd 2021-09-18 20:04:05 +02:00
Aevann1 92b587bfea fdfd 2021-09-18 20:00:31 +02:00
Aevann1 ab5b86dd76 fddfs 2021-09-18 19:59:41 +02:00
Aevann1 991f64ff48 fdfd 2021-09-18 19:58:30 +02:00
Aevann1 afb65d8d0f fdsfs 2021-09-18 19:57:59 +02:00
Aevann1 05205ebef8 fsfds 2021-09-18 19:57:25 +02:00
Aevann1 f724a74687 fsfs 2021-09-18 19:43:03 +02:00
fireworks88 2cd538ae87 Merge remote-tracking branch 'origin/master' 2021-09-17 20:49:55 +02:00
Aevann1 c0ba5106d3 fdfd 2021-09-17 17:47:48 +02:00
fireworks88 6fd0d87477 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	files/templates/default.html
 2021-09-17 16:04:02 +02:00
fireworks88 e254488981 sd 2021-09-17 16:02:47 +02:00
Aevann1 c2b1f50099 df 2021-09-17 10:55:55 +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 e5f3613a62 fd' 2021-09-16 13:42:38 +02:00
Aevann1 14742ec344 fd 2021-09-13 23:43:34 +02:00
Aevann1 670fe13697 fd 2021-09-13 23:22:01 +02:00
Aevann1 fddb8d5294 fd 2021-09-13 21:01:07 +02:00
Aevann1 84d428a9ea fd 2021-09-13 20:54:43 +02:00
Aevann1 af365ce88f fd 2021-09-13 20:54:12 +02:00
Aevann1 7d7b2c5304 gf 2021-09-13 20:53:48 +02:00
Aevann1 74789e99f4 fd 2021-09-13 20:52:40 +02:00
Aevann1 a4323121d0 fd 2021-09-13 20:52:09 +02:00
Aevann1 a21d04df25 fd 2021-09-13 20:49:58 +02:00
Aevann1 990f2bd395 fd 2021-09-13 20:49:20 +02:00
Aevann1 4a89c3d14f fd 2021-09-13 20:46:56 +02:00
Aevann1 2992c5f742 fd 2021-09-13 16:56:14 +02:00
Aevann1 c5600f8d21 fd 2021-09-13 16:55:34 +02:00
Aevann1 3e4eaabdc7 fd 2021-09-13 16:53:48 +02:00
Aevann1 d6af7eabd1 fd 2021-09-13 16:53:08 +02:00
Aevann1 df66febb5c fd 2021-09-13 14:59:22 +02:00
Aevann1 b066e685ff fd 2021-09-13 13:45:03 +02:00
fireworks88 fb3b5ea453 club ban 2021-09-12 20:25:59 +02:00
Aevann1 b8fd241843 fd 2021-09-12 13:21:40 +02:00
Aevann1 aa917df15b fd 2021-09-12 08:41:19 +02:00
Aevann1 c56e833f9b gf 2021-09-12 04:59:52 +02:00
Aevann1 b5e446b829 gf 2021-09-12 03:41:48 +02:00
Aevann1 349faf5f04 fd 2021-09-12 03:17:57 +02:00
Aevann1 c2fd01ff4e fd 2021-09-11 05:49:59 +02:00
Aevann1 dfb858cab1 fd 2021-09-11 05:18:46 +02:00
Aevann1 f52cd1c2ac fd 2021-09-10 08:04:28 +02:00
Aevann1 9c030fb1a5 fd 2021-09-10 07:59:07 +02:00
Aevann1 0343566647 fd 2021-09-10 07:46:37 +02:00
Aevann1 e2555e7afd fd 2021-09-10 07:44:08 +02:00
Aevann1 97602933d9 fd 2021-09-10 07:41:56 +02:00
Aevann1 b045fdda36 fd 2021-09-10 07:38:35 +02:00
Aevann1 0ec50061a0 fd 2021-09-10 07:28:09 +02:00
Aevann1 855ee70192 fd 2021-09-10 05:49:47 +02:00
Aevann1 45808ed463 fd 2021-09-10 05:47:14 +02:00
Aevann1 d602e1f622 fd 2021-09-10 05:45:33 +02:00
Aevann1 c99f30c76b fd 2021-09-10 05:45:05 +02:00
Aevann1 d2a85b9ec5 fd 2021-09-10 05:44:43 +02:00
Aevann1 6989780394 fd 2021-09-10 05:44:06 +02:00
Aevann1 134b96e56b fd 2021-09-10 05:42:21 +02:00
Aevann1 55c4b1a0d6 fd 2021-09-10 05:41:27 +02:00
Aevann1 30b423cab4 df 2021-09-10 05:40:04 +02:00
Aevann1 7f6f2d05d3 fd 2021-09-10 05:37:07 +02:00
Aevann1 5381d2b77d fd 2021-09-10 05:36:44 +02:00
Aevann1 5af964cbbf fd 2021-09-10 05:36:10 +02:00
Aevann1 7bc1a5b291 fd 2021-09-10 05:35:00 +02:00
Aevann1 e245c32bc8 fd 2021-09-10 05:34:07 +02:00
Aevann1 33771abfd5 fd 2021-09-10 05:33:36 +02:00
Aevann1 c69502e3d5 fd 2021-09-10 05:32:27 +02:00
Aevann1 4b8021b8b1 fd 2021-09-10 05:25:42 +02:00
Aevann1 5dfdb0cdce fd 2021-09-10 05:11:13 +02:00
Aevann1 e7f9d1d32b fd 2021-09-10 05:03:37 +02:00
fireworks88 2714200ab5 xyz 2021-09-10 00:41:37 +02:00
Aevann1 da8a3593b0 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-09-09 16:13:23 +02:00
Aevann1 77dfd7ccd9 fd 2021-09-09 16:11:44 +02:00
fireworks88 ce1e340f43 dg 2021-09-09 13:02:06 +02:00
Aevann1 edeefc3e34 fd 2021-09-09 06:41:02 +02:00
Aevann1 c144ea7ed2 fd 2021-09-08 23:19:48 +02:00
Aevann1 b616d8f4ac fd 2021-09-08 12:57:56 +02:00
Aevann1 29e99f7ebc fd 2021-09-08 10:53:57 +02:00
Aevann1 6380b2ef9a fd 2021-09-08 09:08:10 +02:00
Aevann1 e3aa8398d5 fd 2021-09-08 09:05:43 +02:00
Aevann1 a0df96c3bf fd 2021-09-08 05:22:13 +02:00
Aevann1 fbfc0d36db fd 2021-09-06 04:59:59 +02:00
Aevann1 b4e4a911f7 Update admin.py 2021-09-06 04:48:53 +02:00
justcool393 9b80392c91 Verification: allow admins to verify users 2021-09-05 19:25:30 -07:00
Aevann1 76a76c8589 fd 2021-09-06 02:51:27 +02:00
Aevann1 333d1bd6da gf 2021-09-05 19:55:36 +02:00
Aevann1 344b65183e fg 2021-09-05 19:48:13 +02:00
Aevann1 9b8f4a4e42 fd 2021-09-05 19:47:15 +02:00
Aevann1 86290cd537 fd 2021-09-05 19:42:36 +02:00
atrc445 b099cbe26d :marseyjanny: 2021-09-05 11:49:48 +02:00
Aevann1 3e7cfac7cb fg 2021-09-03 22:36:25 +02:00
Aevann1 37109d4963 fd 2021-09-03 22:35:09 +02:00
Aevann1 c1aded5090 dfRevert "Revert "fdfd"" 
This reverts commit aab8935270.
 2021-09-03 19:09:42 +02:00
Aevann1 aab8935270 Revert "fdfd" 
This reverts commit 5e89ccb9bc.
 2021-09-03 19:08:15 +02:00
Aevann1 dc9183e7dc fd 2021-09-03 16:02:25 +02:00
Aevann1 6d19231550 fd 2021-09-02 16:06:28 +02:00
Aevann1 4ff21f1a0b fd 2021-09-02 15:36:49 +02:00
Aevann1 32718a5e0b fd 2021-09-02 15:29:47 +02:00
Aevann1 01a51422b8 fd 2021-09-02 15:29:36 +02:00
Aevann1 b677bf6c2e fdfd 2021-08-31 22:08:43 +02:00
Aevann1 0015b395f3 dffd 2021-08-31 22:05:06 +02:00
Aevann1 124863ff3c gfgf 2021-08-31 20:47:26 +02:00
Aevann1 0bef14932c fdfd 2021-08-31 17:25:17 +02:00
Aevann1 a7a03d5b43 dfdf 2021-08-30 23:25:21 +02:00
Aevann1 a3ddaa9c5f dffd 2021-08-30 23:23:42 +02:00
Aevann1 79a5ca3ee3 dfdf 2021-08-30 23:22:55 +02:00
Aevann1 8c5310d859 hggh4 2021-08-30 23:19:10 +02:00
Aevann1 ff36d5d247 fddf 2021-08-30 18:41:38 +02:00
Aevann1 316001993d gf 2021-08-28 14:33:08 +02:00
Aevann1 ad95483303 fdfd 2021-08-27 23:23:18 +02:00
Aevann1 61958b6e16 fdfd 2021-08-27 23:21:51 +02:00
Aevann1 9caa563aa3 fdfd 2021-08-27 23:20:06 +02:00
Aevann1 2c6cbce7c6 fdfd 2021-08-27 23:19:08 +02:00
Aevann1 fdfa5c3eb3 fdfd 2021-08-27 21:38:18 +02:00
Aevann1 f167201c1f fdfd 2021-08-27 21:35:32 +02:00
Aevann1 0af40703f7 fdfd 2021-08-27 21:34:38 +02:00
Aevann1 c4fe5b19a2 gfgf 2021-08-26 15:37:47 +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 c752f18095 dffd 2021-08-23 19:53:50 +02:00
Aevann1 cfeb786008 fdfd 2021-08-23 19:48:55 +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 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 b1df8f0c95 fdfd 2021-08-22 15:18:05 +02:00
Aevann1 11c2480764 fdfd 2021-08-22 15:10:05 +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
atrc445 6a36d3c1b5 create const.py 2021-08-21 13:06:28 +02:00
Aevann1 3962678a51 dffd 2021-08-19 15:27:36 +02:00
Aevann1 73ae27e6c7 fdfd 2021-08-19 08:22:40 +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 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 24e73a59e4 fddfdf 2021-08-13 04:44:05 +02:00
Aevann1 8c7c5ec4c4 dfdfd 2021-08-13 04:43:38 +02:00
Aevann1 9a461bc9a5 fd 2021-08-13 02:07:07 +02:00
Aevann1 fdffecd8c7 fdfd 2021-08-12 00:27:07 +02:00
Aevann1 7001f11be7 fd 2021-08-12 00:26:04 +02:00
Aevann1 9eb77d7cd0 gf 2021-08-11 19:28:51 +02:00
Aevann1 7e76d21ac0 fd 2021-08-11 19:01:19 +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 70cdd9a1b9 fd 2021-08-07 13:21:16 +02:00
Aevann1 89423077ef fdfd 2021-08-05 16:43:54 +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