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

12 Commits

Author SHA1 Message Date
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
1c27778001 Merge branch '3.8' 
Conflicts:
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
 2013-10-31 17:56:48 +01:00
Romain Neutron
664339e3ec Merge pull request #742 from romainneutron/fix-1555 
Fix #1555 : API sessions remain open
 2013-10-31 08:35:00 -07:00
Romain Neutron
24a6dce598 Fix #1555 : API sessions remains open 2013-10-31 15:19:24 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
5f015b924f Declare API controllers as services, remove "call" methods 2013-10-30 18:59:15 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
2baa5a6484 Fix merge 2013-09-14 02:12:20 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
0247c20634 Merge API root, API v1 and API oauth2 application in a single one 2013-05-24 15:37:02 +02:00