Romain Neutron
|
ecf516406a
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
tests/classes/PhraseanetPHPUnitAbstract.php
tests/classes/unitTestsTest.php
|
2013-12-19 10:31:52 +01:00 |
|
Romain Neutron
|
89dc1c5129
|
Add fixtures to sqlite db
|
2013-12-18 23:34:06 +01:00 |
|
Nicolas Le Goff
|
7c156f42c8
|
Fix neutron comments
|
2013-12-18 20:00:33 +01:00 |
|
Nicolas Le Goff
|
3f54fb3f20
|
Fix #1630 : Fix user registration management
|
2013-12-18 20:00:09 +01:00 |
|
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
|
1f88435910
|
Fix tests
|
2013-12-18 10:47:17 +01:00 |
|
Romain Neutron
|
66e762a1d1
|
Fix unit test names
|
2013-12-10 01:29:02 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
d7a68dbec3
|
Remove http_request
|
2013-11-12 19:39:22 +01:00 |
|
Romain Neutron
|
f39af8b64e
|
Merge branch '3.8'
|
2013-11-06 11:26:47 +01:00 |
|
Romain Neutron
|
05485308ae
|
Fix #1567 : Disallow a user to remove himself from DB
|
2013-11-05 15:51:50 +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
|
a14de6a18d
|
Fix unit tests
|
2013-06-26 20:09:10 +02:00 |
|
Romain Neutron
|
f942dc2562
|
Enable users time restrictions per databox
|
2013-06-13 19:45:20 +02:00 |
|
Romain Neutron
|
07c9a6684e
|
Pimp example and export downloads
|
2013-05-23 20:25:17 +02:00 |
|
Romain Neutron
|
aa18c48306
|
Fix unit tests
|
2013-01-29 09:34:20 +01:00 |
|
Romain Neutron
|
2069d40544
|
Use composer as application autoloader
|
2013-01-18 17:47:25 +01:00 |
|