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
221 Commits 7 Branches 4 Tags
5585b8a8a77f682a7893d2bfc17684f9c51e94b9
Commit Graph

221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Lagace
3a05ddfb0d Merge branch 'dev' into 'master' 
Fix 3.2.1a

See merge request TheGamecraft/c-cms!54
 2019-09-03 21:25:39 +00:00
Mathieu Lagace
48ccf671ef Merge branch '3.2.1' into 'dev' 
3.2.1

See merge request TheGamecraft/c-cms!53
 2019-09-03 21:21:24 +00:00
Mathieu Lagace
06f706b3a8 3.2.1 2019-09-03 17:18:45 -04:00
Mathieu Lagace
8fb24e1605 Merge branch 'dev' into 'master' 
Mise a jour 3.2.1

See merge request TheGamecraft/c-cms!52
 2019-09-03 20:51:53 +00:00
Mathieu Lagace
d2a23628cd Merge branch '3.2.1' into 'dev' 
3.2.1

See merge request TheGamecraft/c-cms!51
 2019-09-03 20:45:02 +00:00
Mathieu Lagace
fbd644fd8a 3.2.1 2019-09-03 16:42:45 -04:00
Mathieu Lagace
70b9478dd2 Merge branch '3.2.1' into 'dev' 
Fix Bug#100

See merge request TheGamecraft/c-cms!50
 2019-08-29 15:13:09 +00:00
Mathieu Lagace
dda94c1b7c Fix Bug#100 2019-08-29 11:09:48 -04:00
Mathieu Lagace
47512a221e Merge branch '3.2.1' into 'dev' 
3.2.1

See merge request TheGamecraft/c-cms!49
 2019-08-28 17:01:01 +00:00
Mathieu Lagace
d01bf2fca7 Add ItemCategory form 2019-08-28 12:57:51 -04:00
Mathieu Lagace
1462c4d16d Merge branch '3.2.1' into 'master' 
Update CI/CD

See merge request TheGamecraft/c-cms!48
 2019-08-28 14:29:23 +00:00
Mathieu Lagace
caf44ba58a Update CI/CD 2019-08-28 10:27:17 -04:00
Mathieu Lagace
daba93bcfc Merge branch '3.2.1' into 'master' 
Update CI/CD

See merge request TheGamecraft/c-cms!47
 2019-08-28 14:16:01 +00:00
Mathieu Lagace
28c2f0a13d Update CI/CD 2019-08-28 10:13:30 -04:00
Mathieu Lagace
f9bf70d7d3 Merge branch '3.2.1' into 'master' 
3.2.1

See merge request TheGamecraft/c-cms!46
 2019-08-28 14:04:52 +00:00
Mathieu Lagace
13ed334ea1 Deployement 117 2019-08-28 10:02:25 -04:00
Mathieu Lagace
585c05d1d7 Merge branch '3.2.1' into 'dev' 
3.2.1

See merge request TheGamecraft/c-cms!45
 2019-08-28 13:31:30 +00:00
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