321 Commits

Author SHA1 Message Date
Mathieu Lagace
4d5cf2cdc0 feat: add redirect to drive files 2021-11-20 00:42:48 +00:00
Mathieu Lagace
2b0b8f3411 fix: small bug from Guillaume 2021-11-17 17:30:26 +00:00
Mathieu Lagace
ccec089160 fix: added delay to updateCourseName 2021-11-01 16:46:34 +00:00
Mathieu Lagace
26c8cda7aa fix: devcontainer 2021-11-01 16:46:07 +00:00
Mathieu Lagace
e95e93d229 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!119
2021-11-01 14:34:31 +00:00
Mathieu Lagace
527155786a fix: fix BD exception in Event.php 2021-09-27 09:30:52 -04:00
Mathieu Lagace
f0364413a3 Merge branch 'feat-customPages' into 'dev'
Feat custom pages

See merge request TheGamecraft/c-cms!117
2021-08-30 20:42:06 +00:00
Mathieu Lagace
935b63898c feat added custom pages 2021-08-30 20:37:43 +00:00
Mathieu Lagace
1bec8805a7 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!116
2020-10-06 23:05:17 +00:00
Mathieu Lagace
5b69a9943e Merge branch 'hide-event' into 'dev'
Hide event

See merge request TheGamecraft/c-cms!115
2020-10-06 22:59:11 +00:00
Mathieu Lagacé
f7845d8f1b hide event 2020-10-06 18:54:56 -04:00
Mathieu Lagace
63301aec97 Merge branch 'schedule-table' into 'master'
Schedule Table view update & permissions update

See merge request TheGamecraft/c-cms!114
2020-10-02 22:09:26 +00:00
Mathieu Lagacé
9cdd47a6f4 Schedule Table view update & permissions update 2020-10-02 18:05:03 -04:00
Mathieu Lagace
6eb517a0cb Merge branch 'schedule-table' into 'master'
Update app/Event.php

See merge request TheGamecraft/c-cms!113
2020-10-02 18:19:38 +00:00
Mathieu Lagace
95a088ddc6 Update app/Event.php 2020-10-02 18:15:24 +00:00
Mathieu Lagace
f1df0ee562 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!112
2020-10-02 17:50:43 +00:00
Mathieu Lagace
ef66ed3d69 Merge branch 'schedule-table' into 'dev'
Schedule table

See merge request TheGamecraft/c-cms!111
2020-10-02 17:06:02 +00:00
Mathieu Lagace
f45bc5522e Merge branch 'dev' into 'schedule-table'
# Conflicts:
#   config/version.yml
2020-10-02 17:02:03 +00:00
Mathieu Lagacé
60c5a995f2 Add table view for calendar 2020-10-02 12:38:07 -04:00
Mathieu Lagacé
2a8178c6f3 Fix edit event bug 2020-09-12 10:44:15 -04:00
Mathieu Lagace
ae00c9e7e0 Update .gitlab-ci.yml 2020-08-03 15:50:53 +00:00
Mathieu Lagace
d730f358fe Update .gitlab-ci.yml 2020-08-03 15:49:18 +00:00
Mathieu Lagace
ba1d56c7d3 Merge branch 'update-profil' into 'dev'
update profil

See merge request TheGamecraft/c-cms!109
2020-08-03 15:48:08 +00:00
Mathieu Lagace
6d50d2c57a update profil 2020-08-03 11:44:07 -04:00
Mathieu Lagace
465bac0e94 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!108
2020-07-31 22:11:30 +00:00
Mathieu Lagace
ec7a6c57f5 Update Envoy.blade.php 2020-07-31 21:59:54 +00:00
Mathieu Lagace
efd70e3fea Merge branch 'update-profil' into 'dev'
fix bug in news when user is delete

See merge request TheGamecraft/c-cms!107
2020-07-31 21:40:50 +00:00
Mathieu Lagace
d8e36b8479 fix bug in news when user is delete 2020-07-31 17:36:46 -04:00
Mathieu Lagace
2b3b64362a Merge branch 'update-profil' into 'dev'
add first login logic

See merge request TheGamecraft/c-cms!106
2020-07-31 21:33:48 +00:00
Mathieu Lagace
8158f8a8aa add first login logic 2020-07-31 17:29:47 -04:00
Mathieu Lagace
039b09b681 Update Envoy.blade.php 2020-07-31 00:20:52 +00:00
Mathieu Lagace
c703ade5cb Merge branch 'update-schedule' into 'dev'
Update schedule

See merge request TheGamecraft/c-cms!105
2020-07-30 22:46:56 +00:00
Mathieu Lagace
65876e5b78 Update dashboard 2020-07-30 18:42:43 -04:00
Mathieu Lagace
4c5d635d5b Working schedule v2 2020-07-30 17:46:11 -04:00
Mathieu Lagace
8d22092ea8 Merge branch 'update-notification' into 'dev'
update notification

See merge request TheGamecraft/c-cms!104
2020-07-27 20:45:58 +00:00
Mathieu Lagace
2d64d6d422 update notification 2020-07-27 16:41:28 -04:00
Mathieu Lagace
c16d1e7e95 Merge branch 'Update_versioning' into 'dev'
Revert Envoy.blade.php

See merge request TheGamecraft/c-cms!103
2020-06-22 00:40:08 +00:00
George Frederick "Buzz" Beurling
e066ace8f8 Revert Envoy.blade.php 2020-06-21 20:36:13 -04:00
Mathieu Lagace
50c051f0cc Merge branch 'Update_versioning' into 'dev'
Update Envoy

See merge request TheGamecraft/c-cms!102
2020-06-22 00:24:51 +00:00
George Frederick "Buzz" Beurling
8d2af9053a Update Envoy 2020-06-21 20:20:46 -04:00
Mathieu Lagace
7b024ebffe Merge branch 'Update_versioning' into 'dev'
Update versioning

See merge request TheGamecraft/c-cms!101
2020-06-22 00:03:16 +00:00
George Frederick "Buzz" Beurling
9ff095a2ee Update version.yml 2020-06-21 19:57:05 -04:00
George Frederick "Buzz" Beurling
9caca508ed Update version.yml 2020-06-21 19:55:34 -04:00
George Frederick "Buzz" Beurling
b79c54fd32 Update footer with new versioning 2020-06-21 19:52:12 -04:00
George Frederick "Buzz" Beurling
418455c508 Add laravel-version 2020-06-21 18:26:15 -04:00
Mathieu Lagace
2a8f73cc76 Merge branch 'Update_news_display' into 'dev'
Update CI/CD Envoy Script

See merge request TheGamecraft/c-cms!100
2020-06-21 16:55:33 +00:00
George Frederick "Buzz" Beurling
ad4b9a8ff2 Update CI/CD Envoy Script 2020-06-21 12:51:49 -04:00
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