Nicolas Maillat
70cbee6b76
Merge branch 'master' into PHRAS-2386-Feedback_result_display
2019-06-04 17:26:01 +02:00
Harrys Ravalomanana
cd62c6524b
PHRAS-2617 #comment Port41 of PHRAS-2341 #time 1h
2019-06-04 18:30:27 +04:00
Harrys Ravalomanana
b6297d3e22
PHRAS-2616 #comment Port41 of PHRAS-2351 #time 0.25h
2019-06-04 16:30:38 +04:00
Harrys Ravalomanana
ee221c7296
PHRAS-2386 #comment Port41 of PHRAS-2344 #time 2h
2019-06-04 15:47:34 +04:00
Harrys Ravalomanana
82c19b9e2f
PHRAS-2386 #comment Refacto picto comment #time 1h
2019-06-04 14:53:15 +04:00
Jean-Yves Gaulier
3b120fb020
PHRAS-2573_last-query-as-default_4.1
...
- set default default user settings to "replay last_query on login"
- set a default (empty) query for first login
2019-06-04 12:07:32 +02:00
Jean-Yves Gaulier
4550257d59
PHRAS-2614_This-query-not-fired_4.1
...
fix : "user settings / configuration / display on startup" = "the query:___" (always run the same query after login) : The query is now fired after login
nb : silly trick to change ft-query to json in twig, so no need to change lib.
2019-06-03 18:51:52 +02:00
Nicolas Maillat
aa584c97e8
Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1
2019-06-03 11:54:54 +02:00
jygaulier
9783bbb23d
Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail
2019-05-23 17:51:01 +02:00
Nicolas Maillat
ff25eb226c
Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1
2019-05-21 10:55:51 +02:00
Jean-Yves Gaulier
77e262bad0
PHRAS-2581_twig-macro-explode_4.1
...
explode commmon/macros.html.twig in 3 files for 3 macros
2019-05-16 17:27:40 +02:00
Nicolas Maillat
23014279a8
Merge branch 'master' into PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode
2019-05-16 16:05:12 +02:00
aina-esokia
506f0eef6a
port to 4.1 share media in linkedin
...
#time 1h
2019-05-14 17:41:16 +04:00
Nicolas Maillat
9f2e9a1527
Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail
2019-05-07 17:34:34 +02:00
Harrys Ravalomanana
dd6422c620
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query
2019-04-30 13:48:29 +04:00
Harrys Ravalomanana
2390244e9e
Merge branch master into PHRAS-2430
2019-04-05 15:11:09 +04:00
aina-esokia
7426eb453d
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape
2019-04-05 11:49:45 +04:00
aina-esokia
60c126c7b9
escape when rendered
2019-03-29 17:20:04 +04:00
aina-esokia
019498b5c4
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape
2019-03-29 17:09:37 +04:00
Harrys
b3976733e4
PHRAS-2430 Restore jsonQuery
2019-03-27 10:04:05 +04:00
Harrys
87c8433f0f
PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query
2019-03-19 18:08:44 +04:00
aina-esokia
8ab2888850
port to 4.1 upload by url
2019-03-18 16:16:14 +04:00
Harrys
f8774eb7d3
PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode
2019-03-18 13:41:35 +04:00
Harrys
6b0c225d9e
PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query - Port_PHRAS-2381_to_41
2019-03-08 15:51:47 +04:00
aina-esokia
acc59ec42a
List manager : add email domain in filter box
2019-03-08 15:39:58 +04:00
Harrys
146cad15d4
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query
2019-03-08 11:04:37 +04:00
Harrys
af6caaf608
PHRAS-2361_Port_41_Refacto_icon_push
2019-02-18 11:31:33 +04:00
Harrys
7937532b90
PHRAS-2430_Advance_search_refacto_add created_on and updated_on
2019-02-14 17:06:03 +04:00
Harrys
a2bce71259
PHRAS-2419_refacto_Icons_actions_under_Thumbnail
2019-02-06 11:53:09 +04:00
Filip Vilic
f249d530b3
PHRAS-2385_port_local_manu_refacto
2019-01-14 15:21:12 +01:00
Filip Vilic
a2e711510d
PHRAS-2311_refacto_basket_menu
2018-11-26 16:08:57 +01:00
Filip Vilic
688caea0d9
PHRAS-2301_thesaurus_concept_path_port_41 fix
2018-11-23 10:28:47 +01:00
aina-esokia
c58ed45333
fix prod escaping
2018-11-22 14:32:42 +04:00
Filip Vilic
ed3513865e
PHRAS-2301_thesaurus_concept_path_port_41
2018-11-21 13:13:42 +01:00
Filip Vilic
82d8c5d4c0
PHRAS-2270_advance_search_port_top_41
2018-11-07 12:54:57 +01:00
Jean-Yves Gaulier
e6c89e22bf
PHRAS-2264_html-encode-title_MASTER
...
fix encoding of title
2018-10-15 18:44:38 +02:00
aina-esokia
39ec2d5e56
fix quarantine substitue action
2018-10-10 18:29:24 +04:00
Filip Vilic
dd26c4dcc7
PHRAS-2220_feedback_window_UI__correction
2018-09-21 20:24:42 +02:00
Filip Vilic
749f75b45d
PHRAS-2220_feedback_window_UI__correction
2018-09-20 14:22:52 +02:00
Nicolas Maillat
fa379500c4
Merge pull request #2741 from filipx/PHRAS-2221_list_manager_UI___corrections_NEW
...
PHRAS-2221_list_manager_UI___corrections_NEW
2018-09-19 21:28:08 +00:00
Filip Vilic
25afbc5311
PHRAS-2221_list_manager_UI___corrections
2018-09-19 14:13:52 +02:00
Filip Vilic
04590f4acb
PHRAS-2219_push_window__corrections fix
2018-09-19 13:07:43 +02:00
Filip Vilic
37a8c0b4cd
PHRAS-2219_push_window__corrections
2018-09-19 10:49:35 +02:00
Nicolas Maillat
7fb2ab4456
Merge pull request #2738 from filipx/PHRAS-2222_list_manager_advance_mode__corrections
...
PHRAS-2222_list_manager_advance_mode__corrections
2018-09-17 22:32:41 +00:00
Filip Vilic
c8ce9ce322
PHRAS-2222_list_manager_advance_mode__corrections
2018-09-17 15:08:41 +02:00
Filip Vilic
e40a524365
PHRAS-2221_list_manager_UI__corrections
2018-09-17 10:54:29 +02:00
Filip Vilic
6f915f0f1f
PHRAS-2223_list_manager___corrections
2018-09-14 14:25:47 +02:00
Nicolas Maillat
23cd533ba1
Merge pull request #2725 from filipx/PHRAS-2100_refactoring_list_manager_modals
...
PHRAS-2100_refactoring_list_manager modals UI
2018-09-06 12:18:26 +00:00
Filip Vilic
11035fe4a4
PHRAS-2100_refactoring_list_manager modals UI
2018-09-03 10:01:04 +02:00
Filip Vilic
2994bbf890
PHRAS-2186_list_manager_add_user modal styling
2018-08-20 16:49:29 +02:00
