Romain Neutron
|
04a6bb1486
|
Fix latest merge, add missing repository method
|
2013-12-04 12:48:33 +01:00 |
|
Romain Neutron
|
766773da01
|
Fix CS
|
2013-12-03 21:20:19 +01:00 |
|
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
|
2ba164701d
|
Use symfony translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
6ab51d55f8
|
Add missing headers
|
2013-11-20 19:03:55 +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
|
d40b1d4fb1
|
Fix CS
|
2013-11-18 13:07:40 +01:00 |
|
Romain Neutron
|
3548421160
|
Add basket converter
|
2013-11-13 17:52:12 +01:00 |
|
Nicolas Le Goff
|
1fdf30c6af
|
Use ACL service provider to get user's ACL
|
2013-11-05 12:21:42 +01:00 |
|
Romain Neutron
|
13dd86c67f
|
Fix CS
|
2013-10-31 14:22:41 +01:00 |
|
Romain Neutron
|
5d2dd07caa
|
Fix latest rebase
|
2013-10-29 18:56:01 +01:00 |
|
Romain Neutron
|
08ce909730
|
Move doctrine repositories to Phrasea namespace
|
2013-10-29 17:30:11 +01:00 |
|