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
198 Commits 7 Branches 4 Tags
14cdc8b880d632052271b21af2f7a4fd3d77b5b7
Commit Graph

198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
9a65920265 Merge branch 'dev' into 'master' 
Fix 3.2.1c

See merge request TheGamecraft/c-cms!58
 2019-09-04 01:33:44 +00: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
245c357b7a Merge branch 'dev' into 'master' 
Fix 3.2.1b

See merge request TheGamecraft/c-cms!56
 2019-09-03 21:41:39 +00: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
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