hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,689 Commits 268 Branches 107 Tags
b23115d38d3fa40db2d2dba1cb784bcecbfe84d2
Commit Graph

457 Commits

Author SHA1 Message Date
Nicolas Le Goff
ec8d577a41 Add missing class declaration 
Fix tests

Update tests

Fix CS
 2012-10-19 17:32:12 +02:00
Nicolas Le Goff
12fe0c2283 Remove duplicated routes 
Fix Cs

FixCS
 2012-10-19 17:32:05 +02:00
Romain Neutron
c811a334ba Fix IE Download 2012-10-18 16:41:59 +02:00
Nicolas Le Goff
cb1395900e Fix query tests 2012-10-18 15:45:54 +02:00
Nicolas Le Goff
bda5821635 Split display status & type property into two separate controllers 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
f047c83c17 Fix PR 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
45c3e564df Fix PR 
Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
1f4debee45 Fix Tests 
remove useless comment

Add end line

Conflicts:

	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
89eac37046 Fix tools window 2012-10-18 15:45:51 +02:00
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
19f1bca120 Fix CS 
Add comments

Remove bad ident

Undo modification

Conflicts:

	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
6d32acaa3d Add record property tests 2012-10-18 15:45:50 +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
61e8347628 Fix master 2012-10-15 20:46:33 +02:00
Romain Neutron
e8b32d8e03 Merge with 3.7 2012-10-10 11:34:21 +02:00
Romain Neutron
c01af76587 Add TOU route 2012-10-09 14:18:31 +02:00
Romain Neutron
0f2c92654a Use record request 2012-10-04 22:15:35 +02:00
Romain Neutron
b129079e79 More precision in request parameters 2012-10-04 22:11:46 +02:00
Romain Neutron
a9a24d5424 Add firewalls 2012-10-04 16:54:47 +02:00
Romain Neutron
13b67dfe37 Update Firewall API 2012-10-04 15:44:53 +02:00
Romain Neutron
ad11bd0f51 Update Border File API 2012-10-04 15:44:50 +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
1700565862 Cleanup namepaces, variables uses 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
f68cae2bb4 Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
3f9dc687dc Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
abc4d81521 Update controllers 2012-10-04 15:42:54 +02:00
Romain Neutron
2c7a3be278 Update controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
1fc9a78e7f Update prod controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
77b49bbff9 Refactor Edit Route 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
2aae5331ab Fix merge 2012-09-27 14:53:24 +02:00
Romain Neutron
dbfeb91ed3 Fix #910 : wrong file extension after substitution 2012-09-27 14:22:11 +02:00
Romain Neutron
9dd1575dc9 Move Events Manager to service 2012-09-27 14:19:48 +02:00
Romain Neutron
686f8f59c5 Fix #910 : wrong file extension after substitution 2012-09-27 12:55:00 +02:00
Romain Neutron
b86c3ed0c0 Move Events Manager to service 2012-09-24 18:36:40 +02:00
Romain Neutron
a80073395d Merge with 3.7 2012-09-14 16:18:22 +02:00
Romain Neutron
05055c7272 Add empty lazaret route 2012-09-14 14:16:24 +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
7600e08117 Add dirty hack to fix download under HTTPS with IE 2012-09-10 17:55:13 +02:00
Nicolas Le Goff
e214a2445a remove set_order_admins 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
Nicolas Le Goff
1e80ec1cb0 remove sql that used inexisting table 
add missing namespace
 2012-09-03 18:08:58 +02:00
Nicolas Le Goff
3fc282e612 file are now uploading following user order 
fix typo
 2012-09-03 16:54:40 +02:00