Commit Graph

177 Commits

Author SHA1 Message Date
Raffu Khondaker
de80c69a85 remove index.html 2020-06-16 14:03:56 -04:00
Raffu Khondaker
15f50b7519 deleted commands.py 2020-06-16 13:55:27 -04:00
Raffu Khondaker
afea2c1494 Merge branch 'master' of https://github.com/Rushilwiz/SkoolOS 2020-06-16 13:54:55 -04:00
Raffu Khondaker
4b60133e82 removed extra files in cli 2020-06-16 13:54:42 -04:00
a1537106db
Merge pull request #13 from Rushilwiz/development
Development
2020-06-16 13:46:49 -04:00
Nathaniel Kenschaft
2de86475e7 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 13:44:24 -04:00
Nathaniel Kenschaft
c692fccd9f began documentation 2020-06-16 13:43:13 -04:00
65460b7fb1 Added null params to api models so things would work 2020-06-16 13:41:40 -04:00
Raffu Khondaker
f222636425 Merge branch 'master' of https://github.com/Rushilwiz/SkoolOS 2020-06-16 12:30:51 -04:00
Raffu Khondaker
673a17ffe4 completed teachher.py 2020-06-16 12:30:49 -04:00
f11078236e
Merge pull request #12 from Rushilwiz/development
Development
2020-06-16 12:06:21 -04:00
dc4a24cfa4 Merge branch 'development' of https://github.com/rushilwiz/SkoolOS into development
merges #
2020-06-16 11:57:04 -04:00
649c3384cb created initial files for docs 2020-06-16 11:57:00 -04:00
Nathaniel Kenschaft
4143c8e8c5 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 11:35:14 -04:00
Nathaniel Kenschaft
0b71a4de6a fixed git history 2020-06-16 11:35:04 -04:00
4c74b26f5e
Merge pull request #11 from Rushilwiz/development
remade sphinx w/ source and build seperate
2020-06-16 11:23:57 -04:00
d7a6b96dc8 remade sphinx w/ source and build seperate 2020-06-16 11:22:54 -04:00
aa9aa881c3
Merge pull request #10 from Rushilwiz/development
removed theme in conf
2020-06-16 11:16:36 -04:00
693fc5ee75 removed theme in conf 2020-06-16 11:15:07 -04:00
46380163cd
Merge pull request #9 from Rushilwiz/development
Development
2020-06-16 11:04:25 -04:00
28658300ad Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development 2020-06-16 11:02:40 -04:00
f893b96425 started ReadTheDocs 2020-06-16 11:02:38 -04:00
35f9b490da
Merge pull request #8 from Rushilwiz/development
bad conflicts go away
2020-06-16 10:58:50 -04:00
6e959654ab
Merge branch 'master' into development 2020-06-16 10:58:31 -04:00
fe42f52a91 chilled the dependencies 2020-06-16 10:55:05 -04:00
9444f9b34e
PyGObject can't be installed from pip 2020-06-16 10:42:01 -04:00
bc5effb80b
PyGObject can't be installed from pip 2020-06-16 10:41:24 -04:00
Raffu Khondaker
8fa1aae39e teacher fix 2020-06-16 01:45:45 -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
f509734cf8 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 01:08:19 -04:00
Raffu Khondaker
d4a08deec7 db fix 2020-06-16 01:08:17 -04:00
aeb3440fb2
Merge pull request #7 from Rushilwiz/development
Development
2020-06-16 00:40:44 -04:00
98a2533ba3 Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development
merge
2020-06-16 00:35:11 -04:00
d429225123 removed bad deps 2020-06-16 00:35:09 -04:00
574bf9a346
added docs badge 2020-06-16 00:28:03 -04:00
0c33eb47ef
Merge pull request #6 from Rushilwiz/development
Development
2020-06-16 00:19:39 -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
20d94ab0ec Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 00:17:11 -04:00
Raffu Khondaker
f8fff8882b cli 2020-06-16 00:17:10 -04:00
Nathaniel Kenschaft
588981ba07 updated requirements.txt 2020-06-15 23:35:08 -04:00
Nathaniel Kenschaft
70d0720115 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-15 23:32:44 -04:00
Nathaniel Kenschaft
04ce324566 finalized checker.py 2020-06-15 23:31:47 -04:00
Raffu Khondaker
52a88c6880 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-15 22:08:25 -04:00
Raffu Khondaker
6079019a9a teacher update 2020-06-15 22:08:23 -04:00
Nathaniel Kenschaft
76db4476d2 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-15 20:34:05 -04:00
Nathaniel Kenschaft
dc7cbf719b started checker.py 2020-06-15 20:33:27 -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