Commit Graph

75 Commits

Author SHA1 Message Date
Raffu Khondaker
9e50b60b62 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 23:50:22 -04:00
Raffu Khondaker
5dbcd828b0 final push 2020-06-16 23:50:20 -04:00
61861b502b
Merge branch 'master' into development 2020-06-16 23:45:25 -04:00
Raffu Khondaker
51d6ed1175 n 2020-06-16 23:10:59 -04:00
491754ef9e added log 2020-06-16 23:09:15 -04:00
2a99716650 Merge remote-tracking branch 'origin/master' 2020-06-16 22:02:03 -04:00
ed275af4ea Added logs field 2020-06-16 21:57:08 -04:00
3aa22a6542 working 2020-06-16 20:40:45 -04:00
699dd72b24 added ClassCreationForm to teacher view 2020-06-16 19:35:08 -04:00
4123423dab Merge remote-tracking branch 'origin/development' into development 2020-06-16 18:24:38 -04:00
dab0534592 Fixed some fields and started more work on forms 2020-06-16 18:24:16 -04:00
Raffu Khondaker
9fec8ad95d DB requests uupdates 2020-06-16 18:03:07 -04:00
2d58262a8d Started on createAssignment and createClass 2020-06-16 16:28:17 -04:00
65460b7fb1 Added null params to api models so things would work 2020-06-16 13:41:40 -04:00
626d793125 Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development
going to bed?.
2020-06-16 01:15:06 -04:00
b7c23e4800 added teacher support 2020-06-16 01:13:55 -04:00
Raffu Khondaker
d4a08deec7 db fix 2020-06-16 01:08:17 -04:00
37451e7071 Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-16 00:18:11 -04:00
febb089ccf Added profile view and class detail 2020-06-16 00:17:33 -04:00
Raffu Khondaker
f8fff8882b cli 2020-06-16 00:17:10 -04:00
Raffu Khondaker
6079019a9a teacher update 2020-06-15 22:08:23 -04:00
Raffu Khondaker
ecaa0faf39 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-15 20:33:11 -04:00
Raffu Khondaker
aaa750e415 teacher field 2020-06-15 20:31:38 -04:00
f7cac96ee2 fixed student 2020-06-15 19:36:05 -04:00
044a767bab Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-15 19:35:00 -04:00
98ca379991 Updated class model and created class detail view 2020-06-15 19:34:57 -04:00
Raffu Khondaker
51b5b21d40 teachers group 2020-06-15 19:29:23 -04:00
Raffu Khondaker
bdc8792b6c serializere fix 2020-06-15 19:08:58 -04:00
Raffu Khondaker
61200ae579 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-15 18:33:11 -04:00
Raffu Khondaker
06e56352ee cli update 2020-06-15 18:31:18 -04:00
b8c17561a3 Fixed some files that broke over merge 2020-06-15 17:57:47 -04:00
8ae5958bbc Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-15 17:17:24 -04:00
94492b3b7d Changed Teacher/Class models 2020-06-15 17:13:08 -04:00
Raffu Khondaker
2315f4ff48 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-14 23:11:58 -04:00
Raffu Khondaker
faaba48fdf cli start 2020-06-14 23:11:37 -04:00
10e111cd43 Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-14 23:09:08 -04:00
8e6f6ebf25 Basic interface created 2020-06-14 23:08:28 -04:00
Raffu Khondaker
c59890628d authorization 2020-06-14 20:32:48 -04:00
Raffu Khondaker
e699db749b Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-14 17:27:54 -04:00
Raffu Khondaker
44c924002e views update 2020-06-14 17:26:56 -04:00
4ec1fb41d8 Creates Student/Teacher on User creation 2020-06-14 17:21:58 -04:00
13c266dc5f Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-14 14:24:44 -04:00
672cd47852 working on user permissions 2020-06-14 14:23:45 -04:00
Raffu Khondaker
7f3ca84458 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-14 02:42:01 -04:00
Raffu Khondaker
1935fb7d38 api urls 2020-06-14 02:38:05 -04:00
f77452c59d Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-14 02:24:46 -04:00
1e78bbf530 added some messages 2020-06-14 02:22:28 -04:00
Raffu Khondaker
8605cdce24 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-14 01:15:18 -04:00
Raffu Khondaker
714d85689d permissions 2020-06-14 01:15:16 -04:00
743325be52 Registration with tokens working 2020-06-13 23:34:08 -04:00