c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-08-17 05:38:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
198 Commits 7 Branches 4 Tags
f61aa35ac329f7b1fb8257401995092160733bf6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 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
Mathieu Lagace c4f96fbfc4 Update .gitlab-ci.yml 2019-04-05 12:05:11 +00:00
Mathieu Lagace 75a4a0a080 Merge branch 'dev' into 'master' 
v3.0.7a

See merge request TheGamecraft/c-cms!27
 2019-04-05 12:00:22 +00:00
TheGamecraft f262392672 v3.0.7a 2019-01-31 11:47:01 -05:00
Mathieu Lagace 1679252930 Merge branch 'dev' into 'master' 
3.0.7

See merge request TheGamecraft/c-cms!26
 2018-12-03 22:22:50 +00:00
TheGamecraft 9dc4d1103f 3.0.7 2018-12-03 17:21:50 -05:00
Mathieu Lagace 07e409a922 Merge branch 'dev' into 'master' 
3.0.6i

See merge request TheGamecraft/c-cms!25
 2018-12-03 15:52:20 +00:00
TheGamecraft 0fddd138bf 3.0.6i 2018-12-03 10:51:24 -05:00