159 Commits

Author SHA1 Message Date
tokslaw 5d2ed4169c Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-08 19:57:23 -05:00
ameye eb9b57c7e7 fix 2020-02-08 19:56:48 -05:00
tokslaw 017138ca27 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-08 19:39:05 -05:00
ameye accd9b4c2c fix 2020-02-08 19:38:17 -05:00
ameye 717193831d fix 2020-02-08 19:38:13 -05:00
tokslaw ad90360dec fix Terms and conditions 2020-02-08 18:24:06 -05:00
tokslaw d22e134b7a fix register_login 2020-02-08 16:43:24 -05:00
ameye abb77b4b01 fix 2020-02-08 16:26:04 -05:00
ameye 23bf6490a6 fix 2020-02-08 14:13:10 -05:00
ameye 7cb1cb7296 fix 2020-02-08 13:38:26 -05:00
ameye edf3f334f2 fix 2020-02-08 13:31:12 -05:00
ameye 892c9c97c4 fix 2020-02-08 12:37:09 -05:00
ameye 59c2015ca3 fix 2020-02-08 12:11:42 -05:00
ameye cc3271b20f fix 2020-02-08 11:48:57 -05:00
ameye 7677151f92 fix 2020-02-08 02:49:16 -05:00
ameye 4711b86eac fix 2020-02-08 02:44:24 -05:00
tokslaw a1ffee1689 fix the deafult page text 2020-02-08 01:23:46 -05:00
tokslaw 45b1ad31d0 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-08 00:40:12 -05:00
tokslaw 31a7cb3508 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade
Conflicts:
	www/application/controllers/Auth.php
2020-02-08 00:39:03 -05:00
ameye 16ce3f6e3f fix 2020-02-08 00:36:34 -05:00
ameye b448b21809 fix 2020-02-07 14:27:21 -05:00
ameye 78381960f4 fix 2020-02-07 14:24:43 -05:00
tokslaw 275e53d319 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-07 14:21:43 -05:00
ameye 255f3faf3b fix 2020-02-07 14:21:08 -05:00
tokslaw 8e6d9cc4c4 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade
Conflicts:
	www/application/controllers/Auth.php
2020-02-07 12:44:55 -05:00
tokslaw ba7788ddca fix 2020-02-06 18:41:11 -05:00
ameye 749bfb7dba fix 2020-02-06 18:36:37 -05:00
ameye f291bc5c88 fix 2020-02-06 18:36:33 -05:00
ameye 33dfd3334b fix 2020-02-05 18:49:22 -05:00
ameye 33fe158465 fix 2020-02-05 18:41:00 -05:00
ameye ef95717d7c fix 2020-02-05 18:40:57 -05:00
ameye 67159b0132 fix 2020-02-05 07:15:32 -05:00
ameye 5d9da78cf6 fix 2020-02-05 07:15:27 -05:00
ameye fb5c9b7709 fix 2020-02-05 06:09:09 -05:00
ameye d3ccc39e57 fix 2020-02-05 06:05:47 -05:00
ameye bcbc8067e4 fix 2020-01-25 14:16:05 -05:00
ameye d89446c636 fix 2020-01-25 13:11:19 -05:00
ameye eb8198e79f fix 2020-01-25 00:08:09 -05:00
ameye 066d9c1f2b fix 2020-01-25 00:00:08 -05:00
ameye 236436e22e fix 2020-01-24 23:37:16 -05:00
ameye beef10931d fix 2020-01-24 23:27:50 -05:00
ameye 40531c20da fix 2020-01-24 23:22:30 -05:00
ameye a07b5e0680 fix 2020-01-24 23:18:43 -05:00
ameye 3b5b90f093 fix 2020-01-24 23:11:51 -05:00
ameye 85da8f4403 fix 2020-01-24 23:03:55 -05:00
ameye 43f00c266f fix 2020-01-24 22:54:51 -05:00
ameye f6038e4765 fix 2020-01-24 22:50:29 -05:00
ameye 3f3fdfc85b fix 2020-01-24 18:25:16 -05:00
ameye dd613d43d8 fix 2020-01-24 18:09:06 -05:00
tokslaw a77f69912d fix 2020-01-24 17:53:26 -05:00