Commit Graph

304 Commits

Author SHA1 Message Date
Mathieu Lagace
a3156ac246 new instance for 227 2019-08-28 09:28:02 -04:00
Mathieu Lagace
509a135e74 Edit Item DB structure 2019-08-27 13:36:55 -04:00
Mathieu Lagace
7c95145459 Merge branch 'dev' into 'master'
Version 3.2.0

See merge request TheGamecraft/c-cms!44
3.2.0
2019-08-26 19:00:52 +00:00
Mathieu Lagace
52f2d242da Merge branch '3.2.0' into 'dev'
3.2.0

See merge request TheGamecraft/c-cms!43
2019-08-26 18:55:43 +00:00
Mathieu Lagace
615752d61a Version 3.2.0 2019-08-26 14:53:30 -04:00
Mathieu Lagace
54adf4ea22 Version 3.2.0 2019-08-26 14:51:17 -04:00
Mathieu Lagace
a630de66e2 Merge branch '3.2.0' into 'dev'
Add picture

See merge request TheGamecraft/c-cms!42
2019-08-26 15:47:09 +00:00
Mathieu Lagace
2b9cd625d6 Add picture 2019-08-26 11:43:36 -04:00
Mathieu Lagace
d2a884b0bb Merge branch '3.2.0' into 'dev'
Fix Public View & add General Config

See merge request TheGamecraft/c-cms!41
2019-08-26 14:19:30 +00:00
Mathieu Lagace
1cb85d50ca Fix Public View & add General Config 2019-08-26 10:17:11 -04:00
Mathieu Lagace
82b5ef34bf Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!40
2019-08-23 19:50:27 +00:00
Mathieu Lagace
e595c1d7de Merge branch '3.2.0' into 'dev'
Patch for the demo

See merge request TheGamecraft/c-cms!39
2019-08-23 19:43:49 +00:00
Mathieu Lagace
db63c4ea4d Patch for the demo 2019-08-23 15:41:43 -04:00
Mathieu Lagace
9a32aa1730 Merge branch '3.2.0' into 'dev'
Disable unfinish Feature

See merge request TheGamecraft/c-cms!38
2019-08-21 17:48:08 +00:00
Mathieu Lagace
bfdfcb87cf Disable unfinish Feature 2019-08-21 13:45:41 -04:00
Mathieu Lagace
1b4eecb54d Merge branch '3.2.0' into 'dev'
Bug Fix

See merge request TheGamecraft/c-cms!37
2019-08-21 14:54:47 +00:00
Mathieu Lagace
44efcd8e32 Bug Fix 2019-08-21 10:52:16 -04:00
Mathieu Lagace
abf3da8030 Merge branch '3.2.0' into 'dev'
3.2.0

See merge request TheGamecraft/c-cms!36
2019-08-21 14:33:20 +00:00
Mathieu Lagace
1d3f07b7b7 Calendar Edit 2019-08-21 10:30:52 -04:00
Mathieu Lagace
7869a96c81 Test Setup PhpStorm 2019-08-19 10:29:58 -04:00
Mathieu Lagace
3b2937d189 Merge branch '3.2.0' into 'dev'
Big Calendar/Schedule update

See merge request TheGamecraft/c-cms!35
2019-08-18 21:29:20 +00:00
Mathieu Lagace
cf5f7effbf Big Calendar/Schedule update 2019-08-18 17:26:49 -04:00
Mathieu Lagace
e453c0edcc Merge branch '3.2.0' into 'dev'
Perfect Scrollbar and Issue #79

See merge request TheGamecraft/c-cms!34
2019-08-17 22:48:01 +00:00
Mathieu Lagace
3546298a08 Perfect Scrollbar and Issue #79 2019-08-17 18:46:02 -04:00
Mathieu Lagace
d277180e45 Merge branch '3.2.0' into 'dev'
3.2.0

See merge request TheGamecraft/c-cms!33
2019-08-17 22:04:28 +00:00
Mathieu Lagace
a63eafb833 Add Calendar in Admin 2019-08-17 18:02:09 -04:00
Mathieu Lagace
d4b3b1b47d New Model for Event,Booking and Course 2019-08-17 11:43:52 -04:00
Mathieu Lagace
c4d382dbf0 Merge branch '3.2.0' into 'dev'
Edit CI/CD

See merge request TheGamecraft/c-cms!32
2019-08-16 00:25:30 +00:00
Mathieu Lagace
b850b38b85 Edit CI/CD 2019-08-15 20:23:34 -04:00
Mathieu Lagace
7d1a208534 Merge branch '3.2.0' into 'dev'
Edit CI/CD

See merge request TheGamecraft/c-cms!31
2019-08-16 00:17:31 +00:00
Mathieu Lagace
f1ee7cfeaf Edit CI/CD 2019-08-15 20:15:34 -04:00
Mathieu Lagace
ea03d22558 Merge branch '3.2.0' into 'dev'
Edit CI/CD to add Dev

See merge request TheGamecraft/c-cms!30
2019-08-15 23:58:43 +00:00
Mathieu Lagace
45566d373f Edit CI/CD to add Dev 2019-08-15 19:56:40 -04:00
Mathieu Lagace
e9fd3407a7 Merge branch '3.2.0' into 'dev'
3.2.0

See merge request TheGamecraft/c-cms!29
2019-08-15 23:50:37 +00:00
Mathieu Lagace
1419032b64 Edit Material Design Dashboard 2019-08-15 19:48:41 -04:00
Mathieu Lagace
9f85296cea Add Material Design for Public and Admin 2019-08-14 15:29:37 -04:00
Mathieu Lagace
cb3fdc44e2 MIse a jour Ci/Cd ALPHA-3.1.0 2019-08-04 19:26:54 -04:00
Mathieu Lagace
d57c648d7f Mise a jour CI/CD 2019-08-04 19:19:33 -04:00
Mathieu Lagace
c6110b47e8 Mise a jour CI/CD 2019-08-04 19:11:00 -04:00
Mathieu Lagace
fd73dc388d Ajout 736 CI/CD 2019-08-04 19:10:08 -04:00
Mathieu Lagace
818a84c3df Mise a jour Envoy 2019-08-04 18:54:03 -04:00
Mathieu Lagace
7364c3494c Mise a jour Envoy 2019-08-04 18:47:46 -04:00
Mathieu Lagace
76c60d512f Edit CI/CD 2019-08-04 17:40:34 -04:00
Mathieu Lagace
54d57c7b13 Add Docker 2019-08-04 17:19:53 -04:00
Mathieu Lagace
e679cacb7d Ajout de Envoy 2019-08-04 17:06:43 -04:00
Mathieu Lagace
b28b7cdab5 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!28
2019-08-04 21:01:52 +00:00
Mathieu Lagace
eee82e3b81 Release 3.1.0 2019-08-04 16:38:03 -04:00
Mathieu Lagace
97a7be702e Ajout des news & pictures & complementary activity 2019-08-04 14:26:14 -04:00
Mathieu Lagace
47128ea6fc test working tree 2019-08-04 10:07:32 -04:00
Dev Distant
fdc2772ee2 workflow change 2019-08-04 09:56:40 -04:00