Commit Graph

313 Commits

Author SHA1 Message Date
Raffu Khondaker
d7c16d9c85 docs update 2020-06-16 22:08:06 -04:00
Raffu Khondaker
468e7426cd block 2020-06-16 22:02:31 -04:00
2a99716650 Merge remote-tracking branch 'origin/master' 2020-06-16 22:02:03 -04:00
Raffu Khondaker
1081963e6f docs 2020-06-16 21:59:54 -04:00
ed275af4ea Added logs field 2020-06-16 21:57:08 -04:00
ee51f3d192
Merge pull request #19 from Rushilwiz/development
Development
2020-06-16 21:49:39 -04:00
Nathaniel Kenschaft
23eafc04b7 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 21:48:58 -04:00
Nathaniel Kenschaft
00820e6d20 formatting test 2020-06-16 21:48:54 -04:00
Raffu Khondaker
4fec26dbaf Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 21:41:49 -04:00
Raffu Khondaker
e28cd56f53 make dir 2020-06-16 21:41:48 -04:00
1c7b91448d Merge remote-tracking branch 'origin/development' into development 2020-06-16 21:37:35 -04:00
2b84dd24f6 commit only to merge 2020-06-16 21:37:21 -04:00
1c173489ed added chromedriver 2020-06-16 21:36:33 -04:00
Nathaniel Kenschaft
2ff0cc1a14 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 21:35:44 -04:00
Nathaniel Kenschaft
325fa5a4c6 added module docstrings 2020-06-16 21:35:27 -04:00
1247159c90 Working on getting bgservice ready 2020-06-16 21:25:05 -04:00
Raffu Khondaker
00409c5cda fix 2020-06-16 21:24:05 -04:00
Nathaniel Kenschaft
e2a2dc0db6 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 21:15:55 -04:00
Nathaniel Kenschaft
c8887e1f65 added one second delay to background service 2020-06-16 21:15:22 -04:00
37b0ca1342 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development
merging
2020-06-16 21:13:53 -04:00
1ebaaa51b5 making bgservice ready 2020-06-16 21:13:41 -04:00
Raffu Khondaker
672ee50f34 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 21:05:36 -04:00
Raffu Khondaker
110cb613b8 chrome-driver 2020-06-16 21:05:34 -04:00
17ffaba4af Merge remote-tracking branch 'origin/development' into development 2020-06-16 20:53:23 -04:00
a1149b1294 removed print for security purposes :) 2020-06-16 20:53:08 -04:00
Raffu Khondaker
a85de65880 removed snew 2020-06-16 20:52:31 -04:00
Raffu Khondaker
1cc8af9815 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 20:52:13 -04:00
Raffu Khondaker
ceeb3cc660 installation instructions 2020-06-16 20:52:12 -04:00
867e76a01c Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 20:42:03 -04:00
3aa22a6542 working 2020-06-16 20:40:45 -04:00
Nathaniel Kenschaft
9bd600a8f0 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development
 Conflicts:
	CLI/teacher.py
2020-06-16 20:22:06 -04:00
Nathaniel Kenschaft
9d02b3dd3b redocumented teacher.py 2020-06-16 20:21:30 -04:00
Raffu Khondaker
087639def2 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 20:18:27 -04:00
Raffu Khondaker
925818c49c finished cli 2020-06-16 20:18:25 -04:00
Nathaniel Kenschaft
65a35b540b fixed skoolos.py documentation and redocumented student.py 2020-06-16 20:08:06 -04:00
Nathaniel Kenschaft
381e9b702f Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 19:55:35 -04:00
Nathaniel Kenschaft
cbe6609816 redocumented skoolos.py 2020-06-16 19:55:24 -04:00
Raffu Khondaker
3663fd1c90 students fix 2020-06-16 19:52:31 -04:00
Raffu Khondaker
92ff41ba60 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 19:46:18 -04:00
Raffu Khondaker
401fbaaee9 student submissions failed 2020-06-16 19:43:26 -04:00
Nathaniel Kenschaft
2a9624e10c Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 19:42:33 -04:00
Nathaniel Kenschaft
1c2a344cce cleaned up code in skoolos.py 2020-06-16 19:40:45 -04:00
699dd72b24 added ClassCreationForm to teacher view 2020-06-16 19:35:08 -04:00
Nathaniel Kenschaft
11c0c03bae Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development
 Conflicts:
	CLI/student.py
	CLI/teacher.py
	skoolos.py
2020-06-16 19:24:45 -04:00
Nathaniel Kenschaft
d4be5f9eb8 formatting 2020-06-16 19:12:34 -04:00
Nathaniel Kenschaft
1910502161 manually fixed skoolos.py 2020-06-16 19:12:12 -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
d05fcdcca2 forcedd login in skoolos.py 2020-06-16 18:23:53 -04:00
Raffu Khondaker
9fefe43da6 unique auth login 2020-06-16 18:15:32 -04:00