Nicolas Le Goff
|
10a83bc6c4
|
Fix latest merge
|
2014-10-13 12:58:20 +02:00 |
|
Nicolas Le Goff
|
6485b64e68
|
Fix latest merge
|
2014-08-20 15:13:41 +02:00 |
|
Nicolas Le Goff
|
353d625f9a
|
Fix latest merge
|
2014-08-19 14:59:48 +02:00 |
|
Nicolas Le Goff
|
81763db182
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Order.php
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
lib/Alchemy/Phrasea/Helper/Record/Helper.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/caption/record.php
lib/classes/registry.php
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
|
2014-08-19 12:17:18 +02:00 |
|
Nicolas Le Goff
|
66fa05f4ee
|
Fix CS
|
2014-07-17 15:17:04 +02:00 |
|
Nicolas Le Goff
|
24b885eb7c
|
Fix tests
|
2014-07-03 15:07:35 +02:00 |
|
Nicolas Le Goff
|
178da6a3a6
|
Fix tests
|
2014-03-24 12:29:38 +01:00 |
|
Nicolas Le Goff
|
80bf2a2f57
|
Fix tests
|
2014-03-24 12:28:20 +01:00 |
|
Nicolas Le Goff
|
c107bc9cb9
|
Delete references to API_OAuth2_Token class
|
2014-03-24 12:28:18 +01:00 |
|
Nicolas Le Goff
|
fd38ec9b79
|
Delete references to API_OAuth2_Account class
|
2014-03-24 12:28:17 +01:00 |
|
Nicolas Le Goff
|
d1d936d8b8
|
Update ApiApplication method call
|
2014-03-24 12:28:17 +01:00 |
|
Nicolas Le Goff
|
53dda0b09e
|
Delete references to API_OAuth2_Application class
|
2014-03-24 12:28:17 +01:00 |
|
Nicolas Le Goff
|
e317f86c51
|
Fix CS
|
2014-03-23 23:07:01 +01:00 |
|
Nicolas Le Goff
|
1d8b6edc46
|
Use user manipulator to log user query
|
2014-03-04 19:53:07 +01:00 |
|
Romain Neutron
|
4695054dcf
|
Fix unit tests when running without phrasea2 extension
|
2014-03-03 19:26:44 +01:00 |
|
Romain Neutron
|
48dc4ce1d5
|
Fix latest merge
|
2014-03-03 17:26:56 +01:00 |
|
Romain Neutron
|
1713c23c59
|
Merge branch '3.8'
Conflicts:
bin/console
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/User/Adapter.php
lib/classes/media/Permalink/Adapter.php
lib/classes/media/abstract.php
lib/classes/media/subdef.php
lib/classes/p4file.php
lib/classes/record/preview.php
lib/conf.d/_GV_template.inc
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
tests/classes/media/Permalink/media_Permalink_AdapterTest.php
|
2014-03-03 17:00:17 +01:00 |
|
Romain Neutron
|
bb7267eafb
|
Use rhumsaa/uuid instead of custom uuid implementation
|
2014-03-03 11:29:23 +01:00 |
|
Romain Neutron
|
894c5fe620
|
Fix unit tests
|
2014-03-01 14:37:56 +01:00 |
|
Romain Neutron
|
08efd8ff72
|
Cleanup API
|
2014-02-28 00:38:12 +01:00 |
|