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

191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b24f0baddb 3.2.3 2019-09-13 16:49:03 -04:00
Mathieu Lagace
9fee30f1ee 3.2.3 2019-09-13 16:46:51 -04:00
Mathieu Lagace
5f7894781c 3.2.3 2019-09-13 16:40:43 -04: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
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
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
Mathieu Lagace
96e4fc36d1 Merge branch '3.2.1' into 'dev' 
3.2.1b

See merge request TheGamecraft/c-cms!55
 2019-09-03 21:37:19 +00:00
Mathieu Lagace
0b5b5575d4 3.2.1b 2019-09-03 17:34:48 -04: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
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
caf44ba58a Update CI/CD 2019-08-28 10:27:17 -04:00
Mathieu Lagace
28c2f0a13d Update CI/CD 2019-08-28 10:13:30 -04: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
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
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