Commit Graph

152 Commits

Author SHA1 Message Date
Mathieu Lagace
f600c5cbb4 Update .gitlab-ci.yml 2018-09-24 15:00:05 +00:00
Mathieu Lagace
871877ca37 Update .gitlab-ci.yml 2018-09-24 14:54:13 +00:00
Mathieu Lagace
5597ded1ea Update .gitlab-ci.yml 2018-09-24 14:46:40 +00:00
Mathieu Lagace
34a4ebb2a8 Update .gitlab-ci.yml 2018-09-24 14:35:01 +00:00
Mathieu Lagace
1d13c8c8a9 Update .gitlab-ci.yml 2018-09-24 14:13:01 +00:00
Mathieu Lagace
e3aa153cf8 Update .gitlab-ci.yml 2018-09-24 13:45:37 +00:00
Mathieu Lagace
afa7e47ef3 Update .gitlab-ci.yml 2018-09-24 13:20:32 +00:00
Mathieu Lagace
033a2d65d8 Update .gitlab-ci.yml 2018-09-24 13:18:07 +00:00
Mathieu Lagace
863a701e08 Add .gitlab-ci.yml 2018-09-24 13:12:47 +00:00
Mathieu Lagace
d5c6a534b5 Update CHANGELOG 2018-09-21 18:34:01 +00:00
Mathieu Lagace
0ddf99318d Merge branch 'dev' into 'master'
ALPHA 3.0.5

See merge request TheGamecraft/c-cms!8
2018-09-21 18:33:03 +00:00
TheGamecraft
3b593297cd ALPHA 3.0.5 2018-09-21 14:31:00 -04:00
Mathieu Lagace
d41147346c Update CHANGELOG 2018-09-20 15:21:08 +00:00
Mathieu Lagace
0ce0480942 Merge branch 'dev' into 'master'
ALPHA 3.0.4a

See merge request TheGamecraft/c-cms!7
ALPHA-3.0.4
2018-09-18 16:02:42 +00:00
TheGamecraft
252ff658e0 ALPHA 3.0.4a 2018-09-18 11:53:46 -04:00
Mathieu Lagace
269811533e Merge branch 'dev' into 'master'
ALPHA 3.0.4

See merge request TheGamecraft/c-cms!6
2018-09-14 21:27:36 +00:00
TheGamecraft
99ae047998 ALPHA 3.0.4 2018-09-14 17:25:50 -04:00
Mathieu Lagace
390e6c82e7 Update CHANGELOG 2018-09-11 18:30:48 +00:00
Mathieu Lagace
dda5094386 Merge branch 'dev' into 'master'
ALPHA 3.0.3

See merge request TheGamecraft/c-cms!5
2018-09-11 18:29:25 +00:00
TheGamecraft
d1c3d60791 ALPHA 3.0.3 2018-09-11 14:26:31 -04:00
Mathieu Lagace
7be3c65812 Add LICENSE 2018-09-11 17:36:54 +00:00
Mathieu Lagace
97fdd671a2 Add CHANGELOG 2018-09-11 17:33:40 +00:00
Mathieu Lagace
336e267e88 Merge branch 'dev' into 'master'
ALPHA 3.0.2b

See merge request TheGamecraft/c-cms!4
ALPHA-3.0.2a
2018-09-10 13:35:32 +00:00
TheGamecraft
14cea968d2 ALPHA 3.0.2b 2018-09-10 09:34:22 -04:00
Mathieu Lagace
5cf7066bf5 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!3
2018-09-10 13:23:37 +00:00
TheGamecraft
e536ef7e0a ALPHA 3.0.2b 2018-09-10 09:13:10 -04:00
TheGamecraft
0e0ef86b71 ALPHA 3.0.2a 2018-09-10 08:51:18 -04:00
Mathieu Lagace
7a02d2b42b Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!2
2018-09-08 16:41:29 +00:00
TheGamecraft
7fe13ae0a7 ALPHA 3.0.3 2018-09-08 12:39:49 -04:00
TheGamecraft
d5fe4d6eb6 ALPHA 3.0.2a 2018-09-06 10:09:04 -04:00
Mathieu Lagace
798ac136e4 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!1
2018-09-05 17:47:38 +00:00
TheGamecraft
3d7c45c2b2 ALPHA 3.0.2 2018-09-05 13:46:20 -04:00
TheGamecraft
8ef8057bfa ALPHA 3.0.2 2018-09-05 11:35:41 -04:00
TheGamecraft
4dbdc8fd19 ALPHA 3.0.1j 2018-08-22 13:30:37 -04:00
TheGamecraft
c77d35bd14 ALPHA 3.0.1i 2018-08-20 15:30:08 -04:00
TheGamecraft
54cdc12680 ALPHA 3.0.1h 2018-08-20 13:12:20 -04:00
TheGamecraft
5471539ab3 ALPHA 3.0.1f 2018-08-01 20:32:13 -04:00
TheGamecraft
636c17441e ALPHA 3.0.1e 2018-07-18 21:24:34 -04:00
TheGamecraft
4fa17f4136 ALPHA 3.0.1d 2018-07-17 22:00:46 -04:00
TheGamecraft
337c96f6f5 ALPHA 3.0.1d 2018-07-17 21:57:05 -04:00
TheGamecraft
40a95d906a ALPHA 3.0.1c 2018-07-17 08:56:20 -04:00
TheGamecraft
af458ad411 3.0.1c 2018-07-16 20:28:57 -04:00
TheGamecraft
2b2b726838 Router Update 2018-07-14 15:34:49 -04:00
TheGamecraft
9681e73fe1 ALPHA 3.0.1b 2018-07-13 21:14:00 -04:00
TheGamecraft
5d3a9fa902 Merge gitlab.com:TheGamecraft/c-cms
Conflicts:
	.gitignore
	app/Http/Controllers/AdminController.php
	app/Providers/AppServiceProvider.php
	app/User.php
	artisan
	bootstrap/cache/.gitignore
	composer.lock
	config/app.php
	database/migrations/2014_10_12_000000_create_users_table.php
	readme.md
	resources/views/admin/dashboard.blade.php
	resources/views/auth/login.blade.php
	resources/views/layouts/admin/header.blade.php
	routes/web.php
	storage/app/.gitignore
	storage/app/public/.gitignore
	storage/framework/.gitignore
	storage/framework/cache/.gitignore
	storage/framework/sessions/.gitignore
	storage/framework/testing/.gitignore
	storage/framework/views/.gitignore
	storage/logs/.gitignore
2018-07-13 13:36:39 -04:00
TheGamecraft
51b5bc0500 ALPHA 3.0.1a 2018-07-13 12:41:23 -04:00
Mathieu Lagace
ba4114a66c Update readme.md 2018-07-11 23:05:51 +00:00
Mathieu Lagace
5fa3c85b97 Include Vendor 2018-06-27 20:31:54 -04:00
Mathieu Lagace
d0807a7cf5 Modification au readme 2018-06-27 20:17:50 -04:00
Mathieu Lagace
1b12533bba Modification du readme 2018-06-27 20:09:21 -04:00