Commit Graph

661 Commits (56c2638dea4e596c4ce05fbb865aca1c39f7be8f)

Author SHA1 Message Date
Aevann1 46127ab540 fd 2021-09-07 00:12:45 +02:00
Aevann1 9672c6d9d9 fd 2021-09-07 00:12:13 +02:00
Aevann1 d8e9b717e6 fd 2021-09-07 00:11:10 +02:00
Aevann1 d30c290f50 Merge branch 'master' into videos2 2021-09-07 00:03:28 +02:00
Aevann1 d8ac5ff878 df 2021-09-07 00:01:13 +02:00
fireworks88 f4322680c1 fd 2021-09-06 23:29:14 +02:00
fireworks88 2c36cabcb1 fd 2021-09-06 23:25:20 +02:00
fireworks88 bccbdcd507 zgdzu 2021-09-06 23:23:01 +02:00
fireworks88 fc067b3428 zgdzu 2021-09-06 23:20:14 +02:00
fireworks88 b56720b87d fd 2021-09-06 22:57:17 +02:00
fireworks88 464263e1e1 fd 2021-09-06 22:57:03 +02:00
Aevann1 28baa5636d sneed 2021-09-06 19:26:54 +02:00
Aevann1 4acba3e264 gf 2021-09-06 19:03:51 +02:00
Aevann1 c2a4b35bae fd 2021-09-06 19:03:16 +02:00
Aevann1 36f3ce2a5d fd 2021-09-06 19:03:14 +02:00
Aevann1 17ca61ea2d fd 2021-09-06 18:56:58 +02:00
Aevann1 1b171bd350 fd 2021-09-06 18:56:27 +02:00
Aevann1 4ff7804fd1 fd 2021-09-06 18:56:04 +02:00
Aevann1 c0eb0cd145 fd 2021-09-06 18:55:30 +02:00
Aevann1 2b207e0e47 fd 2021-09-06 18:54:07 +02:00
Aevann1 8341b7ec7c gf 2021-09-06 18:53:57 +02:00
Aevann1 efa78b6da1 fd 2021-09-06 18:46:56 +02:00
Aevann1 0261046113 fd 2021-09-06 18:32:06 +02:00
Aevann1 da9b3fefb5 sneed 2021-09-06 18:17:48 +02:00
justcool393 f02da8bf83 Admintools/verification: javasript -> javascript 2021-09-05 20:12:21 -07:00
Aevann1 ef4fca3aa8 fd 2021-09-06 04:57:20 +02:00
Aevann1 eff34eb0d4 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-09-06 04:56:53 +02:00
Aevann1 aa7d6c58f3 gf 2021-09-06 04:56:45 +02:00
Aevann1 6d746d9437 Merge pull request #34 from justcool393/master
Admintools/Verification: allow admins to verify users
2021-09-06 04:49:10 +02:00
justcool393 9b80392c91 Verification: allow admins to verify users 2021-09-05 19:25:30 -07:00
Aevann1 a587de83ab fd 2021-09-06 04:20:39 +02:00
Aevann1 362600c2a1 fd 2021-09-06 04:06:01 +02:00
Aevann1 134753988b sneed 2021-09-06 03:57:42 +02:00
Aevann1 f9b4754a24 gf 2021-09-06 03:24:23 +02:00
Aevann1 3d2d761900 fd 2021-09-06 03:12:44 +02:00
Aevann1 f48beb638c fd 2021-09-06 03:11:31 +02:00
Aevann1 49cc6b6471 fd 2021-09-06 03:10:32 +02:00
Aevann1 4bed90065a gf 2021-09-06 02:51:01 +02:00
Aevann1 bb8bb0ff6c fd 2021-09-06 02:49:27 +02:00
fireworks88 b2634df62e ikdifkrfijigtoeo 2021-09-06 01:07:06 +02:00
Aevann1 b9b3ab3d75 fd 2021-09-06 00:56:19 +02:00
Aevann1 03f69ffcd2 fd 2021-09-06 00:56:11 +02:00
Aevann1 c3a6a646db fd 2021-09-06 00:07:18 +02:00
Aevann1 1615ca0108 fd 2021-09-05 23:36:56 +02:00
Aevann1 8fba079512 df 2021-09-05 22:49:32 +02:00
fireworks88 608cfb579c ikdifkrfijigtoeo 2021-09-05 22:49:16 +02:00
Aevann1 20fe04f8b8 fd 2021-09-05 22:48:57 +02:00
Aevann1 1de7c7bf86 fg 2021-09-05 22:44:07 +02:00
fireworks88 d5fb0c1dab undo 2021-09-05 22:42:56 +02:00
Aevann1 d56830c1b4 fd 2021-09-05 22:40:15 +02:00
fireworks88 bc187810b8 display vids in card view 2 2021-09-05 22:39:43 +02:00
fireworks88 3b0094b6f5 display vids in card view 2021-09-05 22:38:11 +02:00
Aevann1 712767e4ed fd 2021-09-05 22:24:02 +02:00
Aevann1 fce95fc668 df 2021-09-05 22:02:33 +02:00
Aevann1 27ca983331 fd 2021-09-05 21:59:09 +02:00
fireworks88 b503920699 ijd4iuhu 2021-09-05 21:57:50 +02:00
Aevann1 529d75b833 fd 2021-09-05 21:54:12 +02:00
Aevann1 f51f1ae242 fd 2021-09-05 21:50:27 +02:00
Aevann1 7f2120b63f fd 2021-09-05 21:49:37 +02:00
Aevann1 bfd38bfff2 fg 2021-09-05 21:48:48 +02:00
Aevann1 2af6c69661 gf 2021-09-05 21:47:05 +02:00
fireworks88 23bd579f87 load video metadata 2021-09-05 21:30:16 +02:00
fireworks88 cb4572dedb meta 2021-09-05 21:26:33 +02:00
fireworks88 1f4cabf5d3 meta 2021-09-05 21:23:53 +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 6e80814a88 fd 2021-09-05 19:46:38 +02:00
Aevann1 2b490437fa gf 2021-09-05 19:42:39 +02:00
Aevann1 06b8bc294a fd 2021-09-05 19:32:08 +02:00
fireworks88 f3dbe87357 jdiuehfur 2021-09-05 18:53:10 +02:00
Aevann1 5581d35802 fd 2021-09-05 17:12:22 +02:00
Aevann1 6134324e4c fd 2021-09-05 16:59:49 +02:00
Aevann1 f978008579 fd 2021-09-05 16:33:25 +02:00
Aevann1 0bacdf063f fd 2021-09-05 16:29:14 +02:00
Aevann1 6dfa898407 fd 2021-09-05 16:27:32 +02:00
Aevann1 e0ecf71b0a Merge branch 'master' into highlight2 2021-09-05 15:54:57 +02:00
fireworks88 1f5e5b4fd0 highlight 2021-09-05 15:50:33 +02:00
Aevann1 4674b8730c fd 2021-09-05 15:22:22 +02:00
Aevann1 fc69710d1e fd 2021-09-05 15:07:53 +02:00
Aevann1 27cde8de84 df 2021-09-05 15:05:45 +02:00
Aevann1 9e5595a9fc gf 2021-09-05 15:04:57 +02:00
Aevann1 b327658c20 fd 2021-09-05 15:01:17 +02:00
Aevann1 5ffc975c14 fd 2021-09-05 14:22:02 +02:00
Aevann1 0f6ed30444 fd 2021-09-05 14:21:12 +02:00
Aevann1 8239fae5f5 fd 2021-09-05 14:17:34 +02:00
fireworks88 a650ca65a5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	files/classes/submission.py
#	files/routes/posts.py
2021-09-05 14:03:25 +02:00
fireworks88 0f13a8481d ceftrnjgnjetnjie 2021-09-05 14:01:23 +02:00
Aevann1 d77bfe7d03 fd 2021-09-05 13:43:45 +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 2d169789b5 fd 2021-09-05 11:45:53 +02:00
Aevann1 dec61b04e2 fd 2021-09-05 11:40:02 +02:00
Aevann1 62a1814085 fg 2021-09-05 11:38:42 +02:00
Aevann1 e85b8d69d9 fd 2021-09-05 11:37:05 +02:00
Aevann1 0583239c21 df 2021-09-04 23:05:09 +02:00
Aevann1 5064b0c939 df 2021-09-04 23:05:07 +02:00
Aevann1 f9072f95ea df 2021-09-04 23:00:16 +02:00
Aevann1 7168f58398 df 2021-09-04 18:40:20 +02:00
Aevann1 16d79037c8 fdfd 2021-09-04 03:50:31 +02:00
Aevann1 a3664f3c43 fddf 2021-09-04 02:42:44 +02:00
Aevann1 796ede299f fd 2021-09-04 02:41:53 +02:00
Aevann1 8087527b5e fd 2021-09-04 02:41:29 +02:00
Aevann1 dc27ed1d6e fd 2021-09-04 02:40:30 +02:00
Aevann1 dbba52e97e fd 2021-09-04 00:02:26 +02:00
Aevann1 f37b16f7cc fd 2021-09-03 23:28:08 +02:00
Aevann1 65aef03ee1 fddf 2021-09-03 23:27:31 +02:00
Aevann1 c0279fa97a fd 2021-09-03 22:52:40 +02:00
Aevann1 3609c44bb3 fd 2021-09-03 22:31:26 +02:00
Aevann1 49296f7e73 fd 2021-09-03 22:29:29 +02:00
Aevann1 d385a5708f fd 2021-09-03 22:29:10 +02:00
Aevann1 68c53f9fa5 fd 2021-09-03 22:05:04 +02:00
Aevann1 e378c588e7 fd 2021-09-03 21:08:44 +02:00
Aevann1 afb6d2f1fe fd 2021-09-03 21:07:51 +02:00
Aevann1 81dc35c351 fd 2021-09-03 21:02:51 +02:00
Aevann1 ba617b06f8 gf 2021-09-03 21:00:04 +02:00
Aevann1 aebdf5c765 Revert "gfgf"
This reverts commit 0aa8353031.
2021-09-03 19:03:25 +02:00
Aevann1 a22b05a6ce sneed 2021-09-03 18:52:28 +02:00
Aevann1 dfa0d14b98 df 2021-09-03 16:59:44 +02:00
Aevann1 223d64379f fg 2021-09-03 16:53:58 +02:00
Aevann1 0aa8353031 gfgf 2021-09-03 16:35:32 +02:00
Aevann1 5e89ccb9bc fdfd 2021-09-03 16:23:49 +02:00
Aevann1 72ed82df63 df 2021-09-03 16:08:56 +02:00
Aevann1 ef1deafbe3 dffd 2021-09-03 16:08:32 +02:00
Aevann1 8bfdab571e fddf 2021-09-03 03:34:16 +02:00
Aevann1 cd1faa75e9 gf 2021-09-02 23:11:37 +02:00
Aevann1 3d7466fc33 fd 2021-09-02 23:04:10 +02:00
Aevann1 fb2aff1ea8 fd 2021-09-02 23:03:46 +02:00
Aevann1 2dd98abd9b fd 2021-09-02 23:03:18 +02:00
Aevann1 84e89806a3 fg 2021-09-02 23:02:37 +02:00
Aevann1 720f273f9a gf 2021-09-02 23:02:04 +02:00
Aevann1 b2cf24b947 fd 2021-09-02 22:33:48 +02:00
Aevann1 1ff7d02353 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-09-02 21:39:38 +02:00
Aevann1 5a8095cb53 fd 2021-09-02 21:39:31 +02:00
fireworks88 9d50c48409 Update submit.html 2021-09-02 21:37:17 +02:00
Aevann1 18ecd63f9a gf 2021-09-02 21:31:16 +02:00
Aevann1 e31ed9d108 gf 2021-09-02 21:16:15 +02:00
Aevann1 ba4bc7c06d fddf 2021-09-02 21:08:06 +02:00
Aevann1 de0150acc2 fdfd 2021-09-02 21:04:49 +02:00
Aevann1 35922976ff fd 2021-09-02 20:50:00 +02:00
Aevann1 f0a8a30934 fd 2021-09-02 20:47:30 +02:00
Aevann1 8e3584379a fd 2021-09-02 20:30:13 +02:00
Aevann1 ea4b33d9f5 fd 2021-09-02 20:25:36 +02:00
Aevann1 f0609b4299 fg 2021-09-02 20:14:07 +02:00
Aevann1 195442729b gfgf 2021-09-02 20:13:02 +02:00
Aevann1 f9e4a90c18 gf 2021-09-02 20:05:11 +02:00
Aevann1 cf7d93d8d7 gf 2021-09-02 16:17:36 +02:00
Aevann1 430f5ed977 fd 2021-09-02 15:32:20 +02:00
Aevann1 a8b9b1286f gf 2021-09-02 15:16:55 +02:00
Aevann1 27ba15307d fd 2021-09-02 02:20:13 +02:00
Aevann1 57f4747142 fd 2021-09-02 02:19:32 +02:00
Aevann1 f17f4c2e3c fd 2021-09-02 02:07:55 +02:00
Aevann1 fd67a07bc7 fd 2021-09-02 01:36:12 +02:00
Aevann1 871b38fc26 fdfd 2021-09-02 00:36:22 +02:00
Aevann1 eccc9b1ce2 fd 2021-09-01 23:38:12 +02:00
Aevann1 48b7ed8dfb fdfd 2021-09-01 22:46:43 +02:00
Aevann1 802472c553 fdfd 2021-09-01 21:50:51 +02:00
Aevann1 88127d9a8b gf 2021-09-01 21:45:34 +02:00
Aevann1 a7ada023c9 fddf 2021-09-01 21:03:05 +02:00
Aevann1 7e705bf3ed sneed 2021-09-01 20:53:55 +02:00
Aevann1 41cf7f9443 dffd 2021-09-01 19:20:01 +02:00
Aevann1 f2d8468b9c fddf 2021-09-01 19:02:09 +02:00
Aevann1 7402c1c7b2 df 2021-09-01 18:55:23 +02:00
Aevann1 2389405c4c gfgf 2021-09-01 18:37:47 +02:00
Aevann1 8674cadfa3 ds 2021-09-01 18:37:01 +02:00
Aevann1 4d1edbd0e4 fddf 2021-09-01 18:18:49 +02:00
Aevann1 8308fdb016 fdfd 2021-09-01 18:18:43 +02:00
Aevann1 f1461505ff fd 2021-09-01 18:16:38 +02:00
Aevann1 34330aa47d gfgf 2021-09-01 17:59:30 +02:00
Aevann1 938ae0720e dfdf 2021-09-01 17:55:34 +02:00
Aevann1 468b6165ba fdfd 2021-09-01 17:52:56 +02:00
Aevann1 2023bfc7fc dfdf 2021-09-01 17:51:27 +02:00
Aevann1 4d63aa70a5 hggh 2021-09-01 17:01:04 +02:00
Aevann1 f8d31b02ca fdfd 2021-09-01 14:04:51 +02:00
Aevann1 28043b9685 fdfd 2021-09-01 14:01:22 +02:00
Aevann1 1abb657d9b fdfd 2021-09-01 13:59:28 +02:00
Aevann1 173ba830d2 fdfd 2021-09-01 13:57:06 +02:00
Aevann1 f139438ec1 fdfd 2021-09-01 13:52:10 +02:00
Aevann1 8d07b5be0a fddf 2021-09-01 01:35:00 +02:00
Aevann1 fd1ffeff5e gfgf 2021-09-01 01:17:51 +02:00
Aevann1 1eecd2d47e fddf 2021-09-01 01:09:00 +02:00
Aevann1 1964022dc7 fdfd 2021-09-01 00:35:12 +02:00
Aevann1 4f858ab70d fdfd 2021-09-01 00:34:54 +02:00
Aevann1 e29a02bf11 fdfd 2021-08-31 23:56:14 +02:00
Aevann1 f85c0d19ac dffd 2021-08-31 23:30:46 +02:00
Aevann1 246169e709 df 2021-08-31 23:29:26 +02:00
Aevann1 9ee0fca3a7 fdfd 2021-08-31 23:28:52 +02:00
Aevann1 fede4f18c8 fdfd 2021-08-31 23:22:33 +02:00
Aevann1 e2a3ca00aa gffg 2021-08-31 23:20:09 +02:00
Aevann1 2e53e9d680 dfdf 2021-08-31 23:11:15 +02:00
Aevann1 456c01fff2 fdfd 2021-08-31 22:21:15 +02:00
Aevann1 fcf9e1486b fdfd 2021-08-31 22:20:01 +02:00
Aevann1 a9eac65726 fdfd 2021-08-31 22:11:13 +02:00
Aevann1 0f2fecc962 fdfd 2021-08-31 22:09:13 +02:00
Aevann1 e9a6d88a67 gfgf 2021-08-31 22:08:06 +02:00
Aevann1 0015b395f3 dffd 2021-08-31 22:05:06 +02:00
Aevann1 1f63036172 dffd 2021-08-31 21:14:46 +02:00
Aevann1 5762820d3f dfdf 2021-08-31 21:12:52 +02:00
Aevann1 c152f3935e fdfd 2021-08-31 21:10:02 +02:00
Aevann1 124863ff3c gfgf 2021-08-31 20:47:26 +02:00