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

16364 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
Aevann1 bc179758b0 fdfd 2021-08-15 05:34:42 +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 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 54ffc1f2a0 dffd 2021-08-15 01:43:31 +02:00
Aevann1 1d601d2080 fddf 2021-08-15 01:40:44 +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 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 3b8288d605 fdfd 2021-08-13 23:37:22 +02:00
Aevann1 710391455c fdfd 2021-08-13 23:35:21 +02:00
Aevann1 4e2bc61d12 fddf 2021-08-13 23:28:06 +02:00
Aevann1 995837625e Merge branch 'master' into headers 2021-08-13 23:25:16 +02:00
Aevann1 033f5a6e7f fdfd 2021-08-13 23:12:11 +02:00
Aevann1 809c02fae1 fddf 2021-08-13 23:11:55 +02:00
atrc445 051b891f57 re-add security-related headers from ruqqus 2021-08-13 23:09:57 +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 8ee054ee42 fddf 2021-08-13 22:05:25 +02:00
Aevann1 be99d37273 dfdf 2021-08-13 21:41:17 +02:00
Aevann1 a43d7254ca fdfd 2021-08-13 21:27:21 +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
atrc445 c8784d64f4 improve(?) caching - vary header should not contain "cookie" for assets 2021-08-13 11:14:38 +02:00
Aevann1 fcc24bdc92 fdfd 2021-08-13 04:55:52 +02:00
Aevann1 c155e282bd fggf 2021-08-13 04:52:37 +02:00
Aevann1 6ed04788b8 fggf 2021-08-13 04:48:33 +02:00
Aevann1 8d6c41b8ca fdfd 2021-08-13 04:46:05 +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 e47278b0c6 fdfd 2021-08-13 04:37:56 +02:00
Aevann1 f779c7400d gfgf 2021-08-13 04:37:04 +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 253b17dbdf fddf 2021-08-13 04:04:26 +02:00
Aevann1 30f2f4c01d dffd 2021-08-13 04:01:54 +02:00
Aevann1 79bbc74c49 fdfd 2021-08-13 03:59:52 +02:00
Aevann1 80224309f0 dfdf 2021-08-13 03:55:23 +02:00
Aevann1 f88be9a205 fdfd 2021-08-13 03:52:01 +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 24e515e7f0 gfgf 2021-08-13 03:16:01 +02:00
Aevann1 6a78d3cfd9 fdfddf 2021-08-13 03:14:35 +02:00
Aevann1 695c4876cc fddf 2021-08-13 03:09:55 +02:00
Aevann1 7b132d36d8 fdfd 2021-08-13 03:09:21 +02:00
Aevann1 e4513683f4 gh 2021-08-13 03:07:12 +02:00
Aevann1 7f4c27aea7 fdfd 2021-08-13 03:07:01 +02:00
Aevann1 aa78c6d8a5 sneed 2021-08-13 02:58:41 +02:00
Aevann1 e54b509031 sneed 2021-08-13 02:58:18 +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 5c1e1df91e dfdf 2021-08-13 01:23:33 +02:00
Aevann1 06bbddbdcc fd 2021-08-13 01:19:00 +02:00
Aevann1 10a8e97d7b gf 2021-08-13 01:13:58 +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 fdffecd8c7 fdfd 2021-08-12 00:27:07 +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 443170f68c fd 2021-08-11 23:15:43 +02:00
Aevann1 169cb9536e fd 2021-08-11 23:15:30 +02:00
Aevann1 f704557d54 fd 2021-08-11 23:08:02 +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 cbcc93a0d2 fd 2021-08-11 21:57:29 +02:00
Aevann1 326bc0b0da fdfd 2021-08-11 21:46:57 +02:00
Aevann1 19a6626760 fd 2021-08-11 21:32:44 +02:00
Aevann1 23461756e3 fd 2021-08-11 21:32:38 +02:00
Aevann1 a7e7a446e0 fggf 2021-08-11 21:31:59 +02:00
Aevann1 d4d90e42ce fd 2021-08-11 21:30:09 +02:00
Aevann1 4fde640e7f fd 2021-08-11 21:28:44 +02:00
Aevann1 05d2dcf992 fggf 2021-08-11 21:26:12 +02:00
Aevann1 8493e4b54c fd 2021-08-11 21:25:28 +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 a41252d23a fd 2021-08-11 20:30:25 +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 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 c1513e20dd gf 2021-08-11 05:07:01 +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
atrc445 fa0e5c3ca4 add dramacoin transfers in the mobile version 2021-08-09 21:50:24 +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 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
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
Aevann1 cc3835851c gf 2021-08-09 00:24:22 +02:00
Aevann1 572ea9c396 gf 2021-08-09 00:16:32 +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 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 1a405997bd fd 2021-08-08 03:09:28 +02:00
Aevann1 f46463a6fa fd 2021-08-08 03:06:35 +02:00
Aevann1 8abfc4a92a fd 2021-08-08 03:05:04 +02:00
Aevann1 3fb2fe0594 fd 2021-08-08 02:43:59 +02:00
Aevann1 3f30ae931f fd 2021-08-08 02:41:32 +02:00
Aevann1 1d0dd47b81 fd 2021-08-08 02:41:17 +02:00
Aevann1 a86def7d59 fd 2021-08-08 02:26:14 +02:00
Aevann1 23a6635928 fd 2021-08-08 02:07:09 +02:00
Aevann1 bb84cab231 fd 2021-08-08 02:01:00 +02:00
Aevann1 f1a5e19838 fd 2021-08-08 02:00:49 +02:00
Aevann1 53390f7b2d gf 2021-08-08 01:23:10 +02:00
Aevann1 b3397930b3 fd 2021-08-08 01:20:05 +02:00
Aevann1 b8b8336e41 fd 2021-08-08 01:19:38 +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 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 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 f2606b5095 fd 2021-08-07 23:34:27 +02:00
Aevann1 b9515ab1c1 gf 2021-08-07 17:53:09 +02:00
Aevann1 8a6b09af80 fd 2021-08-07 17:52:02 +02:00
Aevann1 b7fccbf427 fd 2021-08-07 17:51:41 +02:00
Aevann1 d7deaa8a8f fd 2021-08-07 17:50:15 +02:00
Aevann1 f69395ef8c fd 2021-08-07 17:49:07 +02:00
Aevann1 cfe90af57d dg 2021-08-07 17:40:42 +02:00
Aevann1 562eb00b27 fd 2021-08-07 17:34:45 +02:00
Aevann1 2537d4fb3d fd 2021-08-07 17:33:51 +02:00
Aevann1 912983c007 fg 2021-08-07 17:33:36 +02:00
Aevann1 d5c58fc6a2 gf 2021-08-07 17:29:59 +02:00
Aevann1 651c5d6e94 gf 2021-08-07 17:29:28 +02:00
Aevann1 eb04274f2a gf 2021-08-07 17:25:54 +02:00
Aevann1 877c8f7ec8 fd 2021-08-07 17:24:24 +02:00
Aevann1 fd96ace591 fd 2021-08-07 17:23:10 +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 c7d1c50d71 sneed 2021-08-07 13:11:44 +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 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 58dada2303 fd 2021-08-06 18:50:56 +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 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 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 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
atrc445 62a7ef70ed Merge branch 'master' into fix-seed-db 2021-08-05 21:31:41 +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 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 6a9e7a44d4 fdfd 2021-08-04 20:43:04 +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 b78293130c fdfdfd 2021-08-04 18:21:10 +02:00
Aevann1 bdafb6f01a fdfd 2021-08-04 18:00:57 +02:00
Aevann1 4af2ce2a53 fddf 2021-08-04 17:35:10 +02:00