Nicolas Maillat
62ad96951d
Merge branch 'master' into PHRAS-2901_tokens-add-index_4.1
2020-02-18 15:01:48 +01:00
Nicolas Maillat
3640c134a1
Merge pull request #3324 from alchemy-fr/PHRAS-2812-hide-cterms-ckbox
...
PHRAS-2812 #comment merge 4.1 Hide "cterms" ckbox when not relevant
2020-02-18 15:01:16 +01:00
Nicolas Maillat
378daacabb
Merge branch 'master' into PHRAS-2901_tokens-add-index_4.1
2020-02-18 14:52:36 +01:00
Nicolas Maillat
08dfb81007
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
2020-02-18 14:27:56 +01:00
Nicolas Maillat
f281bf022b
Merge pull request #3301 from alchemy-fr/PHRAS-2879_facet-order_4.1
...
PHRAS-2879 #comment Final fusion of the Define facets order in the query result, this PR also includes the PR #3321
2020-02-18 11:21:06 +01:00
Nicolas Maillat
8723fc3720
Merge branch 'master' into PHRAS-2879_facet-order_4.1
2020-02-18 10:23:12 +01:00
Nicolas Maillat
ff4a619afa
Merge pull request #3326 from alchemy-fr/PHRAS-2906-fix-for-job-and-activity-on-user-update
...
PHRAS-2906 #comment fix for job and activity on user update
2020-02-18 10:13:04 +01:00
Jean-Yves Gaulier
722b1e3750
include Harrys's new templates
...
fix form restore
fix Version
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
4f7be4c0a9
fix bad merge happened cause last rebase (?)
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
eeec1ab716
save facets following the order of the admin form.
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
c7fc2b6422
change patch number
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
3b8d75d39d
fix : tech facets did appear twice.
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
b1b35cc92b
fix malformed query on tech fields ('_' in query)
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
8312be6fc8
removed useless tests
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
20839f1dd7
return facets following the order defined in conf.
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
53f17e1897
save modifications in conf, and also write back to databoxes
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
8171b7c1f1
PHRAS-2879_facet-order_4.1
...
fix setup:install (cont' 2)
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
4305441a03
PHRAS-2879_facet-order_4.1
...
fix setup:install (cont')
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
6838198a69
PHRAS-2879_facet-order_4.1
...
fix setup:install.
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
2ccdcfed27
PHRAS-2879_facet-order_4.1
...
save all facet settings in conf, order is preserved in admin/search-engine-settings.
todo : ux to re-order facets
todo : return facets into query results in this setting order.
todo : migration from dbox settings (field struct) to conf ; remove field setting from admin
2020-02-17 20:17:08 +01:00
Nicolas Maillat
1bf4ecf60d
Merge branch 'master' into PHRAS-2906-fix-for-job-and-activity-on-user-update
2020-02-17 16:42:10 +01:00
Nicolas Maillat
579ba471c4
Merge pull request #3345 from alchemy-fr/PHRAS-2923_upgrade_Phraseanet-production-client
...
PHRAS-2923 #comment upgrade of phraseanet-production-client include dev PHRAS-2922 , PHRAS-2904
2020-02-17 16:25:16 +01:00
Nicolas Maillat
5e1082a6eb
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
2020-02-17 16:10:41 +01:00
Nicolas Maillat
fc4f9210b3
Merge branch 'master' into PHRAS-2923_upgrade_Phraseanet-production-client
2020-02-17 16:01:33 +01:00
Nicolas Maillat
fd5ec6d918
Merge pull request #3336 from alchemy-fr/PHRAS-2910_Fix_order_manager_from_notification_link
...
PHRAS-2910 #comment merge Order manager : Can't perform any action in order manager when coming from a notification in menu bar
2020-02-17 16:00:25 +01:00
Harrys Ravalomanana
a61e32b21f
upgrade of phraseanet-production-client
2020-02-17 18:48:44 +04:00
Nicolas Maillat
fbbd53a5a6
Merge branch 'master' into PHRAS-2910_Fix_order_manager_from_notification_link
2020-02-17 15:45:10 +01:00
Nicolas Maillat
b43cb1d2c9
Merge pull request #3344 from alchemy-fr/PHRAS-2923_Port_41_Collection_sort
...
PHRAS-2923 #comment merge Port 41 :Collection sort by column
2020-02-17 15:41:14 +01:00
Harrys Ravalomanana
18d69d1537
Merge branch 'master' into PHRAS-2910_Fix_order_manager_from_notification_link
2020-02-17 18:37:04 +04:00
Nicolas Maillat
aa3ee54a85
Merge branch 'master' into PHRAS-2923_Port_41_Collection_sort
2020-02-17 15:26:24 +01:00
Nicolas Maillat
e30f8975f8
Merge pull request #3343 from alchemy-fr/PHRAS-2825_Prod_Add_reset_button_to_initialize_search
...
PHRAS 2825 #comment merge Prod : Add a reset button to initialize searches filters
2020-02-17 15:18:37 +01:00
Harrys Ravalomanana
00f3ac715e
Merge branch 'master' into PHRAS-2923_Port_41_Collection_sort
2020-02-17 17:28:09 +04:00
Harrys Ravalomanana
3eb2c76086
Merge branch 'master' into PHRAS-2825_Prod_Add_reset_button_to_initialize_search
2020-02-17 17:26:50 +04:00
Nicolas Maillat
89c12440e4
Merge pull request #3335 from alchemy-fr/PHRAS-2915_Lightbox_desktop_Sort_basket_order
...
PHRAS-2915 #comment Lightbox (desktop version) Change sort order for basket and Feedback in landing page ( most recent in first)
2020-02-17 13:35:02 +01:00
Harrys Ravalomanana
acc611eac5
PHRAS-2923 #comment Port 41 :Collection sort by column #time 2h
2020-02-17 14:52:34 +04:00
Harrys Ravalomanana
c5e7b317ba
PHRAS-2825
2020-02-14 18:02:18 +04:00
Harrys Ravalomanana
54e9264bdb
PHRAS-2915
2020-02-12 17:30:21 +04:00
Harrys Ravalomanana
fa462b368b
PHRAS-2915 #comment add Read more btn #time 5h
2020-02-12 17:26:10 +04:00
Harrys Ravalomanana
b08ae5c2fa
PHRAS-2910 #comment Fix Order manager : action from notification in menu bar #time 4h
2020-02-11 17:21:03 +04:00
Harrys Ravalomanana
546d07a559
PHRAS-2915 #comment Fix sort basket orfer on lightbox desktop # time 1h
2020-02-11 12:13:48 +04:00
Jean-Yves Gaulier
211ba02f59
bump patch to 22a
2020-02-10 11:39:42 +01:00
Jean-Yves Gaulier
5f7ca7c9a6
add indexes to table "Tokens"
2020-02-10 11:16:41 +01:00
gjacobjn
b18ef09661
Update AccountController.php
2020-02-07 17:17:54 +01:00
Nicolas Maillat
7a2a6c7f50
Merge pull request #3329 from alchemy-fr/PHRAS-2216_Dev_prod_help_About_Refacto
...
PHRAS-2216 #comment merge Dev-of-Help-About-Design-Refacto
2020-02-07 15:20:57 +01:00
Harrys Ravalomanana
54eb516a38
PHRAS-2216 Fix on report, admin and account window
2020-02-07 17:55:14 +04:00
Nicolas Maillat
dd60f7794e
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
2020-02-07 13:01:49 +01:00
Nicolas Maillat
385977c1b8
Merge branch 'master' into PHRAS-2216_Dev_prod_help_About_Refacto
2020-02-07 12:57:14 +01:00
Nicolas Maillat
2582e437a9
Merge pull request #3332 from alchemy-fr/PHRAS-2909-Detailled-view-fix-audio-player
...
PHRAS-2909 #comment merge Phraseanet side Detailled views: Fix audio player
2020-02-07 12:56:30 +01:00
Harrys Ravalomanana
fb269312d5
PHRAS-2909 #comment Fix of audio player on detailled view #time 2h
2020-02-07 15:25:05 +04:00
aynsix
a20962e9ba
hide chkbox
2020-02-07 12:35:57 +03:00
