Commit Graph

1016 Commits (fe4bff4a7aa3d0be339c67db828923cb018c3c97)

Author SHA1 Message Date
Ruslan Baidan ea7f92f2d7 Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO 2019-11-21 09:41:54 +01:00
Ruslan Baidan e9fd4060b1
Fixed the composer to use temporary dev-master for the core and frontoffice dependencies. 2019-11-21 09:41:45 +01:00
Cédric Bonhomme 8fafc4fcfe
updated node 2019-11-21 08:34:50 +01:00
Cédric Bonhomme 5b1f2d4397 Merge branch 'master' of github.com:monarc-project/MonarcAppFO 2019-11-21 08:32:22 +01:00
Cédric Bonhomme f9bbc2ac7d
creation of cache folders 2019-11-21 08:31:22 +01:00
Ruslan Baidan 228379c290
Temporary used `dev-master` version. 2019-11-20 16:03:29 +01:00
Ruslan Baidan e3833e615e Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO 2019-11-20 15:27:15 +01:00
Ruslan Baidan 2352ea1d13 Updated the composer.lock. 2019-11-20 15:26:21 +01:00
Ruslan Baidan 50addf094d
Restored the pasword encription.Updated the composer.lock. 2019-11-20 15:25:12 +01:00
Ruslan Baidan 392726dec1
Updated the composer.lock. 2019-11-20 13:33:54 +01:00
Ruslan Baidan 2f2f90e4ba Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO 2019-11-20 12:17:31 +01:00
Ruslan Baidan 3a777f3ad6
Updated the composer.lock. 2019-11-20 12:17:23 +01:00
Cédric Bonhomme cd881eb905
Removed data folder and updated .gitignore file. 2019-11-20 10:30:42 +01:00
Cédric Bonhomme 1678150bc7 Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO 2019-11-20 10:23:06 +01:00
Cédric Bonhomme a841bc1932
Updated install scripts. 2019-11-20 10:22:59 +01:00
Ruslan Baidan c35a228c10
Updated the composer.lock. 2019-11-20 10:14:26 +01:00
Cédric Bonhomme fbdf47896e
updated .gitignore 2019-11-19 22:48:24 +01:00
Cédric Bonhomme e79a2b9872 Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO 2019-11-19 10:42:25 +01:00
Cédric Bonhomme d24bb44863
merged and solved conflict in composer.json 2019-11-19 10:41:37 +01:00
Cédric Bonhomme 5532024e14
merged and solved conflict in composer.lock 2019-11-19 10:39:26 +01:00
ruslanbaydan 54e49feb92
Merge pull request #202 from monarc-project/feature/upgrade-to-zf3
Feature/upgrade to zf3
2019-11-19 09:44:28 +01:00
Ruslan Baidan cdc41ed290
Changed the composer to use versions of the dependencies instead of feature branches. 2019-11-19 09:43:48 +01:00
Cédric Bonhomme fd5c9c0c43
Switched to master branch in composer.json. 2019-11-18 15:32:12 +01:00
Cédric Bonhomme 0d14a8343e
Updated CHANGELOG and composer.lock file. 2019-11-18 15:15:13 +01:00
Cédric Bonhomme 767a44039d
Updated instruction for installation under Ubuntu 18.04. 2019-11-14 08:09:15 +01:00
Cédric Bonhomme e901f5185b
updated install script 2019-11-14 08:08:49 +01:00
Cédric Bonhomme 111b5c045c
Added instructions for installation of MONARC on Debian 10. 2019-11-14 08:08:24 +01:00
Cédric Bonhomme 83ffceee92
Updated VERSION.json 2019-11-13 10:57:54 +01:00
Cédric Bonhomme 1ca9eda3dd
simplify update script 2019-11-13 10:55:30 +01:00
Cédric Bonhomme 838d788267
simplify update script 2019-11-13 10:44:35 +01:00
Cédric Bonhomme 9de7c24fe1
Added composer.lock file. 2019-11-13 10:44:07 +01:00
Cédric Bonhomme eee4f164e0
Removed now useless script. 2019-11-11 14:44:35 +01:00
Cédric Bonhomme d4b32b1c16
Removed now useless call to git pull. 2019-11-11 10:57:08 +01:00
Cédric Bonhomme 0cc498dcb9
Fixed merge conflict. 2019-10-31 11:58:42 +01:00
Ruslan Baidan 968a4147ff
Added the extension loading to enable xdebug. 2019-10-31 10:24:59 +01:00
Ruslan Baidan ec6fcde391
Fixed the vagrant command. 2019-10-30 15:09:17 +01:00
Ruslan Baidan d3914b9969
Xdebug installation fix for vagrant. 2019-10-30 11:59:44 +01:00
Ruslan Baidan 79b141d070
Cleaned up the scripts and vagrant bootstrap, updarted the docs. 2019-10-30 10:53:05 +01:00
Cédric Bonhomme 6d7ffcee72
Using APPLICATION_ENV instead of APP_ENV. 2019-10-28 13:23:06 +01:00
Cédric Bonhomme 040914e0ad Merge branch 'feature/upgrade-to-zf3' of https://github.com/monarc-project/MonarcAppFO into feature/upgrade-to-zf3 2019-10-25 10:24:18 +02:00
Ruslan Baidan 69bb75f649
Added data/json/.gitkeep file 2019-10-18 10:45:17 +02:00
Ruslan Baidan 6f803c5021
Added data/json/.gitkeep file 2019-10-18 10:45:01 +02:00
Ruslan Baidan 54ad2e91b9
Added the complete data folder to gitignore. 2019-10-18 09:54:40 +02:00
Ruslan Baidan b322bb1786
Added the changelog record, updated the version in the package and composer.lock. 2019-10-18 09:53:24 +02:00
Cédric Bonhomme 89601cd58c Merge branch 'feature/upgrade-to-zf3' of https://github.com/monarc-project/MonarcAppFO into feature/upgrade-to-zf3 2019-09-30 09:27:34 +02:00
Ruslan Baidan 1cac1050fa
Reverted the error reporting. 2019-09-30 09:18:50 +02:00
Ruslan Baidan 9104d10fa7 Merge branch 'feature/upgrade-to-zf3' of https://github.com/monarc-project/MonarcAppFO into feature/upgrade-to-zf3 2019-09-29 17:21:05 +02:00
Ruslan Baidan e052a9c3cd
Added console module and fixed composer lock. 2019-09-29 17:20:51 +02:00
Cédric Bonhomme 14b71c2cee Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO into feature/upgrade-to-zf3 2019-09-24 16:11:27 +02:00
Cédric Bonhomme 0c4b0e19ac
removed now useless Git settings 2019-09-23 11:19:05 +02:00