Nicolas Maillat
ff25eb226c
Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1
2019-05-21 10:55:51 +02:00
Harrys Ravalomanana
f5f0527600
PHRAS-2589-Admin-personnalisation update translation
2019-05-21 10:03:27 +04:00
Harrys Ravalomanana
28151751eb
PHRAS-2589-Admin_personnalisation_logo_fix
2019-05-20 14:31:46 +04:00
Harrys Ravalomanana
f61efe1e45
PHRAS-2589-Admin_personnalisation_logo_fix
2019-05-20 14:23:38 +04: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
Harrys Ravalomanana
339e1bc811
Merge branch 'PHRAS-2079_Admin_personnalisation_section' of https://github.com/HRavalomanana/Phraseanet into PHRAS-2079_Admin_personnalisation_section
2019-05-16 17:41:07 +04:00
Harrys Ravalomanana
aafa248fed
PHRAS-2079_Admin_personalisation_section #Remove console.log()
2019-05-16 17:40:19 +04:00
Nicolas Maillat
e569db8a65
Merge branch 'master' into PHRAS-2079_Admin_personnalisation_section
2019-05-16 11:29:03 +02:00
Harrys Ravalomanana
27971580f1
PHRAS-2079_Admin_personnalisation_section
2019-05-16 10:11:11 +04:00
aina-esokia
4097e19abb
add a video start t parameter in permalink url
...
#time 6h
2019-05-15 16:13:16 +04:00
Jean-Yves Gaulier
cf542587a0
PHRAS-2563_subdef-task-alldb_4.1
...
subdef task : if the "all" databox is checked, the task runs on every dbox (even the new ones)
also : changed the task-manager notification timeout to 1s to be more responsive.
2019-05-14 16:51:43 +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
aina-esokia
eff72083ba
update delete account config structure
...
#time 0.5h
2019-04-25 17:27:33 +04:00
jygaulier
035d804d15
PHRAS-2276 port to 4.1 template escape ( #2819 )
...
* fix escape lightbox
* fix escape in admin connected-user
* fix prod escaping
* fix escaping in thesaurus
* escape when rendered
* escape in controller
2019-04-08 14:30:00 +02:00
aynsix
5cdf473c7f
PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas ( #2918 )
...
* allow user to delete account
* generate translation and add checkbox in the windows confirmation
* change text an configuration key
* update delete account fonctionality
* rename variable
* write in explicite condition
* merge yarn.lock
* regenerate translation
2019-04-08 14:25:17 +02: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
85682cb4a8
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query
2019-03-01 09:20:49 +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
aina-esokia
c1dac08ded
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2375-port41-preview-pdf-on-pdfjs
2019-01-25 15:13:00 +04:00
Filip Vilic
f249d530b3
PHRAS-2385_port_local_manu_refacto
2019-01-14 15:21:12 +01:00
aina-esokia
d2bdd2ed4a
port 4.1: migrate field type text to string
2019-01-11 14:45:33 +04:00
aina-esokia
158e3eb2df
port fix preview pdf in pdfjs
2019-01-10 18:29:47 +04:00
Filip Vilic
bff7dec769
PHRAS-2350_report_method_fix
2018-12-19 10:12:14 +01:00
Filip Vilic
91aaf2c6d7
PHRAS-2342_report_collections_fix
2018-12-14 12:18:24 +01:00
Filip Vilic
5a291a549c
PHRAS-2327_report_refacto_41 base collections/fields fix
2018-12-13 15:22:56 +01:00
Filip Vilic
eec09e55cd
PHRAS-2327_report_refacto_41
2018-12-11 13:15:03 +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
aina-esokia
06e30750e4
fix escape in admin connected-user
2018-11-22 14:21:12 +04:00
aina-esokia
4668e8a954
fix escape lightbox
2018-11-22 14:16:31 +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
Xavier Rousset
a8ebe5fc43
Update access page design
2018-10-19 19:10:39 +02:00
Jean-Yves Gaulier
e6c89e22bf
PHRAS-2264_html-encode-title_MASTER
...
fix encoding of title
2018-10-15 18:44:38 +02:00
