hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,793 Commits 268 Branches 107 Tags
6ac004a24b7dc84845bc05e09f47d50b51a3c1cd
Commit Graph

992 Commits

Author SHA1 Message Date
Romain Neutron
cf7fcf490c fix application 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
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
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
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
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
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
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
002f4e2b7d post merge cleanup 2012-09-19 15:39:52 +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
90841c5ba1 fusion task, tasks, scheduler dans taskmanager 
todo : tests
 2012-09-17 14:16:15 +02:00
jygaulier
6e302e85a4 silexing taskmanager & tasks 2012-09-17 14:16:15 +02:00
jygaulier
883cb1dec6 en cours : silexing taskmanager : add first tests 2012-09-17 13:38:19 +02:00
jygaulier
7a9dd3b612 en cours : silexing taskmanager 2012-09-17 13:38:19 +02:00
jygaulier
be24152468 en cours : silexing taskmanager 2012-09-17 13:38:19 +02:00
Romain Neutron
a80073395d Merge with 3.7 2012-09-14 16:18:22 +02:00
Romain Neutron
bded0d2df1 Fix CS 2012-09-14 16:13:28 +02:00
Romain Neutron
05055c7272 Add empty lazaret route 2012-09-14 14:16:24 +02:00
Romain Neutron
61be8e4ad7 Split value of Phraseanet TF fields 2012-09-14 12:34:02 +02:00
Romain Neutron
0cb823f65e Enhance lightbox error message 2012-09-14 11:58:58 +02:00
Romain Neutron
b2f0c701ea Fix caption inclusion 2012-09-14 11:53:04 +02:00
Romain Neutron
a8209d8c1c Fix story picture definition 2012-09-14 11:43:08 +02:00
Romain Neutron
6b0aff4d72 Merge branch '3.7' 2012-09-13 12:47:23 +02:00
Romain Neutron
b5079ffacf Add better exception message 2012-09-13 12:44:37 +02:00
Romain Neutron
87dce41e77 Fix connection 2012-09-13 10:50:35 +02:00
grosroro
812f5817ad Fix tests 2012-09-12 17:10:26 +02:00
grosroro
9967e6aa5e Fix tests 2012-09-12 16:42:36 +02:00
grosroro
7c9aae79d0 Fix tests 2012-09-12 15:35:01 +02:00
Romain Neutron
153545e002 Add dirty hack to fix download under HTTPS with IE 2012-09-12 14:35:41 +02:00
Romain Neutron
8f5dee2d05 Bump to version 3.7.1 2012-09-12 14:27:06 +02:00
Romain Neutron
7600e08117 Add dirty hack to fix download under HTTPS with IE 2012-09-10 17:55:13 +02:00
Romain Neutron
16c49b3382 Merge pull request #187 from nlegoff/order 
Refactor orders
 2012-09-07 09:43:26 -07:00
Romain Neutron
c67652b167 Merge 3.7 2012-09-07 18:22:52 +02:00
Nicolas Le Goff
b1d087377a undo change 2012-09-07 17:02:48 +02:00
Nicolas Le Goff
a5b65f2997 add X-status-code header & fix issues 2012-09-07 16:22:09 +02:00
Nicolas Le Goff
e214a2445a remove set_order_admins 2012-09-07 12:06:06 +02:00