Commit Graph

145 Commits

Author SHA1 Message Date
jygaulier
6f5ac2d417 fixes for windows 2012-05-22 10:48:41 +02:00
jygaulier
f0b1dbcee3 fixes for windows 2012-05-22 10:48:41 +02:00
jygaulier
c15a8e228c fixes for windows 2012-05-22 10:48:41 +02:00
jygaulier
5b442da08b fixes for windows 2012-05-22 10:48:41 +02:00
Romain Neutron
135420008b Delegate all exiftool commands to PHPExiftool 2012-05-04 20:17:17 +02:00
Romain Neutron
516008d84d Remove mplayer, delegate technical read to MediaVorus 2012-05-04 16:29:05 +02:00
Romain Neutron
fcd3e42737 Remove exiftool gitmodule dependency 2012-05-04 01:26:21 +02:00
Nicolas Le Goff
f674e98335 add braces 2012-05-03 21:21:56 +02:00
Nicolas Le Goff
c37ae56b2e add new routes 2012-05-03 21:20:04 +02:00
Romain Neutron
7d9eb63246 Remove unused package annotation 2012-04-26 02:09:59 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
03f3f1a4cd Add curly braces 2012-04-26 02:01:40 +02:00
Romain Neutron
ef133c283e Add curly braces 2012-04-26 02:01:24 +02:00
Romain Neutron
adc74dc1d8 Add curly braces 2012-04-26 02:00:18 +02:00
Romain Neutron
33b10d6746 Add curly braces 2012-04-26 01:55:12 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
dd994a9bd6 Fix CS 2012-04-25 17:38:49 +02:00
Romain Neutron
6eb0d0b000 Remove debug 2012-04-25 13:34:18 +02:00
Romain Neutron
cc554909c0 Merge 3.6 fixes 2012-03-30 14:52:43 +02:00
Romain Neutron
bcd970e434 Default period is 10 seconds 2012-03-30 14:37:09 +02:00
Romain Neutron
46f1dba42a Default period is 10 seconds 2012-03-30 14:34:40 +02:00
Romain Neutron
815a15fe5e Add businessfields option to FTP 2012-03-22 18:26:20 +01:00
Romain Neutron
e1bee8225a Remove business field check in meta writing as it is already check 2012-03-21 11:59:59 +01:00
Romain Neutron
0ecb391e8d Fix scheduler status 2012-03-21 11:56:48 +01:00
Romain Neutron
183eb30489 Disable business fields 2012-03-21 09:41:58 +01:00
Romain Neutron
7a82a72e30 Cleanup after merge 2012-03-20 21:29:52 +01:00
Romain Neutron
384552d4b8 Refactor set_export::getCaption 2012-03-20 19:11:09 +01:00
Romain Neutron
583ee314b4 Refactor caption serialization 2012-03-20 15:42:59 +01:00
Romain Neutron
a49157b7d6 Fix build 2012-03-19 19:36:07 +01:00
Romain Neutron
e286c84eb1 Merge with Scheduler 2 branch 2012-03-19 19:14:10 +01:00
jygaulier
8bd291f569 Merge with master 2012-03-07 11:22:08 +01:00
jygaulier
8c767d28c7 New scheduler 2012-03-07 11:08:54 +01:00
Romain Neutron
4d01c23b63 Merge branch 'HotFix' into 3.6 2012-02-23 19:01:51 +01:00
Romain Neutron
584b3cc4b2 Fix meta writing 2012-02-23 19:01:22 +01:00
Romain Neutron
cc8acb342e Refactor Appbox 2012-02-21 16:26:07 +01:00
Romain Neutron
a574dd14a8 Refactor Appbox 2012-02-21 16:07:34 +01:00
Romain Neutron
f761cd32b9 Fix WriteMetas 2012-02-15 19:28:15 +01:00
Romain Neutron
0c8a7ac84e Removed console.log 2012-02-02 16:31:31 +01:00
Romain Neutron
a9c7ed23cb Coding standards 2012-02-02 15:43:12 +01:00
Romain Neutron
067561a734 Merge with master 2012-01-31 22:22:54 +01:00
jygaulier
5feebb8355 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-01-31 20:06:55 +01:00
jygaulier
ab44742882 fix #262 : archive task / waiting for a 'magic file' in any subfolder locked whole archiving 2012-01-31 19:30:40 +01:00
jygaulier
72078aa836 - 2012-01-31 19:21:06 +01:00
Romain Neutron
99a344774f Coding standards 2012-01-31 18:35:27 +01:00
Romain Neutron
69abf305d4 Removed sleep connections 2012-01-31 11:33:35 +01:00
Romain Neutron
190b5992ff Cleaning opened connections 2012-01-30 12:00:34 +01:00
Romain Neutron
b299e7d042 Fix build 2012-01-26 19:12:51 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
de5ffe76ae Cleanup 2012-01-25 18:47:04 +01:00
Romain Neutron
e1c95b49a5 Merge with master 2012-01-25 17:25:25 +01:00