Commit Graph

293 Commits (79585c2d0e05e9a6e0096e392e84e7538b7ea6db)

Author SHA1 Message Date
James Sigurðarson 79585c2d0e zzzz 2016-07-13 13:34:22 +00:00
Glitch dce407c736 Started worknig on forgot password 2016-07-13 10:08:46 +00:00
Glitch 92eb3e811e working on forgotten pw 2016-07-13 00:24:53 +00:00
Glitch f1f54ccd53 Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 23:04:29 +00:00
Glitch f57d515203 fixed login styles 2016-07-12 23:04:19 +00:00
James Sigurðarson b84664c2bf fixed the nav 2016-07-12 22:45:43 +00:00
James Sigurðarson a9237f3610 passwords 2016-07-12 22:43:32 +00:00
James Sigurðarson 6cf223ae32 random team names 2016-07-12 21:30:17 +00:00
James Sigurðarson 1fbd191e63 team key 2016-07-12 21:28:23 +00:00
James Sigurðarson 16ddcce21e whoops 2016-07-12 21:26:50 +00:00
James Sigurðarson 09bfb88ff9 updated user generation 2016-07-12 21:26:19 +00:00
heidark 9700d156e7 looook mom, I did a thingy 2016-07-12 21:01:45 +00:00
Glitch 8533ad215b Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 20:53:39 +00:00
Glitch ce96bb6c12 made affiliation optional 2016-07-12 20:53:28 +00:00
James Sigurðarson 7d4d14f4da Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 20:06:36 +00:00
Glitch d6ce62b439 Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 20:04:54 +00:00
Glitch 84d0512939 Changed user model 2016-07-12 20:02:51 +00:00
James Sigurðarson b8397b4e51 fixed user logging 2016-07-12 20:01:54 +00:00
James Sigurðarson 34528ae9a1 fixed eligibility and user form 2016-07-12 19:26:19 +00:00
James Sigurðarson 632f1b2bd5 moved js validation 2016-07-12 19:17:24 +00:00
Glitch 39a5dedacf Changed confirmation to a link 2016-07-12 18:59:37 +00:00
Glitch 75a5db40d6 Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 18:37:36 +00:00
Glitch 507ea9dd13 Fixed a bunch of styles 2016-07-12 18:37:25 +00:00
James Sigurðarson 498070b09b damnit man 2016-07-12 18:25:17 +00:00
Glitch 754f07be1b Fixed registration, tshirt and gender are now optional 2016-07-12 18:09:45 +00:00
Glitch 7e9a6dc2b9 fixed login 2016-07-12 17:58:28 +00:00
Glitch cac1aa4868 Prize info now hides if you're not icelandic 2016-07-12 17:44:57 +00:00
Glitch 4c5f4cabf4 Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 16:41:23 +00:00
Glitch bf41b4e53a Redesign 2016-07-12 16:41:16 +00:00
Glitch bdfd778e63 Rewrote login system (may ruin everything) 2016-07-12 16:40:48 +00:00
James Sigurðarson 51330100d7 put captcha and email confirmation back 2016-07-12 15:30:36 +00:00
James Sigurðarson d8ce453476 added database error checking 2016-07-12 15:27:39 +00:00
James Sigurðarson 393330a0ed Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 14:25:22 +00:00
James Sigurðarson f0f82f2d5e added edit user and team pages 2016-07-12 14:24:19 +00:00
Glitch f48c8da06c Rewrote login system (may ruin everything) 2016-07-12 13:14:52 +00:00
Glitch c11a434e67 Rewrote login system (may ruin everything) 2016-07-12 13:14:17 +00:00
Glitch ac843e39c4 Rewrote login system (may ruin everything) 2016-07-12 13:13:23 +00:00
Glitch 213b4ce3db Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 13:09:31 +00:00
Glitch 77bf0f6751 changed panel background 2016-07-12 13:09:16 +00:00
James Sigurðarson 675e022e4b separated team and user dashboards 2016-07-12 12:03:04 +00:00
James Sigurðarson b99095338c added toggle 2016-07-12 11:13:02 +00:00
James Sigurðarson 9d9ee188b2 fixed label 2016-07-12 11:10:36 +00:00
James Sigurðarson 8061aa685a fixed registration 2016-07-12 10:42:09 +00:00
James Sigurðarson 7bb72a965d fixed email 2016-07-12 09:28:14 +00:00
James Sigurðarson f7c06d62cc Merge branch 'master' of github.com:IceCTF/new-platform 2016-07-12 09:23:57 +00:00
James Sigurðarson 076a9bd91b added some shit 2016-07-12 09:23:50 +00:00
Glitch a424031ad9 Registration works now 2016-07-11 23:57:43 +00:00
Glitch 8808f80c27 Rewrote login system (may ruin everything) 2016-07-11 22:32:44 +00:00
Glitch 3527c4a35e Rewrote login system (may ruin everything) 2016-07-11 22:30:04 +00:00
Glitch 1b9aa95618 Rewrote login system (may ruin everything) 2016-07-11 22:27:53 +00:00