Commit Graph

5032 Commits

Author SHA1 Message Date
Michael RICOIS
0ce4fea9ee Recreate branch 2.5 2014-03-05 15:49:25 +00:00
Michael RICOIS
d88405da5d Update for conflict 2014-03-05 15:27:50 +00:00
Michael RICOIS
682ffa273e Remove conflict 2014-03-05 15:24:59 +00:00
Michael RICOIS
3b76e2869b Update for conflict 2014-03-05 15:20:42 +00:00
Michael RICOIS
e08564bad5 Correction Bilan association 2014-03-05 15:11:14 +00:00
Michael RICOIS
e13292170b Reintegrate trunk 2014-03-05 10:39:49 +00:00
Michael RICOIS
c087d459ff Only prop 2014-03-04 15:46:50 +00:00
Aram HARUTYUNYAN
176df57c98 Issue #0001873: [liens inter-entreprises] Utiliser les codes Voies défini par l'INSEE pour standardiser les adresses 2014-03-04 08:16:20 +00:00
Michael RICOIS
c996d61419 Prepare for release 2014-03-03 16:40:07 +00:00
Aram HARUTYUNYAN
6776e6dcad Issue #0001882: le problème vient de la valeur du pays 2014-03-03 12:22:26 +00:00
Michael RICOIS
918c42d7c9 Fix Issue #0001876 : Solve bad merge on file Menu.php and Streetview.php 2014-02-28 09:31:24 +00:00
Aram HARUTYUNYAN
7b8f3bd07b Issue #0001876: using Scores_Google_streetview->urlImg() instead of serveUrl() 2014-02-28 08:30:49 +00:00
Aram HARUTYUNYAN
c195387ef1 Issue #0001820: [Liens inter-entreprises] Afficher les documents liés (3 ou plus) 2014-02-28 08:06:51 +00:00
Aram HARUTYUNYAN
0d5bbe188a Issue #0001766: [Liens inter-entreprises] Ajouter le lien "Lancer une recherche dirigeant" pour PP 2014-02-28 07:53:17 +00:00
Michael RICOIS
045572ca57 Remove unused library 2014-02-27 16:16:26 +00:00
Michael RICOIS
a467e0a4d5 Use new Zend ClassMap Autoloader : More performance with APC and make change in config for the 2.5 branch 2014-02-27 16:15:01 +00:00
Michael RICOIS
7b0cef6538 Reintegrate trunk 2014-02-27 15:33:51 +00:00
Michael RICOIS
2f79588096 Use new Zend Autoload : More performance with APC 2014-02-27 15:13:46 +00:00
Michael RICOIS
42815cbbcd ....c... 2014-02-27 15:09:27 +00:00
Michael RICOIS
a435cc2d2c Merge for release 2014-02-27 10:32:09 +00:00
Michael RICOIS
5290b988a5 Check branch consistency 2014-02-25 23:27:46 +00:00
Michael RICOIS
ac83da9f1e Try to rebase from trunk 2014-02-25 22:26:47 +00:00
Michael RICOIS
af003f159d issue #0001870 : Merge pagination 2014-02-25 20:39:38 +00:00
Michael RICOIS
c7df7e757a Prepare for release 2014-02-25 16:58:40 +00:00
Michael RICOIS
df07357416 Big update from branch 2.4, new dev must be here 2014-02-25 16:20:09 +00:00
Michael RICOIS
7fe024283d Prepare for release 2014-02-13 14:41:39 +00:00
Michael RICOIS
9ba1a34095 Merge from 2.4, prepare to release 2014-01-16 09:33:31 +00:00
Michael RICOIS
c9b083ceb8 Merge from branch 2.4 2013-12-26 14:42:44 +00:00
Michael RICOIS
43d2addc09 Merge from 2.4 for release 2013-11-29 13:54:52 +00:00
Michael RICOIS
b9c388a79f Merge for release in staging 2013-11-21 16:31:49 +00:00
Michael RICOIS
d3ffafb3fe Merge from branch 2.4 - Ready for release 2013-11-18 14:49:04 +00:00
Michael RICOIS
0f71a6bcaf Merge from branch 2.4 2013-11-13 14:10:30 +00:00
Arman KYOKCHAN
86c4c07893 issue #0001627: Add Etablissements 2013-11-08 13:36:37 +00:00
Michael RICOIS
5b5270159c Import change and correction after the staging release 2013-11-06 16:26:14 +00:00
Michael RICOIS
dcaae4acfc Merge from 2.4 2013-11-05 14:45:25 +00:00
Arman KYOKCHAN
be6fc63491 issue #0001627: design changes 2013-11-01 13:59:51 +00:00
Arman KYOKCHAN
cf7f39d741 issue #0001627: search form and entreprise identity 2013-11-01 11:43:12 +00:00
Arman KYOKCHAN
6f5b29be85 issue #0001627: Add the logic to the theme plugin, interface change 2013-10-29 07:37:41 +00:00
Michael RICOIS
add02110b8 Merge, update from trunk 2013-10-27 16:22:33 +00:00
Michael RICOIS
b2563fe35f Merge following to correct regression from the last release 2013-10-25 14:30:46 +00:00
Michael RICOIS
ebe57c498c Merge from branche 2.4 : Prepare to release in staging 2013-10-23 14:20:56 +00:00
Michael RICOIS
56040500cb Merge 2013-10-16 07:54:35 +00:00
Michael RICOIS
201a2b45e4 Merge from branch 2.4 2013-10-04 12:41:24 +00:00
Michael RICOIS
de20a05968 Correction after release 2013-09-23 15:26:02 +00:00
Michael RICOIS
9a0cbca281 Merge for release 2013-09-23 08:47:30 +00:00
Michael RICOIS
2e565ac066 Merge all change from 2.4 2013-09-16 15:41:31 +00:00
Michael RICOIS
6fd02854f8 Merge from trunk 2013-08-30 15:12:56 +00:00
Michael RICOIS
932e5fc208 Merge correction 2013-08-20 13:56:03 +00:00
Michael RICOIS
492534c329 Merge giant 2013-08-20 13:48:53 +00:00
Michael RICOIS
33b66b0df3 Add new code to manage webservice connection 2013-08-20 13:09:31 +00:00