Commit graph

127 commits

Author SHA1 Message Date
Michael Zhang 1b16b3d5e0 Fixed settings page. 2016-03-02 23:42:14 -06:00
Michael Zhang bc7af104c4 avatars and invitation requests done. 2016-03-02 23:36:51 -06:00
Michael Zhang 9f8e7ee95f Accept invitations. 2016-02-29 12:35:40 -06:00
Michael Zhang f99a47cb2c merge 2016-01-26 20:33:35 -06:00
Michael Zhang 9b80a01e10 not sure if this works or not but whatever 2016-01-26 20:30:30 -06:00
James Wang d6564d17ef Update fail callback message 2016-01-21 14:41:55 -05:00
James Wang 3c9121ea05 Properly implement ajax fail callback 2016-01-21 14:36:39 -05:00
Michael Zhang 353b639cbe Merge branch 'master' of github.com:failedxyz/easyctf 2016-01-18 01:15:20 -06:00
Michael Zhang ecb080e358 edited button disabling 2016-01-18 00:41:11 -06:00
James Wang a292f5d73e Properly implement ajax fail callback 2016-01-17 02:39:25 +00:00
Michael Zhang 0a47adb419 merge 2016-01-16 20:24:21 -06:00
Michael Zhang e38ddd1b8c more team changes 2016-01-16 20:23:34 -06:00
James Wang 796fac7f85 Temporarily disable button to prevent multiple submissions 2016-01-17 00:15:37 +00:00
James Wang dcc557fd89 Make use of api_call 2016-01-16 23:13:41 +00:00
James Wang ddfe46e34c Implement password reset 2016-01-16 22:40:12 +00:00
Michael Zhang 8de7c95718 invite members to team 2016-01-16 15:12:32 -06:00
Michael Zhang f6fb0cb00a get team information 2016-01-16 00:53:35 -06:00
Michael Zhang 19a475199a add more logs 2016-01-12 22:41:59 -06:00
Michael Zhang dea6de5cf3 team creation, admin panel, etc. 2016-01-11 21:54:26 -06:00
Michael Zhang b7f4e75350 added CSRF check 2016-01-07 21:25:50 -06:00
Michael Zhang f4a3f4513c admin controller 2016-01-07 02:40:19 -06:00
Michael Zhang d6694d06a5 problems editor 2016-01-07 02:01:18 -06:00
Michael Zhang 6c76f0fc47 public profile page 2016-01-07 00:23:00 -06:00
Michael Zhang 79c823ac5d load javascripts first 2016-01-06 18:47:27 -06:00
Michael Zhang df5d146e08 added profile page 2016-01-06 18:23:43 -06:00
Michael Zhang 80ca1377de dumb typo 2016-01-06 03:08:05 -06:00
Michael Zhang 252ed8ab9b login/register system with tokens 2016-01-06 00:15:57 -06:00
James Wang 500462ec00 Remove unnecessary escapes 2016-01-05 02:20:44 +00:00
James Wang f8e22decc0 Add button to delete problems 2016-01-04 21:12:50 -05:00
James Wang 6e17439289 Move location of base declaration 2016-01-04 20:20:32 -05:00
Thomas b8522340a5 Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2016-01-03 14:15:36 -06:00
Thomas 173429d160 Elaborated rules. No changes to config.py 2016-01-03 14:12:00 -06:00
James Wang 3dc40ea3dc Fix file upload 2016-01-03 19:02:58 +00:00
James Wang 6e6c35a222 Minor fixes to problem updating 2016-01-03 18:12:07 +00:00
James Wang e4392cf94e Implement problem updating for admins 2016-01-02 22:15:23 -05:00
James Wang 9d8e7ea919 Render problems for admin problem view 2016-01-02 20:01:30 -05:00
James Wang 2b34d3e486 Display problem point values 2016-01-02 19:45:45 -05:00
James Wang 499de76caa Display problems from database to problems.html 2016-01-02 19:40:28 -05:00
James Wang 53b4b10947 Redirect user upon successful login/registration 2016-01-02 14:49:52 -05:00
Thomas f85b55e19b Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2016-01-02 13:43:25 -06:00
Thomas d2322480c0 Deleted placeholder map 2016-01-02 13:42:47 -06:00
James Wang 44473e2fe6 Display items in the navbar when appropriate 2016-01-02 14:31:32 -05:00
Thomas 4517ef015c Added in interactive Google Map 2016-01-02 12:57:24 -06:00
Thomas d47f6274d9 Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2016-01-02 12:45:47 -06:00
Thomas 668ebf8456 Started stats/status page 2016-01-02 12:44:51 -06:00
James Wang 9b50731b9b Use "danger" class instead of "warning" for error messages 2016-01-02 13:26:02 -05:00
James Wang 16733cc00a Use better method for displaying messages 2016-01-02 13:20:12 -05:00
Thomas 9b55132e08 Fixed dropdown menu focus color and border 2016-01-02 11:26:36 -06:00
Thomas c38948121a Formatted rules and retype first section 2016-01-02 01:51:57 -06:00
Thomas 7a40fcc1e4 Added new fake problem and hint btn 2016-01-02 00:51:17 -06:00