Commit graph

472 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
95657606bc Merge. 2016-02-29 12:37:04 -06:00
Michael Zhang
9f8e7ee95f Accept invitations. 2016-02-29 12:35:40 -06:00
James Wang
5382e6746c Resolve merge conflict 2016-01-31 10:32:15 -05: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
1956c14721 Add function for removing individual members 2016-01-17 17:44:44 +00: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
f1d476b713 Minor refactor 2016-01-17 02:19:02 +00:00
James Wang
6d0219782b Add function to delete teams 2016-01-17 02:06:02 +00:00
James Wang
f38063a2d5 Add team id to session 2016-01-17 00:58:29 +00: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
James Wang
f5f74540fd Implement email sending 2016-01-16 16:41:16 +00: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
177d4bf4ca Merge pull request #1 from failedxyz/redesign
Redesign
2016-01-06 18:48:04 -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
41ea9b0ed3 delete tokens after logout 2016-01-06 00:35:59 -06:00
Michael Zhang
252ed8ab9b login/register system with tokens 2016-01-06 00:15:57 -06:00
James Wang
8c295b6c13 If file directory doesn't exist, create it 2016-01-06 01:28:19 +00:00
James Wang
500462ec00 Remove unnecessary escapes 2016-01-05 02:20:44 +00:00
James Wang
140733bd33 Update nginx config to include admin problem dashboard 2016-01-04 21:15:10 -05: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
36274227d6 No changes 2016-01-03 14:14:23 -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
fa56204d0e um that never happened 2016-01-03 04:14:20 +00:00
James Wang
a0361a220e Silence tmux kill-session from outputting error 2016-01-03 04:03:55 +00:00
James Wang
3e760af950 Temporarily disable captcha 2016-01-03 04:02:56 +00:00
James Wang
e4392cf94e Implement problem updating for admins 2016-01-02 22:15:23 -05:00