hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,981 Commits 268 Branches 107 Tags
3f26c2161db4fcbcb0537ad5fe729e9f90401190
Commit Graph

9 Commits

Author SHA1 Message Date
Romain Neutron
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +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
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00
Romain Neutron
093869d3d0 Add devices in API answer / CS / Fixes 
Add tests to media subdefs
Fix CS
Add Mplayer to build
Fix Alchemy\Phrasea\Exceptions
Add media_subdef etags
 2012-04-27 16:46:52 +02:00
Nicolas Le Goff
90b3870901 add grant_type password for oauth2Client, handle trusted client such as Phraseanet Navigator 2012-04-26 18:23:44 +02:00