Romain Neutron
|
d147d4e39d
|
Merge branch '3.8'
|
2013-12-20 16:46:35 +01:00 |
|
Nicolas Le Goff
|
78c14287a3
|
Fix #1635 CSV icon is not displayed
|
2013-12-20 13:17:33 +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
|
29364a29c4
|
Merge pull request #848 from romainneutron/fix-1625
[3.8] Fix #1625 : Append javascript autocompleter to edit dialog box
|
2013-12-17 09:51:35 -08:00 |
|
Romain Neutron
|
aa643930c1
|
Fix #1625 : Append javascript autocompleter to edit dialog box
|
2013-12-17 15:56:27 +01:00 |
|
Nicolas Le Goff
|
3e574207e2
|
Add tests
|
2013-12-16 14:35:38 +01:00 |
|
Nicolas Le Goff
|
060d6d9fdb
|
Fix #1623 Can not display empty admin fields list
|
2013-12-16 14:10:03 +01:00 |
|
Romain Neutron
|
9580ff7585
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/task/period/archive.php
templates/web/admin/collection/collection.html.twig
templates/web/admin/databox/databox.html.twig
templates/web/login/layout/base-layout.html.twig
|
2013-12-09 14:17:03 +01:00 |
|
Nicolas Le Goff
|
ac6d669dbb
|
Fix #1611 CSS issue with user list
|
2013-12-06 15:17:01 +01:00 |
|
Nicolas Le Goff
|
0d41e2948a
|
Fix language bar display in mobile devices
|
2013-12-05 15:41:23 +01:00 |
|
Romain Neutron
|
4f31cfeefc
|
Merge branch '3.8'
Conflicts:
bower.json
templates/web/common/index_bootstrap.html.twig
templates/web/common/menubar.html.twig
templates/web/login/layout/base-layout.html.twig
templates/web/prod/Baskets/Reorder.html.twig
|
2013-12-02 18:17:38 +01:00 |
|
Romain Neutron
|
a518b7cc68
|
Merge pull request #812 from romainneutron/fix-1596
[3.8] Fix #1596 : Add datepicker input placeholder
|
2013-11-28 05:05:46 -08:00 |
|
Romain Neutron
|
deb5e7ea75
|
Fix #1596 : Add datepicker input placeholder
|
2013-11-28 11:29:04 +01:00 |
|
Nicolas Le Goff
|
afde85140f
|
Fix #1600 Can not save a deleted field in admin field app
|
2013-11-28 11:08:42 +01:00 |
|
Romain Neutron
|
142b02799c
|
Merge branch '3.8'
|
2013-11-20 16:05:55 +01:00 |
|
Romain Neutron
|
0dde2f1388
|
Image should not be executables
|
2013-11-20 16:05:46 +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
|
84c444c186
|
Fix editing default user settings
|
2013-11-14 13:29:49 +01:00 |
|
Romain Neutron
|
dca6667052
|
Merge branch '3.8'
|
2013-11-13 17:07:45 +01:00 |
|
Romain Neutron
|
694aecf752
|
Merge pull request #781 from nlegoff/fix1570_bis
[3.8] Fix #1570 Remove accept tou link if there are no TOU
|
2013-11-12 11:16:53 -08:00 |
|
Nicolas Le Goff
|
7c36829f11
|
Fix #1570 Remove accept tou link if there are no TOU
|
2013-11-12 19:59:54 +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
|
7e75591d1a
|
Remove demo file
|
2013-11-12 17:49:58 +01:00 |
|
Romain Neutron
|
1a2487d398
|
Fix JS codestyle
|
2013-11-12 15:07:16 +01:00 |
|
Romain Neutron
|
9f2f1a4217
|
Fix #1573 : Propose rights reset prior apply template
Conflicts:
templates/web/admin/index.html.twig
|
2013-11-12 13:29:30 +01:00 |
|
Romain Neutron
|
3cf2cbd6f1
|
Merge branch '3.8'
|
2013-11-12 13:26:15 +01:00 |
|
Romain Neutron
|
9fa95db23c
|
Fix JS codestyle
|
2013-11-12 12:49:23 +01:00 |
|
Romain Neutron
|
89fb774f96
|
Merge branch '3.8'
|
2013-11-12 12:10:40 +01:00 |
|
Romain Neutron
|
dc5c12a592
|
Fix JS code style
|
2013-11-11 11:25:52 +01:00 |
|
Romain Neutron
|
2072f9e0e0
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Core/Version.php
|
2013-11-08 19:04:26 +01:00 |
|
Romain Neutron
|
ea6b93b88a
|
Fix typo
|
2013-11-08 18:48:58 +01:00 |
|
Nicolas Le Goff
|
b24b4fdb00
|
Fix #1578 Checks field source validation
|
2013-11-08 18:48:58 +01:00 |
|
Romain Neutron
|
fec01341b6
|
Fix #1574 : Set correct date sort on advanced search reset
|
2013-11-07 18:34:36 +01:00 |
|
Romain Neutron
|
f39af8b64e
|
Merge branch '3.8'
|
2013-11-06 11:26:47 +01:00 |
|
Romain Neutron
|
664513ab4c
|
Merge pull request #762 from nlegoff/fix_ie
[3.8] Fix #1564 Fields selection in advanced search is broken
|
2013-11-05 09:05:14 -08:00 |
|
Nicolas Le Goff
|
ad4213684e
|
Add danger class to filters input if no colls are selected in advanced search
|
2013-11-05 15:49:53 +01:00 |
|
Romain Neutron
|
f27fa53d4c
|
Merge branch '3.8'
Conflicts:
.travis.yml
templates/web/setup/wrapper.html.twig
tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
|
2013-11-05 15:20:35 +01:00 |
|
Nicolas Le Goff
|
311f2557d3
|
Enhance CSS selector for IE performance
|
2013-11-05 14:50:27 +01:00 |
|
Nicolas Le Goff
|
81d464b3b0
|
Hide non available fields
|
2013-11-05 14:36:33 +01:00 |
|
Romain Neutron
|
c0e4257f82
|
Merge pull request #751 from nlegoff/fix_ie_edit
[3.8] Fix #1152 On IE7 editing box is broken
|
2013-11-05 03:30:56 -08:00 |
|
Romain Neutron
|
ed3f31b01d
|
Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD
|
2013-11-05 10:53:32 +01:00 |
|
Romain Neutron
|
2f1fa857cd
|
Merge pull request #753 from romainneutron/fix-error-handler
[3.8] Use symfony/debug error handler instead of the deprecated one
|
2013-11-05 01:51:24 -08:00 |
|
Nicolas Le Goff
|
d7e108d375
|
Fix #1152 On IE7 editing on dialog box is broken
|
2013-11-04 18:16:18 +01:00 |
|
Romain Neutron
|
beb409e932
|
Use symfony/debug error handler instead of the deprecated one
|
2013-11-04 13:02:54 +01:00 |
|
Nicolas Le Goff
|
409a43db0c
|
Fix field edition for vocabulary
|
2013-10-31 17:56:47 +01:00 |
|
Romain Neutron
|
38264a0ae7
|
Merge branch '3.8'
Conflicts:
bower.json
lib/classes/task/manager.php
lib/conf.d/minifyGroupsConfig.php
tests/classes/PhraseanetPHPUnitAbstract.php
|
2013-10-31 13:57:21 +01:00 |
|
Nicolas Le Goff
|
7b256eae61
|
Fix setting cookie
|
2013-10-28 18:41:41 +01:00 |
|
Nicolas Le Goff
|
ae653edad0
|
Sets selected field according to current user langage
|
2013-10-28 14:16:21 +01:00 |
|
Nicolas Le Goff
|
303247f551
|
Fix lng settings from cookie
|
2013-10-28 14:16:20 +01:00 |
|
Nicolas Le Goff
|
555ec03708
|
Update jquery cookie dependency
|
2013-10-28 14:16:20 +01:00 |
|