hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

370 Commits

Author SHA1 Message Date
Nicolas Le Goff
c40804287a Update refactor 
Fix indent

Conflicts:

	lib/Alchemy/Phrasea/Application/Root.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
cde9ce18ae Add prod refactor 
Fix issue

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/User/Notifications.php
	lib/Alchemy/Phrasea/Controller/User/Preferences.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
8710e0f3cb Refactor record property (status, type) 
update property route

Fixed status

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Record/Property.php
 2012-10-18 15:45:49 +02:00
Romain Neutron
246376d72f Cleanup root 2012-10-04 22:04:19 +02:00
Romain Neutron
fae290f930 Remove unused argument 2012-10-04 16:53:18 +02:00
Romain Neutron
e844de6a72 Add tests to persistent cookie 2012-10-04 16:29:38 +02:00
Romain Neutron
ebac1d1e39 Add firewall to lightbox 2012-10-04 15:48:05 +02:00
Romain Neutron
13b67dfe37 Update Firewall API 2012-10-04 15:44:53 +02:00
Romain Neutron
7d56a61713 Update setup application 2012-10-04 15:44:51 +02:00
Romain Neutron
89fe6b16af Cleanup setup 2012-10-04 15:44:51 +02:00
Romain Neutron
c3b89aa1e4 Remove eventsmanager variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
58af2b4c9c Remove get_registry method 2012-10-04 15:44:49 +02:00
Romain Neutron
c2239f5259 Disable cookie session in API 2012-10-04 15:43:36 +02:00
Romain Neutron
49b9581e91 Update applications 2012-10-04 15:43:36 +02:00
Romain Neutron
d5325dba2b Applications cleanup 2012-10-04 15:43:36 +02:00
Romain Neutron
3f9dc687dc Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
0ac8a9d8ae Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
553c2f5813 Fix tests 2012-10-04 15:43:33 +02:00
Romain Neutron
52d58b4cdf Fix API session open 2012-10-04 15:43:32 +02:00
Romain Neutron
48ad99b68b Remove overview application 2012-10-04 15:43:31 +02:00
Romain Neutron
193aeac25c Update lightbox controller 2012-10-04 15:43:15 +02:00
Romain Neutron
8e84cf980d Update setup application 2012-10-04 15:43:15 +02:00
Romain Neutron
77b0150e12 Update API and Oauth applications 2012-10-04 15:43:15 +02:00
Romain Neutron
966d3fc532 Update main application 2012-10-04 15:43:15 +02:00
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