Commit Graph

1169 Commits

Author SHA1 Message Date
Harrys Ravalomanana
c2f55eb8ba PHRAS-2668 #comment fix twig error #time 1h 2019-07-16 15:12:26 +04:00
Harrys Ravalomanana
1ba27e55c7 PHRAS-2665 #time 3h 2019-07-16 14:07:41 +04:00
Harrys Ravalomanana
b590ae1c8a PHRAS-2665 2019-07-15 18:30:37 +04:00
Harrys Ravalomanana
d02f8f5a01 PHRAS-2665 #comment Fix video tool ratio #time 8h 2019-07-12 18:06:01 +04:00
Harrys Ravalomanana
4bfa1b109f PHRAS-2544 #comment port41 of 2537 #time 4h 2019-07-03 13:52:37 +04:00
Harrys Ravalomanana
fc022f817b PHRAS-2544 fix statistic popup 2019-07-01 18:32:12 +04:00
Harrys Ravalomanana
63a89521b6 PHRAS-2544 #comment update fix on grey and white theme #time 8h 2019-07-01 17:41:01 +04:00
Nicolas Maillat
ec057989d2 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-06-27 10:41:04 +02:00
Harrys Ravalomanana
8837363126 PHRAS-2620 Add new font #time 2h 2019-06-25 17:46:33 +04:00
Harrys Ravalomanana
3e2795776d PHRAS-2544 2019-06-25 16:53:48 +04:00
Harrys Ravalomanana
3dc4feade8 PHRAS-2620 #comment add new icomoon font # time 2h 2019-06-24 14:21:02 +04:00
Nicolas Maillat
9f0ef049ad Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1 2019-06-12 15:34:05 +02:00
Jean-Yves Gaulier
ce25275c03 PHRAS-2628_toolbar-plugin_4.1
allow a plugin to his own js (at the end of the toolbar)
2019-06-12 15:20:10 +02:00
Harrys Ravalomanana
76509781eb PHRAS-2386 #adding fix of feedback block #time 2h 2019-06-12 11:06:19 +04:00
Nicolas Maillat
73b0e7bd94 Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter 2019-06-11 17:22:29 +02:00
Nicolas Maillat
2f6eb6b02e Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail_font 2019-06-07 15:29:51 +02:00
Harrys Ravalomanana
300c413848 PHRAS-2419 #comment add icomoon #time 5h 2019-06-06 18:21:57 +04:00
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