Romain Neutron
|
420df7febd
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Command/CreateCollection.php
lib/Alchemy/Phrasea/Controller/Admin/Databox.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
lib/conf.d/Doctrine/Entities.Session.dcm.yml
lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
|
2013-12-03 21:19:20 +01:00 |
|
Romain Neutron
|
1472f96e93
|
Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine
|
2013-11-28 16:16:18 +01:00 |
|
Romain Neutron
|
7e0a3c7338
|
Use configuration property accessor
|
2013-11-18 18:48:27 +01:00 |
|
Romain Neutron
|
13915dc1a8
|
Rename "phraseanet.configuration" service to "configuration"
|
2013-11-15 22:08:07 +01:00 |
|
Romain Neutron
|
9b471fdf76
|
Fix CS
|
2013-10-31 11:53:30 +01:00 |
|
Romain Neutron
|
32c2d6154a
|
Remove phraseanet services, update configuration
|
2013-06-11 14:05:44 +02:00 |
|
Romain Neutron
|
842ad40985
|
Bump copyright year
|
2013-01-21 23:28:58 +01:00 |
|
Romain Neutron
|
f8997a034c
|
[SearchEngine] Add SearchEngineLogger, log queries
|
2013-01-17 12:03:19 +01:00 |
|
Romain Neutron
|
4fb53f0f8a
|
[SearchEngine] Add search engine service provider unit test
|
2013-01-17 12:02:44 +01:00 |
|
Romain Neutron
|
133595635c
|
[SearchEngine] Finalize search engine refactor
|
2013-01-17 11:43:36 +01:00 |
|
romain
|
c1d952a17e
|
[SearchEngine] Update PR to latest master
|
2013-01-17 11:43:35 +01:00 |
|
Romain Neutron
|
af62aba6e3
|
[SearchEngine] Add search engine to Application
|
2013-01-17 11:43:31 +01:00 |
|
Romain Neutron
|
a9ee52c6c8
|
[SearchEngine] Add refactored search engines
|
2013-01-17 11:43:31 +01:00 |
|