Benoît Burnichon
|
6e651f3b07
|
Replace app['phraseanet.appbox']->get_databox using trait
|
2015-07-02 12:27:26 +02:00 |
|
Benoît Burnichon
|
b272ce5aac
|
Add some groups legacy, functional, web, authenticated
|
2015-06-15 19:30:51 +02:00 |
|
Nicolas Le Goff
|
9a3e92ed9c
|
Multiple ORMs for all database
|
2015-02-12 17:58:45 +01:00 |
|
Nicolas Le Goff
|
0c18434eb4
|
Fix latest merge
|
2014-12-10 17:31:07 +01:00 |
|
Nicolas Le Goff
|
9f38823f27
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Prod/Story.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/User/Adapter.php
lib/classes/databox.php
lib/classes/media/subdef.php
lib/classes/module/report.php
lib/classes/module/report/activity.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/module/report/nav.php
lib/classes/module/report/question.php
lib/classes/module/report/sqlaction.php
lib/classes/module/report/sqlconnexion.php
lib/classes/module/report/sqldownload.php
lib/classes/module/report/sqlfilter.php
lib/classes/task/abstract.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/report/activityTest.php
tests/classes/report/editTest.php
|
2014-12-09 13:59:29 +01:00 |
|
Jean-Yves Gaulier
|
a353dc4de6
|
Report-VU : fix tests
|
2014-11-03 12:24:38 +01:00 |
|
Nicolas Le Goff
|
c156f842c7
|
Remove User_Adapter
|
2014-02-19 17:28:53 +01:00 |
|
Romain Neutron
|
c5d3f97258
|
Fix PSR-0 file naming
|
2014-02-14 15:51:09 +01:00 |
|
Romain Neutron
|
a3b1ae7163
|
Fix unit test names, property and function visibility
|
2013-12-10 01:29:02 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Nicolas Le Goff
|
4747c6d375
|
Fix tests
|
2013-02-11 14:45:38 +01:00 |
|
Nicolas Le Goff
|
88ac202a49
|
Update SQL
Update SQLs & remove doc blocks
Update SQL
Update SQL
Update SQL
Update SQL
Update SQL
|
2013-02-11 14:45:38 +01:00 |
|
Romain Neutron
|
2069d40544
|
Use composer as application autoloader
|
2013-01-18 17:47:25 +01:00 |
|