Commit Graph

336 Commits (862879066bdc1ae4827e285d759236bc3ea17d4d)

Author SHA1 Message Date
Thomas Metois 55f3f01639 Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppBO 2017-02-14 15:53:09 +01:00
Thomas Metois 0ca268429b Fix compile translation to .po 2017-02-14 15:52:18 +01:00
Jerome De Almeida a0ac776807 application config 2017-02-13 14:47:14 +01:00
Jerome De Almeida 6891141595 modify application config 2017-02-09 13:05:41 +01:00
Jerome De Almeida 404c96d38d new version readme 2017-02-06 13:54:46 +01:00
Jerome De Almeida c0a762d9ae add image to readme 2017-02-06 13:48:01 +01:00
The Netlor Automerger 5a96a786a0 Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppBO 2017-02-06 09:33:39 +01:00
Alexandre Dulaunoy c75aa0a3b8 add: Disclaimer 2017-02-06 08:45:53 +01:00
Alexandre Dulaunoy f62231dc31 add: License added (AGPL) 2017-02-06 08:21:34 +01:00
Jerome De Almeida d684303784 Merge branch 'master' of https://rhea.netlor.fr:3000/monarc/MonarcAppBO 2017-02-01 16:41:05 +01:00
Jerome De Almeida 20ece75792 new license 2017-02-01 16:41:01 +01:00
The Netlor Automerger c26713cc5c Merge branch 'master' into beta 2017-02-01 13:46:25 +01:00
Thomas Metois e678df14ab Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppBO 2017-02-01 11:28:52 +01:00
Thomas Metois 51ca4f7325 Add logger SQL 2017-02-01 11:28:46 +01:00
Jerome De Almeida ffbbbfbfea new readme 2017-02-01 11:14:15 +01:00
Jerome De Almeida f9f1a5726a Merge branch 'master' of https://rhea.netlor.fr:3000/monarc/MonarcAppBO 2017-01-23 15:28:46 +01:00
Jerome De Almeida e2911a77a0 config 2017-01-23 15:28:41 +01:00
Thomas Metois be48f328d5 PDO > ATTR_STRINGIFY_FETCHES & ATTR_EMULATE_PREPARES = false 2017-01-23 15:01:17 +01:00
Guillaume Lesniak bc923cb8fc Use HTTPS for GitHub cloning 2017-01-20 11:11:00 +01:00
Guillaume Lesniak 0b39dc6446 Revert "Use Rhea on master for development"
This reverts commit bbcf7d56a2.
2017-01-18 14:40:24 +01:00
The Netlor Automerger c3e9880b1b Merge branch 'master' into beta
Conflicts:
	config/autoload/database.local.php.dist
	package.json
2017-01-18 14:25:40 +01:00
Jerome De Almeida 7057bfce15 modify git ignore 2017-01-10 16:53:36 +01:00
Jerome De Almeida 8ebdb2fb8f fix bug config 2017-01-10 16:51:55 +01:00
Jerome De Almeida 21479ce9a5 delete .dist not used 2017-01-10 16:44:04 +01:00
Thomas Metois 5c201fcaf5 ZF conf clear cache 2017-01-06 16:56:29 +01:00
Jerome De Almeida 99113d5c76 rollback config 2017-01-04 15:34:24 +01:00
Jerome De Almeida d98655c746 modify config 2017-01-04 11:22:32 +01:00
Thomas Metois 0d0c88f8cb Compile translations > add msgfmt for mo (gettext) 2016-12-19 16:15:19 +01:00
Thomas Metois d256e6a12c Merge branch 'master' of ssh://rhea.netlor.fr:2222/monarc/MonarcAppBO 2016-11-07 16:42:24 +01:00
Thomas Metois f705653802 Cache zf conf & use doctrine cache service 2016-11-07 16:41:36 +01:00
Guillaume Lesniak 123d95c12d update-all: Make it clear ORM caches 2016-11-07 14:16:58 +01:00
Thomas Metois 4e381e8ea5 Doctrine add cache prod env 2016-11-07 12:00:40 +01:00
ppaulis fcdddcdbab working on Phing setup 2016-11-07 09:50:23 +01:00
ppaulis e76c8021fc working on Phing setup 2016-11-07 09:20:35 +01:00
ppaulis 1cfdca6a8f working on DB setup via Phing 2016-11-02 20:00:16 +01:00
ppaulis 7ef319a6ca working on DB setup via Phing 2016-11-02 19:08:52 +01:00
ppaulis b8320a3784 working on DB setup via Phing 2016-11-02 18:00:58 +01:00
ppaulis 3d5b6e81a2 working on DB setup via Phing 2016-11-02 13:05:57 +01:00
ppaulis df92c4ea36 fixed phing target 2016-11-02 12:41:08 +01:00
ppaulis 1c0831ab6e added script to restart server 2016-11-02 10:45:41 +01:00
ppaulis 7ef826afbb fixed phing targets for db migrations 2016-11-02 10:38:13 +01:00
ppaulis f7604dfd9c fixed phing targets for db migrations 2016-11-02 10:09:27 +01:00
ppaulis 00b4e9af91 added composer.lock and removed composer.phar 2016-11-02 09:28:53 +01:00
Guillaume Lesniak 0034837ac5 scripts: Use grunt in PATH for compile_translations 2016-10-25 09:16:55 +02:00
Guillaume Lesniak b338f0ac43 Module resources: Use grunt from path in dev 2016-10-24 10:55:56 +02:00
Guillaume Lesniak 7deabb5121 package: Fix ng-* repos URLs 2016-10-24 10:44:47 +02:00
Guillaume Lesniak bbcf7d56a2 Use Rhea on master for development 2016-10-24 10:42:07 +02:00
Guillaume Lesniak 5319d756c6 Merge branch 'beta' 2016-10-24 10:38:22 +02:00
Guillaume Lesniak f0b114a784 Update composer.json branches to beta 2016-10-24 10:37:36 +02:00
Thomas Metois 588f6d01e0 faute frappe 2016-10-11 15:27:15 +02:00