Commit Graph

16 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
e0f6be3425 Remove eval calls 2013-09-04 14:39:30 +02:00
Romain Neutron
341156f6d7 Fix Migration 3.8 2013-06-11 18:11:42 +02:00
Romain Neutron
3077ce08ec Move patch to migration 2013-06-11 16:27:22 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02: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
c5e9b1f7b5 [SearchEngine] Add support for queries by date 2013-01-17 12:01:41 +01:00
Romain Neutron
61e8347628 Fix master 2012-10-15 20:46:33 +02:00
Romain Neutron
7612a98914 Fix registry 2012-10-10 13:04:05 +02:00
Romain Neutron
004216bfc6 Fix tests 2012-10-04 15:47:58 +02:00
Romain Neutron
908de9073b Revert test for GV 2012-10-04 15:44:52 +02:00
Romain Neutron
686bfe557f Add migrations tests 2012-10-04 15:44:52 +02:00
Romain Neutron
f9cc0a8c39 Update 3.1 migration 2012-10-04 15:44:52 +02:00
Romain Neutron
7784bd0b7a Add probes and migrations scripts 2012-10-04 15:44:51 +02:00