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

2358 Commits

Author SHA1 Message Date
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
151fed4d1b fix bad CS 2012-09-17 13:38:19 +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
70f64da8d1 Merge branch '3.7' 2012-09-14 17:00:07 +02:00
Romain Neutron
becf617f52 Fix SQL 2012-09-14 16:59:32 +02:00
Romain Neutron
f6b6605e93 Merge branch '3.7' 2012-09-14 16:41:50 +02:00
Romain Neutron
8cca2b9f90 Merge pull request #213 from jygaulier/ArchiveTask 
fic CTRLC
 2012-09-14 07:41:01 -07:00
Romain Neutron
a80073395d Merge with 3.7 2012-09-14 16:18:22 +02:00
Romain Neutron
177b622241 Revert SQL 2012-09-14 16:14:26 +02:00
Romain Neutron
bded0d2df1 Fix CS 2012-09-14 16:13:28 +02:00
Romain Neutron
b6faccb50d Fix Feed Collection 2012-09-14 15:23:06 +02:00
Romain Neutron
39782c6b4c Fix typo 2012-09-14 14:16:48 +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
jygaulier
cd95cfa152 fic CTRLC 2012-09-13 16:53:23 +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
4bb1a1d870 Merge branch '3.7' 2012-09-13 12:31:20 +02:00
Romain Neutron
8dc6afc88f Switch to constants 2012-09-13 12:29:48 +02:00
Romain Neutron
6ce46aed18 Fix archive task 2012-09-13 12:29:38 +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
1c592224d9 Add option -y (answer yes to all questions) and -f (force upgrade even if a concurrent one is running) to system:upgrade command 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
35df701d4c Add option -y (answer yes to all questions) and -f (force upgrade even if a concurrent one is running) to system:upgrade command 2012-09-10 13:39:48 +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
Nicolas Le Goff
a60e139ae2 delete unecessary comments 
fix typo

fix alignment

fix unit tests

fix test
 2012-09-07 12:06:06 +02:00
Nicolas Le Goff
74ce2341a2 delete set_ordermanager & set_exportorder classes 2012-09-07 12:06:06 +02:00
Nicolas Le Goff
5e73786192 fix typo 2012-09-07 12:06:05 +02:00
Nicolas Le Goff
623469063f refactor /prod/order/ 
add tests

fix tests

use url_generator & remove debug variable

remove jquery.order.js from  minify

use proper way to pass parameters when building URL with url_generator
 2012-09-07 12:06:05 +02:00
Nicolas Le Goff
040be049b9 review of order javascript 2012-09-07 12:06:04 +02:00
Nicolas Le Goff
0494590523 add order controller 
add order controller
 2012-09-07 12:06:04 +02:00
Romain Neutron
b162057f37 Merge 3.7 2012-09-06 14:30:55 +02:00
Romain Neutron
b583b76536 Ass browser::supportFileAPI method 2012-09-06 14:24:06 +02:00
Romain Neutron
24e2bd4583 Fix files copy 2012-09-04 16:47:32 +02:00
Romain Neutron
03e1beb879 Fix upgrade process 2012-09-04 11:49:02 +02:00