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

9565 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
fireworks88 bf9f7896a7 Revert "try this" 
This reverts commit 6bbc0867
 2021-08-23 14:16:26 +02:00
fireworks88 7cc66c35f0 try this 2021-08-23 14:08:01 +02:00
fireworks88 7377683c7b try this 2021-08-23 14:00:07 +02:00
fireworks88 5af7ea5b61 Merge pull request #24 from Aevann1/gold 
add gold award
 2021-08-23 11:48:38 +00:00
fireworks88 88a2e02349 duwiuishsuehgdz 2021-08-23 13:26:11 +02:00
fireworks88 f20c878312 duwiuishsuehgdz 2021-08-23 13:23:29 +02:00
fireworks88 5f411542cb duwiuishsuehgdz 2021-08-23 13:15:28 +02:00
fireworks88 0ca9bd0bc8 duwiuishsuehgdz 2021-08-23 13:13:16 +02:00
fireworks88 22383ebb40 duwiuishsuehgdz 2021-08-23 13:11:55 +02:00
fireworks88 f0366a8da1 duwiuishsuehgdz 2021-08-23 13:11:03 +02:00
fireworks88 36f76dd64f duwiuishsuehgdz 2021-08-23 13:08:37 +02:00
fireworks88 a0a14eac79 duwiuishsuehgdz 2021-08-23 13:05:56 +02:00
Aevann1 b46ce78eac fdfd 2021-08-23 13:02:20 +02:00
fireworks88 0e4c65912b duwiuishsuehgdz 2021-08-23 12:59:18 +02:00
fireworks88 6131ea420b duwiuishsuehgdz 2021-08-23 12:58:43 +02:00
fireworks88 45673973c0 duwiuishsuehgdz 2021-08-23 12:55:57 +02:00
fireworks88 d653ffb632 duwiuishsuehgdz 2021-08-23 12:54:28 +02:00
Aevann1 7878d397ea sneed 2021-08-23 12:24:20 +02:00
Aevann1 321235243c fdfd 2021-08-23 12:22:52 +02:00
fireworks88 c2a073d111 duwiuishsuehgdz 2021-08-23 11:45:48 +02:00
fireworks88 8de41291ab duwiuishsuehgdz 2021-08-23 11:43:36 +02:00
fireworks88 f32c14e28e duwiuishsuehgdz 2021-08-23 11:40:48 +02:00
fireworks88 18eb430349 duwiuishsuehgdz 2021-08-23 11:38:56 +02:00
fireworks88 ecd5b2afbb duwiuishsuehgdz 2021-08-22 22:46:16 +02:00
fireworks88 9a70aad3ee duwiuishsuehgdz 2021-08-22 22:39:16 +02:00
fireworks88 545bab6398 duwiuishsuehgdz 2021-08-22 22:36:42 +02:00
fireworks88 501ba02bfb duwiuishsuehgdz 2021-08-22 22:25:46 +02:00
fireworks88 0783437e91 duwiuishsuehgdz 2021-08-22 22:24:59 +02:00
fireworks88 5c6d7671d8 duwiuishsuehgdz 2021-08-22 22:23:20 +02:00
fireworks88 cd3922aa92 penis 2021-08-22 22:18:31 +02:00
Aevann1 609cbca802 fddf 2021-08-22 20:38:01 +02:00
Aevann1 58de375da7 fdfd 2021-08-22 20:17:06 +02:00
Aevann1 e226cc9430 gfgf 2021-08-22 20:16:11 +02:00
Aevann1 61191408b2 fdfd 2021-08-22 20:03:16 +02:00
Aevann1 7b8711cd21 fdfd 2021-08-22 19:55:18 +02:00
Aevann1 7a356f2c3e gfgf 2021-08-22 19:51:09 +02:00
Aevann1 8aee250116 fdfd 2021-08-22 19:00:07 +02:00
Aevann1 b2c7a14bd9 css 2021-08-22 19:00:04 +02:00
Aevann1 80df0eac20 fgfg 2021-08-22 18:46:52 +02:00
Aevann1 60500fb140 dffd 2021-08-22 18:33:18 +02:00
Aevann1 126958dd89 dffd 2021-08-22 18:14:19 +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 646164584a df 2021-08-22 17:43:17 +02:00
Aevann1 afc48c03a6 fggf 2021-08-22 17:41:19 +02:00
Aevann1 93502b7eff sneed 2021-08-22 16:12:10 +02:00
Aevann1 7c80139e02 dfdf 2021-08-22 15:47:28 +02:00
Aevann1 a9bbc080d0 fdfd 2021-08-22 15:44:55 +02:00
Aevann1 35b11d96b7 emoji-tab-search 2021-08-22 15:40:46 +02:00
Aevann1 6c0ca4b5aa dfdf 2021-08-22 15:36:15 +02:00
Aevann1 62c34bd35d dfdf 2021-08-22 15:28:32 +02:00
Aevann1 c80fd988b2 fdfd 2021-08-22 15:21:10 +02:00
Aevann1 659ae686e2 dffd 2021-08-22 10:00:15 +02:00
atrc445 d3f3c0b6a7 Merge branch 'master' into constants 2021-08-21 23:10:23 +02:00
Aevann1 fc9fb22f78 dffd 2021-08-21 20:00:19 +02:00
Aevann1 5d5df151c1 fdfd 2021-08-21 19:58:25 +02:00
Aevann1 26f4024b83 dffd 2021-08-21 19:56:19 +02:00
Aevann1 694a30f733 fdfd 2021-08-21 19:48:25 +02:00
Aevann1 5fc810e49a fdfd 2021-08-21 18:07:07 +02:00
Aevann1 27b5fe2b30 يبيب 2021-08-21 17:33:01 +02:00
Aevann1 e825c3555d ddfdf 2021-08-21 17:17:49 +02:00
Aevann1 2610a6eef3 force push 2021-08-21 17:08:34 +02:00
Aevann1 08b4cd6e03 dffd 2021-08-21 14:57:16 +02:00
Aevann1 fb43a6b358 fdfd 2021-08-21 14:46:08 +02:00
Aevann1 8fcb223e53 dffd 2021-08-21 14:44:02 +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 9affe9ced1 fdfd 2021-08-21 09:08:46 +02:00
Aevann1 b7e0bfb658 dffd 2021-08-21 09:02:11 +02:00
atrc445 ac6006468b fix(?) flies 2021-08-20 20:47:07 +02:00
Aevann1 1cc515f452 sneed 2021-08-20 09:47:36 +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 d9a13118da fdfd 2021-08-19 20:54:51 +02:00
Aevann1 2f49ef4067 fddf 2021-08-19 20:45:27 +02:00
Aevann1 27d23b9a83 fdfd 2021-08-19 20:36:46 +02:00
Aevann1 90b371ab21 fd 2021-08-19 17:41:49 +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 0ac582f39e fddf 2021-08-19 16:24:33 +02:00
Aevann1 7afce8c31b sneed 2021-08-19 16:24:16 +02:00
Aevann1 e201186312 sneed 2021-08-19 16:22:47 +02:00
Aevann1 ef43ba3c59 fdfd 2021-08-19 07:54:40 +02:00
Aevann1 6abda65e2d dfdf 2021-08-19 07:44:11 +02:00
Aevann1 c7906a8ccd dfdf 2021-08-19 07:34:39 +02:00
Aevann1 3b7909c306 dfdf 2021-08-19 07:23:43 +02:00
Aevann1 1459437c19 dssd 2021-08-19 07:20:48 +02:00
Aevann1 5057c2934e fggf4 2021-08-19 07:14:52 +02:00
Aevann1 0c13145c07 dffdsss 2021-08-18 17:32:55 +02:00
Aevann1 464e7ef2af fdfd 2021-08-18 17:32:27 +02:00
Aevann1 d0613bf316 sneed 2021-08-17 16:51:04 +02:00
Aevann1 9d13d8f591 dfdf 2021-08-15 07:04:36 +02:00
Aevann1 b28121ede1 fdfd 2021-08-15 07:03:34 +02:00
Aevann1 a2ffdb6026 df 2021-08-15 07:02:10 +02:00
Aevann1 f5fbe8634c sneed 2021-08-15 06:58:54 +02:00
Aevann1 cd8e921c6c sneed 2021-08-15 06:55:56 +02:00
Aevann1 6d9f627330 dfdf 2021-08-15 06:22:01 +02:00
Aevann1 351efa529b df 2021-08-15 06:20:47 +02:00
Aevann1 c9681ff0f8 sneed 2021-08-15 06:16:59 +02:00
Aevann1 d415a3b180 sneed 2021-08-15 06:10:31 +02:00
Aevann1 5bb58f4e4a sneed 2021-08-15 05:57:35 +02:00
Aevann1 b7b6b5f8f4 sneed 2021-08-15 05:50:11 +02:00
Aevann1 b4526576fc sneed 2021-08-15 05:47:46 +02:00
Aevann1 fd912c3b2b sneed 2021-08-15 05:45:27 +02:00
Aevann1 a84a621ede sneed 2021-08-15 05:45:10 +02:00
Aevann1 533ab5c016 fddf 2021-08-15 05:40:54 +02:00
Aevann1 bc179758b0 fdfd 2021-08-15 05:34:42 +02:00
Aevann1 dd479e9b77 sneed 2021-08-15 03:43:22 +02:00
Aevann1 82a9d81414 sneed 2021-08-15 03:14:27 +02:00
Aevann1 024da0b1ec fgfg 2021-08-15 03:03:29 +02:00
Aevann1 883bf68c32 fddf 2021-08-15 02:55:59 +02:00
Aevann1 123f496ef6 fddf 2021-08-15 02:51:13 +02:00
Aevann1 173a855c58 fdfd 2021-08-15 01:57:46 +02:00
Aevann1 305bcbb8c6 fdfd 2021-08-15 01:56:55 +02:00
Aevann1 cb1965f753 fddf 2021-08-15 01:56:14 +02:00
Aevann1 367c0d4028 fddf 2021-08-15 01:54:48 +02:00
Aevann1 49754bc5bb fdfd 2021-08-15 01:50:05 +02:00
Aevann1 bfefc48baf dfdf 2021-08-15 00:09:10 +02:00
Aevann1 03fef87088 dfdf 2021-08-14 23:23:07 +02:00
Aevann1 e72343373d dfdf 2021-08-14 04:52:32 +02:00
Aevann1 ae2ecacb37 cvvc 2021-08-14 04:30:43 +02:00
Aevann1 7801cb81a0 fdfd 2021-08-14 04:29:17 +02:00
Aevann1 435b7e894e fddf 2021-08-14 02:57:10 +02:00
Aevann1 6428177f56 dfdf 2021-08-14 00:05:13 +02:00
Aevann1 d05f616077 reer 2021-08-14 00:01:26 +02:00
Aevann1 94e1f89579 fdfd 2021-08-13 23:38:44 +02:00
Aevann1 2f23ff1db8 sneed 2021-08-13 22:49:34 +02:00
Aevann1 68d9fa2dec fdfd 2021-08-13 20:57:32 +02:00
Aevann1 507b742b97 fddf 2021-08-13 20:55:59 +02:00
Aevann1 bbb7046a76 fdfd 2021-08-13 20:53:11 +02:00
Aevann1 c155e282bd fggf 2021-08-13 04:52:37 +02:00
Aevann1 045b13fac4 fddf 2021-08-13 04:35:28 +02:00
Aevann1 0c2fcc50b4 fdfd 2021-08-13 04:35:17 +02:00
Aevann1 d323a1279f fdfd 2021-08-13 04:08:47 +02:00
Aevann1 79bbc74c49 fdfd 2021-08-13 03:59:52 +02:00
Aevann1 f88be9a205 fdfd 2021-08-13 03:52:01 +02:00
Aevann1 d7a15935f6 sneed 2021-08-13 02:41:24 +02:00
Aevann1 40a47419bb fddf 2021-08-13 02:14:04 +02:00
Aevann1 9a461bc9a5 fd 2021-08-13 02:07:07 +02:00
Aevann1 1540ea41bd fdfd 2021-08-13 01:11:23 +02:00
Aevann1 6ca8cea56e fd 2021-08-12 03:17:45 +02:00
Aevann1 9445e2114e fdfd 2021-08-12 00:30:34 +02:00
Aevann1 b71d59b5d3 fdfd 2021-08-12 00:28:11 +02:00
Aevann1 7001f11be7 fd 2021-08-12 00:26:04 +02:00
Aevann1 8b08c65d37 fdfd 2021-08-11 23:57:06 +02:00
Aevann1 3042fe18df df 2021-08-11 23:23:14 +02:00
Aevann1 a55ae20f9a fd 2021-08-11 23:20:01 +02:00
Aevann1 1f1e5f3861 Merge branches 'master' and 'master' of https://github.com/Aevann1/Drama 2021-08-11 22:25:11 +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 b35fac09d8 fdfd 2021-08-11 22:20:33 +02:00
Aevann1 0af512769c fggf 2021-08-11 22:20:15 +02:00
Aevann1 8a75cd07a8 gffgfg 2021-08-11 22:11:55 +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 d0cc249ab1 fd 2021-08-11 20:27:04 +02:00
Aevann1 6ca13b239f fd 2021-08-11 20:22:44 +02:00
Aevann1 c18733ae53 fd 2021-08-11 20:22:22 +02:00
Aevann1 f316443d3c gf 2021-08-11 20:21:06 +02:00
Aevann1 e05c17a51f fg 2021-08-11 20:08:14 +02:00
Aevann1 8804012d2f fdfd 2021-08-11 20:02:52 +02:00
Aevann1 0ead17b443 fd 2021-08-11 19:50:29 +02:00
Aevann1 226eb975be fd 2021-08-11 19:42:21 +02:00
Aevann1 3efe108f6a fd 2021-08-11 19:41:28 +02:00
Aevann1 faedbf7d00 fgfg 2021-08-11 19:36:03 +02:00
Aevann1 39684c7835 gh 2021-08-11 19:32:47 +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 c1513e20dd gf 2021-08-11 05:07:01 +02:00
Aevann1 78bf11342c fd 2021-08-11 04:54:52 +02:00
atrc445 fa0e5c3ca4 add dramacoin transfers in the mobile version 2021-08-09 21:50:24 +02:00
Aevann1 9b8c076b32 sneed 2021-08-09 20:36:39 +02:00
Aevann1 ebbe04a622 gf 2021-08-09 18:58:57 +02:00
Aevann1 3b024c5688 fd 2021-08-09 18:29:28 +02:00
Aevann1 dfdb20e751 fd 2021-08-09 18:28:54 +02:00
Aevann1 ab12f0afd1 sneed 2021-08-09 18:18:55 +02:00
Aevann1 f294dc4539 fd 2021-08-09 15:31:07 +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
Aevann1 dd864b2f7f fd 2021-08-08 23:17:48 +02:00
Aevann1 5bf8f6f6a6 gf 2021-08-08 23:13:52 +02:00
Aevann1 676ecbef29 fd 2021-08-08 22:56:16 +02:00
Aevann1 cbf1d028ca fd 2021-08-08 22:55:27 +02:00
Aevann1 5ca2d2f5e2 fd 2021-08-08 21:02:28 +02:00
Aevann1 5b93da6805 fd 2021-08-08 20:59:13 +02:00
Aevann1 db60bb4ae0 fd 2021-08-08 20:55:38 +02:00
Aevann1 79398bb22d fd 2021-08-08 20:54:34 +02:00
Aevann1 f56be1f400 fd 2021-08-08 20:46:27 +02:00
Aevann1 c6edcb97eb fd 2021-08-08 20:32:18 +02:00
atrc445 df364f530c reapply dramacoin-transfers on top of master 2021-08-08 20:26:15 +02:00
Aevann1 c4154ffa96 fd 2021-08-08 01:11:49 +02:00
Aevann1 50976dcc5f fd 2021-08-08 01:05:57 +02:00
Aevann1 2f81782a4c fd 2021-08-08 01:05:24 +02:00
Aevann1 8019449106 fd 2021-08-08 01:05:01 +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 cfe90af57d dg 2021-08-07 17:40:42 +02:00
Aevann1 c7d1c50d71 sneed 2021-08-07 13:11:44 +02:00
Aevann1 5a0c22108d d-flex flex-row flex-nowrap justify-content-between 2021-08-06 19:59:52 +02:00
Aevann1 34b1d70a86 gf 2021-08-06 19:56:42 +02:00
Aevann1 b981888f90 gf 2021-08-06 14:44:24 +02:00
Aevann1 c8a1bcf2d9 fd 2021-08-05 20:31:20 +02:00
Aevann1 67dba4b1ad ffd 2021-08-05 19:36:10 +02:00
Aevann1 b9dd802e95 fd 2021-08-05 19:35:38 +02:00
Aevann1 a3c7d09782 css 2021-08-05 19:34:52 +02:00
Aevann1 fb27861b4b fdfd 2021-08-05 19:33:12 +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 89423077ef fdfd 2021-08-05 16:43:54 +02:00
Aevann1 b78293130c fdfdfd 2021-08-04 18:21:10 +02:00
Aevann1 4af2ce2a53 fddf 2021-08-04 17:35:10 +02:00