Commit Graph

313 Commits

Author SHA1 Message Date
Nathaniel Kenschaft
6bfdadf162 Merge branch 'master' of github.com:Rushilwiz/SkoolOS 2020-06-17 00:52:23 -04:00
7926dea6b5 Few lines of code that fix the CLI 2020-06-17 00:49:36 -04:00
Nathaniel Kenschaft
3b0c903c18 commented out 3 test lines that broke the code 2020-06-17 00:34:26 -04:00
3c87070aba
Update README.md 2020-06-17 00:03:48 -04:00
add8646ddf
Added link to the ReadTheDocs
Sorry it is late by a few minutes, but I promise the actual project was finished at the assigned time
2020-06-17 00:03:33 -04:00
ecf81566e8
Merge pull request #21 from Rushilwiz/development
Development
2020-06-16 23:59:32 -04:00
934295b60c a 2020-06-16 23:59:07 -04:00
cd716f1ecc Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development
merge
2020-06-16 23:57:17 -04:00
435cb2c0ef webapp 2020-06-16 23:57:16 -04:00
Nathaniel Kenschaft
7a05627a98 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 23:50:24 -04:00
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
Nathaniel Kenschaft
cda51ba773 fixed merge conflict 2020-06-16 23:50:17 -04:00
6adf30c205 Merge remote-tracking branch 'origin/development' into development 2020-06-16 23:47:55 -04:00
1ae65242b7 commiting to pull 2020-06-16 23:47:28 -04:00
aecdb3b4f1 finished bgservice 2020-06-16 23:47:03 -04:00
ece8c8e3ab
Merge pull request #20 from Rushilwiz/development
Development
2020-06-16 23:45:31 -04:00
61861b502b
Merge branch 'master' into development 2020-06-16 23:45:25 -04:00
Nathaniel Kenschaft
96a089f71f fixed merge conflict 2020-06-16 23:45:11 -04:00
Nathaniel Kenschaft
293a4b5ffb fixed merge conflict 2020-06-16 23:44:23 -04:00
Raffu Khondaker
a5265cc961 final push 2020-06-16 23:43:28 -04:00
Nathaniel Kenschaft
ebf2fa5da0 fixed merge conflict 2020-06-16 23:42:38 -04:00
Raffu Khondaker
3b5f6ebb18 format fix 2020-06-16 23:42:14 -04:00
Raffu Khondaker
02e140609c cli docs 2020-06-16 23:40:38 -04:00
Nathaniel Kenschaft
5fb88d0408 polised install and cli documentation 2020-06-16 23:40:05 -04:00
Raffu Khondaker
8b16b3ba7a doc updates 2020-06-16 23:38:47 -04:00
Raffu Khondaker
7462ec8465 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 23:37:00 -04:00
Raffu Khondaker
9c93f8a4e2 doc finish cli 2020-06-16 23:36:58 -04:00
Nathaniel Kenschaft
8f8e55acdb polised install and cli documentation 2020-06-16 23:36:19 -04:00
Nathaniel Kenschaft
b0669e93ac Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 23:32:01 -04:00
Nathaniel Kenschaft
e2781b60a1 documented the background service 2020-06-16 23:31:57 -04:00
Raffu Khondaker
774ee4bd17 Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development 2020-06-16 23:31:31 -04:00
Raffu Khondaker
6d9673ea6d prompt 2020-06-16 23:31:30 -04:00
8b11e2defe trying to get the bg service to work with the cli 2020-06-16 23:25:36 -04:00
Nathaniel Kenschaft
b2c2d8fe20 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 23:25:13 -04:00
Nathaniel Kenschaft
eb1f3bede7 fixed bgservice 2020-06-16 23:25:09 -04:00
Nathaniel Kenschaft
ef37a15ac8 bgservice.py 2020-06-16 23:15:29 -04:00
Raffu Khondaker
51d6ed1175 n 2020-06-16 23:10:59 -04:00
b3d05d236b Merge remote-tracking branch 'origin/development' into development 2020-06-16 23:10:07 -04:00
342ebe497c update 2020-06-16 23:09:35 -04:00
491754ef9e added log 2020-06-16 23:09:15 -04:00
Nathaniel Kenschaft
8a5e1d2f86 Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development 2020-06-16 23:05:14 -04:00
Nathaniel Kenschaft
853343938f start bgservice docs 2020-06-16 23:05:09 -04:00
Raffu Khondaker
8fe8421cdf updates 2020-06-16 23:00:28 -04:00
Nathaniel Kenschaft
030bbc0c1e fixed code blocks 2020-06-16 22:49:24 -04:00
Raffu Khondaker
62709f2d3c changes 2020-06-16 22:49:20 -04:00
Nathaniel Kenschaft
2aa4d9b44b fixed merge conflict 2020-06-16 22:39:35 -04:00
Nathaniel Kenschaft
2e44139d80 generated pydoc documentation 2020-06-16 22:35:52 -04:00
11b287023d Merge remote-tracking branch 'origin/development' into development 2020-06-16 22:19:55 -04:00
7f7fdd1ddb hmmm 2020-06-16 22:19:39 -04:00