Commit Graph

313 Commits

Author SHA1 Message Date
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
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
b31f6146d2 teacher cli 2020-06-14 23:43:49 -04:00
Nathaniel Kenschaft
5fe9863677 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-14 23:12:01 -04:00
Raffu Khondaker
2315f4ff48 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-14 23:11:58 -04:00
Nathaniel Kenschaft
964bd516ed polished bgservice 2020-06-14 23:11:53 -04:00