Romain Neutron
|
09c74afab6
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Helper/Prod.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
lib/classes/User/Adapter.php
lib/classes/caption/Field/Value.php
lib/classes/collection.php
lib/classes/module/report/filter.php
lib/classes/task/period/ftp.php
templates/web/common/dialog_export.html.twig
templates/web/report/ajax_dashboard_content_child.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
|
2013-12-18 12:12:58 +01:00 |
|
Romain Neutron
|
8fd1256aa2
|
Fix user settings precedence
|
2013-12-10 11:01:30 +01:00 |
|
Romain Neutron
|
a3b1ae7163
|
Fix unit test names, property and function visibility
|
2013-12-10 01:29:02 +01:00 |
|
Romain Neutron
|
e0c1f600dd
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
lib/Alchemy/Phrasea/Core/Version.php
lib/Doctrine/Repositories/SessionRepository.php
lib/classes/User/Adapter.php
|
2013-12-03 21:32:46 +01:00 |
|
Romain Neutron
|
7a8f77c569
|
Fix #1594 : Removed users are not disconnected
|
2013-12-03 18:22:14 +01:00 |
|
Romain Neutron
|
7e0a3c7338
|
Use configuration property accessor
|
2013-11-18 18:48:27 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
13915dc1a8
|
Rename "phraseanet.configuration" service to "configuration"
|
2013-11-15 22:08:07 +01:00 |
|
Romain Neutron
|
3451895515
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Core/Version.php
|
2013-11-14 17:52:52 +01:00 |
|
Romain Neutron
|
22168ba3bf
|
Fix #1572 : Add configuration customization
|
2013-11-14 17:10:53 +01:00 |
|
Romain Neutron
|
432252f5f8
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/User/Adapter.php
lib/classes/eventsmanager/broker.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/uploadquarantine.php
lib/classes/eventsmanager/notify/validationdone.php
templates/web/admin/index.html.twig
|
2013-11-12 19:19:13 +01:00 |
|
Romain Neutron
|
bea211074b
|
Fix #1571 : Cleanup user settings, fix user settings calls
|
2013-11-12 15:16:54 +01:00 |
|
Romain Neutron
|
baecfdceb3
|
Move entities to Phrasea namespace
|
2013-10-29 16:56:49 +01:00 |
|
Romain Neutron
|
aba9d3b603
|
Fix #1360 : Registered providers are not removed on user delete
|
2013-07-22 14:16:15 +02:00 |
|
Romain Neutron
|
2069d40544
|
Use composer as application autoloader
|
2013-01-18 17:47:25 +01:00 |
|