Commit Graph

230 Commits

Author SHA1 Message Date
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
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
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