hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,969 Commits 268 Branches 107 Tags
73b0e7bd94a5591d7bdcfb48f0d539ec21371864
Commit Graph

2224 Commits

Author SHA1 Message Date
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
Nicolas Maillat
4021e8d4b4 Merge branch 'master' into PHRAS-2614_This-query-not-fired_4.1 2019-06-04 10:41:23 +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
2ca1afe0ed Merge branch 'master' into PHRAS-2608_Prod_Fix_responsive_custom_link 2019-06-03 13:15:41 +02:00
Nicolas Maillat
aa584c97e8 Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1 2019-06-03 11:54:54 +02:00
Harrys Ravalomanana
45a649245f PHRAS-2608 #comment remove custom link when user is not connected #time 1h 2019-06-03 13:33:59 +04:00
Harrys Ravalomanana
0e4e5782aa PHRAS-2608 #time 2h 2019-05-31 10:21:00 +04:00
Harrys Ravalomanana
1eda490e65 PHRAS-2608 #comment Fix custom-link of nav-bar on responsive, hide the Navigation bar if there is no sub menu #time 2h 2019-05-28 15:30:10 +04: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
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