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
230 Commits 7 Branches 4 Tags
143ccc3750af6cd6e917be392f7e1bd47e66e2ff
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Lagace 143ccc3750 Merge branch '3.2.4' into 'master' 
3.2.4

See merge request TheGamecraft/c-cms!86
 2019-12-10 15:32:42 +00:00
Mathieu Lagace 31e26b6747 Merge branch '3.2.4' into 'master' 
Fix for mobile

See merge request TheGamecraft/c-cms!85
 2019-11-09 01:05:52 +00:00
Mathieu Lagace c916e5e580 Fix for mobile 2019-11-08 17:35:13 -05:00
Mathieu Lagace 5c61b124f8 Merge branch '3.2.4' into 'master' 
Fix for mobile

See merge request TheGamecraft/c-cms!83
 2019-11-08 22:25:19 +00:00
Mathieu Lagace 2f441f36f8 Fix for mobile 2019-11-08 17:23:13 -05:00
Mathieu Lagace 7f032f5fa7 Merge branch '3.2.4' into 'master' 
Hotfix

See merge request TheGamecraft/c-cms!82
 2019-11-07 22:08:09 +00:00
Mathieu Lagace 537e5dc139 Hotfix 2019-11-07 17:06:01 -05:00
Mathieu Lagace 5585b8a8a7 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!81
 2019-11-07 20:59:07 +00:00
Mathieu Lagace 82c50eb03b Merge branch '3.2.4' into 'dev' 
Ajout Plan de cours vierge

See merge request TheGamecraft/c-cms!80
 2019-11-07 20:55:04 +00:00
Mathieu Lagace 344c406b5a Ajout Plan de cours vierge 2019-11-07 15:52:47 -05:00
Mathieu Lagace 21111ae622 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!79
 2019-10-19 20:38:52 +00:00
Mathieu Lagace 13af227a7d Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!78
 2019-10-19 20:32:30 +00:00
Mathieu Lagace 073ad62ccf 3.2.4 2019-10-19 16:30:03 -04:00
Mathieu Lagace f3ec54db20 Merge branch '3.2.4' into 'dev' 
3.2.4

See merge request TheGamecraft/c-cms!77
 2019-10-19 20:24:33 +00:00
Mathieu Lagace fea20bcda9 3.2.4 2019-10-19 16:20:57 -04:00
Mathieu Lagace 44a4035f42 Merge branch 'dev' into 'master' 
Dev

See merge request TheGamecraft/c-cms!76
 2019-10-19 20:08:47 +00:00
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 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
 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