Romain Neutron
|
2de870c3f9
|
Add a namespace to Phraseanet doctrine entities
|
2014-02-18 19:32:08 +01:00 |
|
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
|
354232f61a
|
Bump copyright year
|
2014-01-06 15:40:56 +01:00 |
|
Romain Neutron
|
680643c0fc
|
Fix unit tests and arrays declaration
|
2013-12-03 20:06:49 +01:00 |
|
Romain Neutron
|
2ba164701d
|
Use symfony translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
051d9f4035
|
Remove license comments
|
2013-11-20 16:49:29 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
3548421160
|
Add basket converter
|
2013-11-13 17:52:12 +01:00 |
|
Romain Neutron
|
ea7523f1db
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Lightbox.php
lib/Alchemy/Phrasea/Controller/Permalink.php
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
lib/Alchemy/Phrasea/Controller/Prod/Order.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Share.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Controller/Setup.php
lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/classes/Feed/Entry/Item.php
lib/classes/record/adapter.php
lib/classes/task/Scheduler.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/writemeta.php
tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
|
2013-10-31 14:01:44 +01:00 |
|
Romain Neutron
|
1af022b84f
|
Declare prod controllers as services, remove "call" methods
|
2013-10-30 18:47:40 +01:00 |
|
Romain Neutron
|
baecfdceb3
|
Move entities to Phrasea namespace
|
2013-10-29 16:56:49 +01:00 |
|