Commit Graph

563 Commits

Author SHA1 Message Date
Michael RICOIS
d9233b8f41 Merge branch 'master' of git@gitlab.factory.insight.doubletrade.com:scores/enrichissement.git 2017-04-14 15:10:47 +02:00
Michael RICOIS
f8ac6cde3a Suppression clé inutile 2017-04-14 15:09:20 +02:00
Michael RICOIS
0454d24f2b Simplification 2017-04-14 15:08:48 +02:00
Michael RICOIS
13a7c84382 Participation Total : Id pour référence 2017-04-14 11:41:22 +02:00
Michael RICOIS
8558d64228 Ajout participations total avec étranger en partant de Id liens 2017-04-14 11:34:02 +02:00
Claire DELBOS
d95c387498 Merge branch 'master' of git@gitlab.factory.insight.doubletrade.com:scores/enrichissement.git 2017-04-13 13:33:53 +02:00
Claire DELBOS
bd10f2fb8b Correction faute orthographe 2017-04-13 13:33:42 +02:00
potier
b6bd6e005e Merge branch 'develop' into 'master'
Develop into master : path library

See merge request !4
2017-04-13 08:07:34 +00:00
benoitpotier
a169927c1c Merge branch 'develop' of gitlab.factory.insight.doubletrade.com:scores/enrichissement into develop 2017-04-13 10:05:28 +02:00
benoitpotier
0bb62b7909 fix path 2017-04-13 10:05:16 +02:00
potier
f31f5eac03 Merge branch 'develop' into 'master'
Develop into master : library

See merge request !3
2017-04-12 09:41:14 +00:00
Michael RICOIS
3ca56461e3 Add environment file for composer 2017-04-11 11:04:03 +02:00
benoitpotier
09c96d954a composer 2017-04-11 10:55:32 +02:00
benoitpotier
e224a9393b change path library 2017-04-11 10:33:21 +02:00
benoitpotier
883bfb4ff9 composer 2017-04-11 09:36:45 +02:00
Claire DELBOS
ea93c983ca SD-29 pour appel via cli 2017-04-06 12:02:01 +02:00
benoitpotier
1820ed9c0b Merge branch 'master' into develop 2017-04-06 12:00:54 +02:00
potier
100c0311c7 Merge branch 'libraryviacomposer' into 'develop'
Libraryviacomposer into develop

See merge request !2
2017-04-06 09:34:05 +00:00
benoitpotier
1322ba18f9 composer.lock 2017-04-06 11:17:00 +02:00
Claire DELBOS
ad2c17750e SD-29 fil ariane + ergo du checkfile + poss de retirer une commande 2017-04-05 17:14:53 +02:00
benoitpotier
e22e863440 merge develop + fix conflict 2017-04-05 14:49:43 +02:00
Claire DELBOS
f16b444ca8 SD-29 Ajout des boutons reprise/reset 2017-04-05 14:47:50 +02:00
Claire DELBOS
f64f74b903 SD-29 modif de présentation du champs parties 2017-04-05 09:41:29 +02:00
Claire DELBOS
6839d094a1 SD-29 Remplacement des pipes par des crochets 2017-04-04 17:45:17 +02:00
Claire DELBOS
f328c4c8a1 SD-29 Ajout fil d'ariane 2017-04-04 17:26:03 +02:00
Claire DELBOS
3178234a0a SD-29 Little fix 2017-04-04 15:08:31 +02:00
Claire DELBOS
ab8f7800e3 SD-29 modif noms variables 2017-04-04 15:01:39 +02:00
Claire DELBOS
72cb2a35ba SD-29 Ergo du fileform 2017-04-04 14:54:04 +02:00
Claire DELBOS
2c5afc727b Merge branch 'develop'
Conflicts:
	application/views/scripts/profil/help.phtml
	library/Scores/Extract/Dict.php
	public/themes/default/js/profil.js
	scripts/jobs/enrichissement.php
2017-04-04 14:02:13 +02:00
Claire DELBOS
efc41df3b1 SD-29 v2 2017-04-04 13:54:22 +02:00
Claire DELBOS
35ffcdc73d SD-29 : Modifs libellés pour coller au ws + ameliorations ergo 2017-04-03 13:50:59 +02:00
Claire DELBOS
b3ff8e1398 SD-29 ajout des top + boutons retour 2017-04-03 09:37:15 +02:00
benoitpotier
929d4a3923 suppression library Metier et Scores + composer avec scores/library 2017-03-31 14:45:57 +02:00
Claire DELBOS
9817683d99 SD-29 re-js little fix 2017-03-31 14:28:27 +02:00
Claire DELBOS
e8fb280981 SD-29 fix js 2017-03-31 14:21:35 +02:00
Claire DELBOS
550c409a4b SD-29 version beta 2017-03-31 13:51:17 +02:00
Claire DELBOS
f1e51cf91c SD-29 ajout de champs en 4-5 2017-03-30 11:23:44 +02:00
Claire DELBOS
370fe4ae05 SD-29 etapes 5 et 6 2017-03-30 09:06:02 +02:00
Claire DELBOS
8519d94042 SD-29 parties 1 à 4 2017-03-29 17:12:34 +02:00
Michael RICOIS
ac2ad0a607 Library Update 2017-03-07 11:53:54 +01:00
Michael RICOIS
185ffc7f69 MMap : Catch update error 2017-02-16 14:06:01 +01:00
Michael RICOIS
dd7865f43f CS 2017-02-16 13:46:46 +01:00
Michael RICOIS
d0139de3e5 Fix Lien Code Pays 2017-02-15 11:48:45 +01:00
Michael RICOIS
bac0e4f2b8 Fix 2017-02-13 15:03:04 +01:00
Michael RICOIS
34522fdc6e Library update 2017-02-13 14:21:58 +01:00
Michael RICOIS
b550386422 Library Update 2017-02-10 11:57:34 +01:00
Michael RICOIS
55a21524b0 Library update 2017-02-02 10:00:45 +01:00
Michael RICOIS
08742cddfb Library Update 2017-01-27 15:53:59 +01:00
Michael RICOIS
19e3e26644 Library Update 2017-01-25 15:56:41 +01:00
Michael RICOIS
7abb183e7a Library Update 2017-01-23 16:23:03 +01:00