c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-08-17 05:38:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
306 Commits 7 Branches 4 Tags
f1df0ee562098361823e892b3ac278569a261814
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
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
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
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
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
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
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
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
Mathieu Lagace 143ccc3750 Merge branch '3.2.4' into 'master' 
3.2.4

See merge request TheGamecraft/c-cms!86
 2019-12-10 15:32:42 +00:00
Mathieu Lagace 09523f2bb0 Update to 6.6 2019-12-04 20:58:20 -05:00
Mathieu Lagace 31e26b6747 Merge branch '3.2.4' into 'master' 
Fix for mobile

See merge request TheGamecraft/c-cms!85
 2019-11-09 01:05:52 +00: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 5c61b124f8 Merge branch '3.2.4' into 'master' 
Fix for mobile

See merge request TheGamecraft/c-cms!83
 2019-11-08 22:25:19 +00:00
Mathieu Lagace 2f441f36f8 Fix for mobile 2019-11-08 17:23:13 -05:00
Mathieu Lagace 7f032f5fa7 Merge branch '3.2.4' into 'master' 
Hotfix

See merge request TheGamecraft/c-cms!82
 2019-11-07 22:08:09 +00:00
Mathieu Lagace 537e5dc139 Hotfix 2019-11-07 17:06:01 -05:00
Mathieu Lagace 5585b8a8a7 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!81
 2019-11-07 20:59:07 +00: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
Mathieu Lagace 344c406b5a Ajout Plan de cours vierge 2019-11-07 15:52:47 -05:00
Mathieu Lagace 21111ae622 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!79
 2019-10-19 20:38:52 +00:00
Mathieu Lagace 13af227a7d Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!78
 2019-10-19 20:32:30 +00:00
Mathieu Lagace 073ad62ccf 3.2.4 2019-10-19 16:30:03 -04:00
Mathieu Lagace f3ec54db20 Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!77
 2019-10-19 20:24:33 +00:00
Mathieu Lagace fea20bcda9 3.2.4 2019-10-19 16:20:57 -04:00
Mathieu Lagace 44a4035f42 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!76
 2019-10-19 20:08:47 +00:00
Mathieu Lagace f61aa35ac3 Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!75
 2019-10-19 19:40:43 +00:00
Mathieu Lagace 7e676ddedd 3.2.4 2019-10-19 15:38:19 -04:00
Mathieu Lagace f04f93e89b Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!74
 2019-10-19 19:19:20 +00:00
Mathieu Lagace f26631bedf 3.2.4 2019-10-19 15:16:24 -04:00
Mathieu Lagace 799261a7d5 3.2.4 2019-10-19 13:11:42 -04:00
Mathieu Lagace 5c6f2d28bc Merge branch '3.2.4' into 'dev' 
MAJ UI Calendar Fix

See merge request TheGamecraft/c-cms!73
 2019-10-02 13:34:34 +00:00
Mathieu Lagace 498c80f404 MAJ UI Calendar Fix 2019-10-02 09:32:08 -04:00
Mathieu Lagace 619c335379 Merge branch '3.2.4' into 'dev' 
MAJ UI Calendar

See merge request TheGamecraft/c-cms!72
 2019-10-02 12:44:25 +00:00
Mathieu Lagace 1c7997c549 MAJ UI Calendar 2019-10-02 08:40:53 -04:00
Mathieu Lagace faf0c20d7d Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!70
 2019-10-02 12:16:14 +00:00
Mathieu Lagace 0166c48daa 3.2.4 2019-09-30 17:06:31 -04:00
Mathieu Lagace d1ce6ba6da Merge branch '3.2.3' into '3.2.4' 
3.2.3

See merge request TheGamecraft/c-cms!69
 2019-09-18 11:50:00 +00:00
Mathieu Lagace 2eabeb4205 3.2.4 2019-09-17 21:40:55 -04:00
Mathieu Lagace ccc947d444 Merge branch '3.2.1' of https://gitlab.com/TheGamecraft/c-cms into 3.2.2 2019-09-14 15:33:56 -04:00
Mathieu Lagace 14cdc8b880 Merge branch '3.2.3' into 'master' 
3.2.3

See merge request TheGamecraft/c-cms!68
 2019-09-13 20:51:47 +00:00
Mathieu Lagace b24f0baddb 3.2.3 2019-09-13 16:49:03 -04:00
Mathieu Lagace 0f28be3218 Merge branch '3.2.3' into 'master' 
3.2.3

See merge request TheGamecraft/c-cms!67
 2019-09-13 20:48:50 +00:00
Mathieu Lagace 9fee30f1ee 3.2.3 2019-09-13 16:46:51 -04:00
Mathieu Lagace dccc76d7e7 Merge branch '3.2.3' into 'master' 
3.2.3

See merge request TheGamecraft/c-cms!66
 2019-09-13 20:42:42 +00:00
Mathieu Lagace 5f7894781c 3.2.3 2019-09-13 16:40:43 -04:00
Mathieu Lagace 037b3b4c47 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!65
 2019-09-13 20:33:08 +00:00
Mathieu Lagace f517250bbf Merge branch '3.2.3' into 'dev' 
3.2.3

See merge request TheGamecraft/c-cms!64
 2019-09-13 20:28:28 +00:00
Mathieu Lagace 7dedd9586b 3.2.3 2019-09-13 16:25:36 -04:00
Mathieu Lagace b7c2b8a632 Perm 2019-09-12 18:21:55 -04:00
Mathieu Lagace 67f49b40e9 Merge remote-tracking branch 'origin/3.2.3' into 3.2.3 2019-09-12 08:02:22 -04:00
Mathieu Lagace 566c5ef0ba Merge remote-tracking branch 'origin/3.2.2' into 3.2.3 2019-09-12 08:02:14 -04:00
Mathieu Lagace 376268aa42 Merge branch '3.2.2' into '3.2.3' 
Bug Fix

See merge request TheGamecraft/c-cms!63
 2019-09-12 11:58:27 +00:00
Mathieu Lagace 2331beab17 3.2.3 2019-09-12 07:53:18 -04:00
Mathieu Lagace 6e7c5c81e6 Merge branch '3.2.2' into 'dev' 
Bug Fix

See merge request TheGamecraft/c-cms!62
 2019-09-11 22:56:50 +00:00
Mathieu Lagace c86e6af390 Merge branch '3.2.1' into 'dev' 
3.2.1

See merge request TheGamecraft/c-cms!61
 2019-09-11 14:15:52 +00:00
Mathieu Lagace 7f07490bdf 3.2.1 2019-09-11 10:13:29 -04:00
Mathieu Lagace f4dd3ed742 Merge branch 'dev' into 'master' 
3.2.1

See merge request TheGamecraft/c-cms!60
 2019-09-11 12:39:39 +00:00
Mathieu Lagace e78d6c3c12 Merge branch '3.2.1' into 'dev' 
3.2.1

See merge request TheGamecraft/c-cms!59
 2019-09-11 11:50:58 +00:00
Mathieu Lagace 04dd5ee6b7 Bug Fix 2019-09-11 06:57:45 -04:00
Mathieu Lagace 133f430445 3.2.1 2019-09-08 16:43:34 -04:00
Mathieu Lagace 9a65920265 Merge branch 'dev' into 'master' 
Fix 3.2.1c

See merge request TheGamecraft/c-cms!58
 2019-09-04 01:33:44 +00:00
Mathieu Lagace ee6b71534a Merge branch '3.2.1' into 'dev' 
3.2.1c

See merge request TheGamecraft/c-cms!57
 2019-09-04 01:28:46 +00:00
Mathieu Lagace 0bd86285ca 3.2.1c 2019-09-03 21:26:47 -04:00