Commit Graph

253 Commits

Author SHA1 Message Date
Mathieu Lagace
d944701957 Merge branch '3.2.5' into 'dev'
3.2.5

See merge request TheGamecraft/c-cms!99
2020-06-21 16:43:03 +00:00
Mathieu Lagace
f1e37487e9 Merge branch 'Update_news_display' into '3.2.5'
Update Message UI in Admin Dashboard

See merge request TheGamecraft/c-cms!98
2020-06-21 16:39:12 +00:00
George Frederick "Buzz" Beurling
9c9ad71a49 Update CI/CD Test Script 2020-06-21 12:30:56 -04:00
George Frederick "Buzz" Beurling
542895c11c Update CI/CD MySQL Password 2020-06-21 12:22:14 -04:00
George Frederick "Buzz" Beurling
4539470537 Update CI/CD 2020-06-21 12:15:32 -04:00
George Frederick "Buzz" Beurling
5a019b2c92 Update Message UI in Admin Dashboard 2020-06-21 11:30:00 -04:00
George Frederick "Buzz" Beurling
8866cafd31 Update Laravel to 7.0 2020-06-20 17:03:30 -04:00
George Frederick "Buzz" Beurling
f104c1b61b Ajout de la modification des event_type 2020-04-16 18:32:02 -04:00
Mathieu Lagace
94275f49b2 Merge branch '3.2.5' into 'dev'
April 9 update v2

See merge request TheGamecraft/c-cms!97
2020-04-09 22:28:01 +00:00
George Frederick "Buzz" Beurling
4b659c5db1 April 9 update v2 2020-04-09 18:25:21 -04:00
Mathieu Lagace
c7df62b483 Merge branch '3.2.5' into 'dev'
April 9 update v1

See merge request TheGamecraft/c-cms!96
2020-04-09 21:55:16 +00:00
George Frederick "Buzz" Beurling
bf28eac68a April 9 update v1 2020-04-09 17:53:09 -04:00
Mathieu Lagace
e4aaf461fb Merge branch '3.2.5' into 'dev'
April 9 update

See merge request TheGamecraft/c-cms!95
2020-04-09 21:22:11 +00:00
George Frederick "Buzz" Beurling
50abb9d909 April 9 update 2020-04-09 17:20:03 -04:00
Mathieu Lagace
3da8af3344 Merge branch '3.2.5' into 'dev'
3.2.5

See merge request TheGamecraft/c-cms!94
2020-03-23 00:22:28 +00:00
George Frederick "Buzz" Beurling
94509caf3c Update Docker 2020-03-22 20:19:29 -04:00
George Frederick "Buzz" Beurling
ae3be2b977 Permission update 2020-03-22 20:00:23 -04:00
George Frederick "Buzz" Beurling
1e3ae2fbbb File Explorer update + Permission update 2020-03-19 19:07:26 -04:00
George Frederick "Buzz" Beurling
8a0e09cb80 Ajout de la BD OCOM 2020-03-14 09:51:26 -04:00
George Frederick "Buzz" Beurling
7433051f85 Debut BD Cours 2020-03-10 20:38:43 -04:00
George Frederick "Buzz" Beurling
763e00435c Finalisation de Google Drive 2020-03-10 16:26:48 -04:00
Lagacé Mathieu
8189bbce9a Au cas ou 2020-03-05 08:59:10 -05:00
Lagacé Mathieu
baef9a1df0 3.2.5 2020-02-01 13:17:32 -05:00
Lagacé Mathieu
03cf1c5493 Test performance 2020-01-24 10:33:16 -05:00
Lagacé Mathieu
ef6f403e1b Merge remote-tracking branch 'origin/3.2.5' into 3.2.5 2020-01-22 12:04:39 -05:00
Mathieu Lagace
9e21124e90 To cegep 2020-01-21 21:14:48 -05:00
Mathieu Lagace
299ba8ade7 Merge branch '3.2.5' into 'dev'
Update schedule editor

See merge request TheGamecraft/c-cms!93
2019-12-23 23:00:45 +00:00
Mathieu Lagace
c20024ed96 Update schedule editor 2019-12-23 17:57:41 -05:00
Mathieu Lagace
75564bc3e6 Merge branch '3.2.5' into 'dev'
Update schedule editor

See merge request TheGamecraft/c-cms!92
2019-12-22 22:48:43 +00:00
Mathieu Lagace
2c18dc8c1d Update schedule editor 2019-12-22 17:45:44 -05:00
Mathieu Lagace
9d9e4bb8f6 Merge branch '3.2.5' into 'dev'
Turn on perfect-scrollbar

See merge request TheGamecraft/c-cms!91
2019-12-22 18:13:58 +00:00
Mathieu Lagace
047633c2ce Turn on perfect-scrollbar 2019-12-22 13:10:57 -05:00
Mathieu Lagace
104a20925a Merge branch '3.2.5' into 'dev'
Turn off perfect-scrollbar

See merge request TheGamecraft/c-cms!90
2019-12-22 18:00:38 +00:00
Mathieu Lagace
e5d28d796a Turn off perfect-scrollbar 2019-12-22 12:57:35 -05:00
Mathieu Lagace
0479c7814c Merge branch '3.2.5' into 'dev'
begin of schedule editor

See merge request TheGamecraft/c-cms!89
2019-12-22 00:15:30 +00:00
Mathieu Lagace
ab82a55452 begin of schedule editor 2019-12-21 19:12:36 -05:00
Mathieu Lagace
181720aa64 Merge branch '3.2.5' into 'dev'
begin of schedule editor

See merge request TheGamecraft/c-cms!88
2019-12-21 23:56:07 +00:00
Mathieu Lagace
b992286c2e begin of schedule editor 2019-12-21 18:53:04 -05:00
Mathieu Lagace
88d2163e4c Merge branch '3.2.5' into 'dev'
3.2.5

See merge request TheGamecraft/c-cms!87
2019-12-21 23:43:11 +00:00
Mathieu Lagace
997abf460e begin of schedule editor 2019-12-21 18:40:01 -05:00
Lagacé Mathieu
a4e5a647d6 Merge remote-tracking branch 'origin/3.2.4' into 3.2.5 2019-12-11 10:47:22 -05:00
Lagacé Mathieu
c706bb7361 3.2.4 fix 2019-12-10 10:30:17 -05:00
Lagacé Mathieu
48d998ec67 3.2.4 fix 2019-12-10 10:27:44 -05:00
Lagacé Mathieu
90b551ad31 3.2.5 2019-12-10 10:09:59 -05:00
Mathieu Lagace
09523f2bb0 Update to 6.6 2019-12-04 20:58:20 -05:00
Mathieu Lagace
c916e5e580 Fix for mobile 2019-11-08 17:35:13 -05:00
Mathieu Lagace
57783b8e85 Merge branch '3.2.4' into 'dev'
3.2.4

See merge request TheGamecraft/c-cms!84
2019-11-08 22:25:19 +00:00
Mathieu Lagace
2f441f36f8 Fix for mobile 2019-11-08 17:23:13 -05:00
Mathieu Lagace
537e5dc139 Hotfix 2019-11-07 17:06:01 -05:00
Mathieu Lagace
82c50eb03b Merge branch '3.2.4' into 'dev'
Ajout Plan de cours vierge

See merge request TheGamecraft/c-cms!80
2019-11-07 20:55:04 +00:00