hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,758 Commits 268 Branches 107 Tags
dd6422c620965e95a3e66508a0a5151d24a799e9
Commit Graph

2163 Commits

Author SHA1 Message Date
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
6b0c225d9e PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query - Port_PHRAS-2381_to_41 2019-03-08 15:51:47 +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
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
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
Nicolas Maillat
9e17f72dd7 Merge pull request #2712 from filipx/PHRAS-2186_list_manager_add_user 
PHRAS-2186_list_manager_add_user
 2018-09-06 12:17:59 +00:00
Filip Vilic
96488f5ca2 PHRAS-2212_refacto_admin_user_alerts 2018-09-05 16:08:18 +02:00
Filip Vilic
11035fe4a4 PHRAS-2100_refactoring_list_manager modals UI 2018-09-03 10:01:04 +02:00
aina-esokia
c3486f9b8e allow svg logo and change gabari 2018-08-31 16:10:19 +04:00
aina-esokia
9406c2b2ce fix 2018-08-29 17:16:26 +04:00