Commit Graph

315 Commits

Author SHA1 Message Date
Romain Neutron
fd3d46ddcd Merge branch 'FixExtension' into Dev 2012-03-27 15:21:37 +02:00
Romain Neutron
dfe6a75846 Fix extension parameters load 2012-03-27 15:17:54 +02:00
Romain Neutron
87ad76fc02 Fix check extension for businessfields 2012-03-27 15:09:53 +02:00
Romain Neutron
5427d334c3 Fix tasks for 3.6+ 2012-03-27 14:43:05 +02:00
Romain Neutron
c0dfe1657b Merge branch 'BusinessFields' into Dev 2012-03-26 14:21:16 +02:00
Romain Neutron
938cd9276d Merge branch 'master' into Dev 2012-03-26 14:20:52 +02:00
Romain Neutron
5acfdf0f3c Merge with 3.5 2012-03-26 14:12:52 +02:00
Romain Neutron
f85d159ea0 Add correct Exit status 2012-03-26 13:48:06 +02:00
Romain Neutron
0ecb391e8d Fix scheduler status 2012-03-21 11:56:48 +01:00
Romain Neutron
415be93920 Cleanup after merge 2012-03-20 21:29:20 +01:00
Romain Neutron
9bce2cf3a5 Refactor caption serialization 2012-03-20 15:44:32 +01:00
Romain Neutron
a10fb04999 Remove report::getChamp 2012-03-20 14:50:36 +01:00
Romain Neutron
4c7f3897bf Fix build 2012-03-20 13:40:00 +01:00
Romain Neutron
e286c84eb1 Merge with Scheduler 2 branch 2012-03-19 19:14:10 +01:00
Romain Neutron
fa698fbdda Coding Standards 2012-03-19 19:04:48 +01:00
Nicolas Le Goff
5557d8b8b7 refactor service interface 2012-03-15 16:43:23 +01:00
Romain Neutron
d654525e81 Fix Stamp 2012-03-15 15:30:14 +01:00
Romain Neutron
ca2bcda6cc Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-03-15 15:15:13 +01:00
Romain Neutron
c6aad35bef Cleanup 2012-03-15 14:39:30 +01:00
Romain Neutron
0d996d6105 Code Cleanup 2012-03-15 14:37:40 +01:00
Nicolas Le Goff
aace1a0847 add check for binary 2012-03-13 14:58:08 +01:00
Nicolas Le Goff
85292715de fix appbox::get_instance issue 2012-03-13 14:47:43 +01:00
Romain Neutron
da054b4275 Merge with master 2012-03-12 17:06:57 +01:00
Romain Neutron
57184ca48b Add commandline extension check 2012-03-12 16:53:13 +01:00
Romain Neutron
a506faa4e5 Add commands to manage databox fields command line 2012-03-12 16:53:02 +01:00
Romain Neutron
7992bbb8d8 Refactor sphinx suggestion builder 2012-03-12 16:52:49 +01:00
Romain Neutron
2db42f22fb Fix description 2012-03-12 16:52:35 +01:00
Romain Neutron
4d8664de2e Refactor dump base 2012-03-12 16:50:17 +01:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Romain Neutron
78fd25cb78 Fix command message 2012-03-07 18:22:14 +01:00
jygaulier
8bd291f569 Merge with master 2012-03-07 11:22:08 +01:00
Romain Neutron
d767857b48 Correct messages 2012-03-05 19:08:54 +01:00
Romain Neutron
434e7075cb Add ensuredevsettings task 2012-03-05 19:08:40 +01:00
Romain Neutron
60214728a6 Add a strict mode to ensure ProductionSettings 2012-03-05 18:51:05 +01:00
Nicolas Le Goff
73f4a5438d fix #487 noms des utilisateurs manquants dans un tableau 2012-03-01 16:19:25 +01:00
Nicolas Le Goff
ef95c197bc disable display of notice if its not possible to reach memcache server 2012-02-28 17:37:43 +01:00
Nicolas Le Goff
0cd55b289f fix #463 Erreur nombre de téléchargement dans Report 2012-02-28 15:31:53 +01:00
Romain Neutron
c50118007d Fix config check 2012-02-27 15:33:12 +01:00
Nicolas Le Goff
1ea745e297 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-23 15:36:05 +01:00
Nicolas Le Goff
634de85b37 fix report title 2012-02-23 15:34:25 +01:00
Romain Neutron
6a1ff85c29 Refactor Upgrade 2012-02-23 15:15:03 +01:00
Romain Neutron
157a6b51ff Upgrade console commands 2012-02-23 10:28:10 +01:00
Romain Neutron
d1412de7ea Refactor Configuration 2012-02-22 18:38:59 +01:00
Romain Neutron
aa9d5171b0 Refactor Configuration 2012-02-22 18:05:35 +01:00
Romain Neutron
991a43fcd5 Enhanced EnsureProductionSettings 2012-02-22 11:43:20 +01:00
Romain Neutron
7eaa468907 Fix Upgrade Script 2012-02-21 18:24:05 +01:00
Romain Neutron
00fad09ed8 Fix tests 2012-02-21 18:03:05 +01:00
Romain Neutron
2c0a3f619f Refactor ServiceBuilder 2012-02-21 16:34:31 +01:00
Romain Neutron
6ce734c50d Refactor Appbox 2012-02-21 16:08:28 +01:00
Romain Neutron
a574dd14a8 Refactor Appbox 2012-02-21 16:07:34 +01:00