Commit Graph

2358 Commits

Author SHA1 Message Date
Romain Neutron
21fa097c81 Fix CS 2012-10-04 15:31:36 +02:00
Romain Neutron
eb9600b19e Update Phrasea Border to the latest service 2012-10-04 15:31:36 +02:00
Romain Neutron
cf7fcf490c fix application 2012-10-04 15:31:36 +02:00
Romain Neutron
e176823f80 Fix interface 2012-10-04 15:31:36 +02:00
Romain Neutron
77b49bbff9 Refactor Edit Route 2012-10-04 15:31:36 +02:00
Romain Neutron
703bf74110 Update Tags to latest PHPExiftool API 2012-10-04 15:31:36 +02:00
Romain Neutron
863c69cc90 Fix Doc blocs 2012-10-04 15:31:36 +02:00
Romain Neutron
4b7dd0f6d6 Add collections method 2012-10-04 15:31:36 +02:00
Romain Neutron
1a3461d5fc Update to filesystem service provider 2012-10-04 15:31:36 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
romain
09520db2b5 Fix #924 : Add permanent cookie only if necessary 2012-10-04 11:27:26 +02:00
romain
8deacf0d01 Backport JY changes 2012-10-04 11:13:07 +02:00
Nicolas Le Goff
04c2acffa3 Fix #915 Strip html tags from caption values when caption is printed out
update #922

escape js value

fix alignment
2012-10-03 13:57:48 +02:00
Romain Neutron
801d401751 Add sit_session log key 2012-10-01 15:17:19 +02:00
Romain Neutron
4d7c0a3c0d Disable stamp / watermark check for thumbnails 2012-10-01 14:38:14 +02:00
Romain Neutron
2aae5331ab Fix merge 2012-09-27 14:53:24 +02:00
Romain Neutron
b10c6120fa Fix #901 : allow upgrade from Phraseanet 3.1 2012-09-27 14:22:31 +02:00
Romain Neutron
dbfeb91ed3 Fix #910 : wrong file extension after substitution 2012-09-27 14:22:11 +02:00
jygaulier
537f14268f reverts 2012-09-27 14:20:59 +02:00
jygaulier
ec9ce01a6e CS 2012-09-27 14:20:59 +02:00
jygaulier
255cc7b3ad security fix
fix bug : indexer did not start
2012-09-27 14:20:37 +02:00
jygaulier
bfc1ddcb5f fix issue 895 (scheduler creates zombies)
fix bug in windows : tasks did not start
cleanup
2012-09-27 14:19:50 +02:00
Nicolas Le Goff
eb73d9b907 add download query parameter to get file overview as an atachement
simpliest test
2012-09-27 14:19:49 +02:00
Nicolas Le Goff
08ae7bad76 add "feed_id" property for a feed entry
revert CS

change feed property order
2012-09-27 14:19:49 +02:00
Romain Neutron
de2c9e33de Fix #903 2012-09-27 14:19:48 +02:00
Romain Neutron
2a4bfa2a8a Fix 2012-09-27 14:19:48 +02:00
Romain Neutron
9dd1575dc9 Move Events Manager to service 2012-09-27 14:19:48 +02:00
Romain Neutron
e96a861f0a Fix #901 : allow upgrade from Phraseanet 3.1 2012-09-27 12:56:06 +02:00
Romain Neutron
686f8f59c5 Fix #910 : wrong file extension after substitution 2012-09-27 12:55:00 +02:00
Romain Neutron
7b20efd430 Merge pull request #223 from jygaulier/fix895
fix issue 895 (scheduler creates zombies)
2012-09-27 01:41:10 -07:00
Romain Neutron
47e8622660 Merge pull request #221 from nlegoff/attachement
add a download query parameter to get file overview as an attachement
2012-09-27 01:39:09 -07:00
Romain Neutron
dca51cf56d Merge pull request #218 from romainneutron/Fixes
Fixes
2012-09-27 01:38:49 -07:00
jygaulier
9476fb6b51 reverts 2012-09-26 17:52:07 +02:00
jygaulier
7e2d522c77 CS 2012-09-26 17:14:14 +02:00
jygaulier
a078aac6da security fix
fix bug : indexer did not start
2012-09-26 17:04:02 +02:00
jygaulier
bdc059028a fix issue 895 (scheduler creates zombies)
fix bug in windows : tasks did not start
cleanup
2012-09-26 15:27:14 +02:00
Nicolas Le Goff
9547ae1473 add download query parameter to get file overview as an atachement
simpliest test
2012-09-26 14:51:46 +02:00
Nicolas Le Goff
f446937e26 add "feed_id" property for a feed entry
revert CS

change feed property order
2012-09-25 16:50:19 +02:00
Romain Neutron
003421d9ae Fix #903 2012-09-24 19:15:08 +02:00
Romain Neutron
be27057b3b Fix 2012-09-24 18:36:46 +02:00
Romain Neutron
b86c3ed0c0 Move Events Manager to service 2012-09-24 18:36:40 +02:00
Romain Neutron
0037c593dc Cleanup 2012-09-19 15:42:15 +02:00
Romain Neutron
70a3244431 post merge cleanup 2012-09-19 15:39:55 +02:00
Romain Neutron
002f4e2b7d post merge cleanup 2012-09-19 15:39:52 +02:00
Romain Neutron
8e8fdf4dfc post merge cleanup 2012-09-19 15:39:48 +02:00
Romain Neutron
4e18f12fe4 Rename files 2012-09-19 15:39:29 +02:00
jygaulier
8c5d5340ca apply comments of pull request 2012-09-17 15:37:06 +02:00
jygaulier
ab7b61d885 apply comments of pull request 2012-09-17 15:29:58 +02:00
jygaulier
9a008c631a apply comments of pull request 2012-09-17 15:24:50 +02:00
jygaulier
17eb3b0176 fix some tasks bugs, delete old files 2012-09-17 14:16:15 +02:00