Commit Graph

18 Commits

Author SHA1 Message Date
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
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
de05dcd113 Remove deprecated comments in prod controllers 2013-10-30 18:52:41 +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
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00
Romain Neutron
2507e45c9f Fix #1309 : Stories can not be removed 2013-07-11 19:06:59 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
2ad9019931 [SearchEngine] Fix after rebase 2013-01-17 12:02:44 +01:00
Romain Neutron
f0fed8bb7e Merge with 3.7 2012-10-30 11:27:50 +01:00
Nicolas Le Goff
b91fe68b0a Check for env parameter 2012-10-26 12:18:24 +02:00
Nicolas Le Goff
11b521de8b Refactor record detailed view controller
Fix typo

Fix Typo
2012-10-26 12:18:24 +02:00
Nicolas Le Goff
4b4bbddca0 Fix issue 2012-10-19 17:32:16 +02:00
Nicolas Le Goff
ec8d577a41 Add missing class declaration
Fix tests

Update tests

Fix CS
2012-10-19 17:32:12 +02:00
Nicolas Le Goff
45c3e564df Fix PR
Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	templates/web/prod/Share/record.html.twig
2012-10-18 15:45:52 +02:00