c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 10:49:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
297 Commits 7 Branches 4 Tags
465bac0e946f13f45f32d07a2b47d2d7e1fb7e1c
Commit Graph

297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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