Commit Graph

318 Commits (ead469f0967ca5d2f227a1f701fe6469f57ad37e)

Author SHA1 Message Date
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
ppaulis c4bd1ee8e9 working on setup 2016-10-06 17:31:26 +02:00
ppaulis 29b6c971e3 working on setup 2016-10-06 17:07:20 +02:00
ppaulis 6cb44645ae working on setup 2016-10-06 16:42:09 +02:00
ppaulis a4e71aa110 working on setup 2016-10-06 16:28:26 +02:00
ppaulis 6d4e86402c working on setup 2016-10-06 16:13:21 +02:00
ppaulis 5bdf1591ed working on setup 2016-10-06 15:48:10 +02:00
ppaulis be2f09514b working on setup 2016-10-06 15:26:47 +02:00
ppaulis 6f3af81443 working on setup 2016-10-06 15:03:38 +02:00
ppaulis ad33c92b0e working on setup 2016-10-06 14:55:10 +02:00
ppaulis 0451b9c294 working on setup 2016-10-06 13:50:42 +02:00
ppaulis b4297121c0 working on setup 2016-10-06 13:29:55 +02:00
ppaulis 9e87ebe922 working on setup 2016-10-06 11:38:12 +02:00
ppaulis 8cbfe06dd9 working on setup 2016-10-06 11:19:13 +02:00
Jenkins d875c4174d Merge branch 'beta' of github.com:CASES-LU/skeleton into beta 2016-10-05 15:49:47 +02:00
Guillaume Lesniak 9f84040043 scripts: Add client upgrade DB script 2016-10-05 15:40:01 +02:00
Jerome De Almeida 6228c581fb license 2016-10-05 14:31:48 +02:00
Guillaume Lesniak 4d6ebae4fe scripts: Add ng_anr css 2016-09-28 09:22:42 +02:00
Guillaume Lesniak 2706404f6e Revert wrong commited file (added in bfd4215b3 by JDA) 2016-09-28 09:08:53 +02:00