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

..

320.php

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

320a.php

Remove dead code

2013-09-04 12:14:50 +02:00

320ab.php

Bump copyright year

2013-01-21 23:28:58 +01:00

320b.php

Bump copyright year

2013-01-21 23:28:58 +01:00

320c.php

Bump copyright year

2013-01-21 23:28:58 +01:00

320d.php

Bump copyright year

2013-01-21 23:28:58 +01:00

320e.php

Bump copyright year

2013-01-21 23:28:58 +01:00

320f.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

320h.php

Bump copyright year

2013-01-21 23:28:58 +01:00

360.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

361.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

370.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

370a3.php

Enable navigator by default

2013-09-14 02:08:51 +02:00

370a4.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

370a5.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

370a6.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

370a7.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

370a8.php

Fix latest rebase

2013-10-29 18:56:01 +01:00

370a9.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

371.php

Fix doc blocks

2013-01-29 18:34:50 +01:00

373.php

Remove deprecated constants

2013-07-10 15:56:20 +02:00

379.php

Fix CS

2013-05-29 21:29:40 +02:00

380.php

Remove phraseanet services, update configuration

2013-06-11 14:05:44 +02:00

380a3.php

Fix CS

2013-10-03 15:24:15 +02:00

390.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3602.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

3603.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

3604.php

Fix patch version numbers

2013-06-27 12:43:23 +02:00

3715.php

Fix upgrade

2013-09-25 17:15:11 +02:00

3802.php

Fix doc blocks

2013-01-29 18:34:50 +01:00

3803.php

Remove phraseanet services, update configuration

2013-06-11 14:05:44 +02:00

3805.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3806.php

Remove phraseanet services, update configuration

2013-06-11 14:05:44 +02:00

3808.php

Move phraseanet_indexer setting in configuration

2013-06-11 16:02:43 +02:00

3809.php

Remove status bit name, use only labels

2013-06-14 09:47:53 +02:00

3810.php

Fix patch : escape reserved SQL words

2013-06-18 09:38:07 +02:00

3811.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3813.php

Enhance XSendFileMapping to handle apache

2013-07-02 17:33:12 +02:00

3814.php

Fix CS

2013-07-16 19:39:02 +02:00

3815.php

Bump to alpha 15

2013-07-04 14:10:57 +02:00

3816.php

Add XSenfFile mapping generator

2013-07-04 17:31:42 +02:00

3817.php

Fix #1240 : Remove authentication>auto-create>enabled parameter

2013-07-10 14:02:29 +02:00

3818.php

Add patch

2013-07-12 20:09:51 +02:00

3819.php

Fix CS

2013-10-31 11:53:30 +01:00

3820.php

Fix CS

2013-10-31 11:53:30 +01:00

3901.php

Add missing patch for orders

2013-10-29 12:31:35 +01:00

3902.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3903.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3904.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3905.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3906.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3907.php

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

3908.php

Fix latest rebase

2013-10-29 18:56:01 +01:00