Commit Graph

23 Commits

Author SHA1 Message Date
Nicolas Le Goff
c4eadb7e0e Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
2014-02-05 19:42:22 +01:00
Romain Neutron
b9e4c599b2 Avoid exception driven logic 2014-02-05 16:43:49 +01:00
Nicolas Le Goff
4596bf5d30 Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
2014-02-04 11:30:23 +01:00
Romain Neutron
ef781c43c8 Avoid exception driven filters 2014-02-03 22:00:29 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +01:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +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
275ee1eae9 Use configuration tester 2012-10-04 15:44:51 +02:00
Romain Neutron
f6b983851a Update firewall 2012-10-04 15:43:13 +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
945316e387 remove calls to databox::get_instance
fix redirect issue

fix test issue as pdf-to-text service can be null

add missing registry

fix CS
2012-09-03 18:08:57 +02:00
Nicolas Le Goff
306be958f3 add /admin/setup & /admin/dashboard 2012-09-03 18:08:54 +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
Nicolas Le Goff
d1ec49c527 fix login 2012-07-18 18:26:18 +02:00
Romain Neutron
1399e28213 Add Phraseanet Service Provider and Phraseanet Application 2012-07-18 18:07:35 +02:00
Nicolas Le Goff
e2fd4c7621 add security rule 2012-07-18 17:47:51 +02:00
Nicolas Le Goff
6cb75ecec5 add /developers/ route 2012-07-18 17:15:54 +02:00
Nicolas Le Goff
79bea178b8 add Root/Account Controller 2012-07-18 17:14:30 +02:00