hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,611 Commits 268 Branches 107 Tags
202ca1382143224a03fe0a1eea89fb18d7551a93
Commit Graph

195 Commits

Author SHA1 Message Date
Romain Neutron
90e22ed879 Move lightbox and admin into main application 2012-10-04 15:31:37 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +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
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
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
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
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
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
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
0cb823f65e Enhance lightbox error message 2012-09-14 11:58:58 +02:00
Romain Neutron
a8209d8c1c Fix story picture definition 2012-09-14 11:43:08 +02:00
grosroro
7c9aae79d0 Fix tests 2012-09-12 15:35:01 +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
74ce2341a2 delete set_ordermanager & set_exportorder classes 2012-09-07 12:06:06 +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
0494590523 add order controller 
add order controller
 2012-09-07 12:06:04 +02:00
Nicolas Le Goff
ea4a63644d rename jquery.Phraseanet.js to jquery.Mustache.js 
refactor & fix
 2012-09-03 18:09:02 +02:00
Nicolas Le Goff
db40a0bf7c fix some bugs 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
ac326491f1 Rename controllers 2012-09-03 18:08:59 +02:00
Nicolas Le Goff
155d38c7fa add missing return keyword 
fix some issues
 2012-09-03 18:08:57 +02:00
Nicolas Le Goff
e62d1e924c add details view for collection & databox; add sphinxconf; add users import & export; 
add tests
 2012-09-03 18:08:56 +02:00
Nicolas Le Goff
f3cc575674 add bas/collection controller 2012-09-03 18:08:55 +02:00
Nicolas Le Goff
72a7dc95d5 refactor global_values & databases 2012-09-03 18:08:54 +02:00
Nicolas Le Goff
306be958f3 add /admin/setup & /admin/dashboard 2012-09-03 18:08:54 +02:00
Romain Neutron
ca88e08053 Fix #865 : add route in API for scheduler infos 2012-08-31 16:22:38 +02:00
Romain Neutron
def3a2b293 Fix #865 : add route in API for scheduler infos 2012-08-29 16:15:53 +02:00
Romain Neutron
0f7056dfed Normalize request calls 2012-08-23 14:15:21 +02:00
Nicolas Le Goff
367cf7c2a4 add /login/authenticate/ 
remove  login/authenticate controller

add generateEmail function

move parent::tearDownAfterClass at the end od the function

use twitter bootstrap alert component

Update doc blocks & fix issues

add XMLHTTPRequest to PhraseanetPHPUNIt framework

fix tests

remove var_dump

refactor postlog process

fix URI's

fix redirection URI
 2012-08-21 17:32:00 +02:00
Romain Neutron
fb95aad718 Remove use of databox singleton 2012-07-26 12:29:44 +02:00
Romain Neutron
1117c64604 Workaround for HttpKernel bug in API 2012-07-24 17:59:29 +02:00
Romain Neutron
75ef4de728 Temporary fix for Silex httpkernel BC break 2012-07-24 15:44:23 +02:00
Romain Neutron
cfa04e322f Add binds 2012-07-24 13:15:50 +02:00
Romain Neutron
adeba51b20 Update templates filepaths 2012-07-24 13:12:25 +02:00
Romain Neutron
be3b098747 Rename twig templates 2012-07-24 13:12:22 +02:00
Romain Neutron
50e88b1f5a Update overview template 2012-07-24 13:11:26 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Romain Neutron
2c28295ec8 Fix admin 2012-07-19 17:54:57 +02:00