Romain Neutron
|
89dc1c5129
|
Add fixtures to sqlite db
|
2013-12-18 23:34:06 +01:00 |
|
Romain Neutron
|
a74ad06ad1
|
Fix CS
|
2013-12-18 18:15:16 +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
|
f0d632073b
|
Fix #1622 : Sanitize captions display
|
2013-12-17 18:31:56 +01:00 |
|
Jean-Yves Gaulier
|
f71fb36377
|
fix #1612
Conflicts:
lib/classes/caption/Field/Value.php
|
2013-12-11 19:49:49 +01:00 |
|
Jean-Yves Gaulier
|
f5f17549ad
|
fix #1612
Conflicts:
lib/classes/caption/Field/Value.php
|
2013-12-11 19:49:05 +01:00 |
|
Romain Neutron
|
e9e9d149a1
|
Locale simplification
|
2013-12-03 20:05:20 +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
|
dbd06e9091
|
Remove dead code
|
2013-09-04 12:14:50 +02:00 |
|
jygaulier
|
4138c50b22
|
fix #1150
|
2013-06-27 10:36:12 +02:00 |
|
Romain Neutron
|
74ce48fe45
|
Fix unit tests
|
2013-01-29 19:35:51 +01:00 |
|
Romain Neutron
|
c184278b40
|
Fix doc blocks
|
2013-01-29 18:34:50 +01:00 |
|
Romain Neutron
|
4414892b91
|
Fix CS lib/classes
|
2013-01-29 16:39:02 +01:00 |
|
Romain Neutron
|
842ad40985
|
Bump copyright year
|
2013-01-21 23:28:58 +01:00 |
|
Romain Neutron
|
2069d40544
|
Use composer as application autoloader
|
2013-01-18 17:47:25 +01:00 |
|