hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,279 Commits 268 Branches 107 Tags
bac72e269a56bbb45bf50f9bdde413f7a4b6b83c
Commit Graph

13279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
c5ad1f0851 Merge branch 'master' into PHRAS-2760_fix_help_menu_in_view 2019-11-07 10:28:03 +01:00
Nicolas Maillat
56c9a033bc Merge pull request #3203 from HRavalomanana/PHRAS-2809_Prod_Edit_window_hide_field_switch_attribute_gui_editable 
PHRAS-2809 #comment merge front part Prod on editing window, hide fields with attribut "gui_editable" to false
 2019-11-06 15:50:24 +01:00
Harrys Ravalomanana
442c953708 PHRAS-2809 #comment add hide field switch attribute gui_editable value #time 2h 2019-11-06 15:51:25 +04:00
Harrys Ravalomanana
6c590f6859 PHRAS-2760 #comment fix help menu in view #time 2h 2019-11-06 11:59:42 +04:00
Nicolas Maillat
9d81e20ff1 Merge branch 'master' into kubernetes_ready 2019-11-05 18:01:03 +01:00
Jean-Yves Gaulier
da532cc36a PHRAS-2748_bad-chars-cterms_4.1 
fix : remove bad ascii chars (0...31 except tab; cr; lf) from cterms values
todo ? : also cleanup bad chars from prod/editing and api/editing ?
 2019-11-05 17:59:03 +01:00
Nicolas Maillat
28c55ddf7a Merge pull request #3181 from HRavalomanana/PHRAS-2761_add_status_change_capabilities-to_quarantine 
PHRAS-2761 #comment port to 4.1 add status change to quarantine
 2019-11-05 17:45:39 +01:00
Nicolas Maillat
8f6d175a98 Merge branch 'master' into kubernetes_ready 2019-11-05 17:16:43 +01:00
Nicolas Maillat
ec2f0697d6 Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 17:13:52 +01:00
Nicolas Maillat
4221b7da7f Merge pull request #3198 from HRavalomanana/PHRAS-2792_Order_manager_Applied_choice_not_shown_before_order_validation 
PHRAS-2792 #comment Order manager : Applied choice not shown before order validation
 2019-11-05 17:12:49 +01:00
Harrys Ravalomanana
27e100bdbd PHRAS-2792 #comment add new icon 2019-11-05 17:20:24 +04:00
Nicolas Maillat
11ed5c08c8 Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 12:47:27 +01:00
Nicolas Maillat
452253eb09 Merge branch 'master' into PHRAS-2792_Order_manager_Applied_choice_not_shown_before_order_validation 2019-11-05 12:45:52 +01:00
Nicolas Maillat
232c255e3e Merge pull request #3188 from HRavalomanana/PHRAS-2785_facets_on_date_restitued_in_wicked_way 
PHRAS-2785 Port to 4.1 - Facets on date are restitued in a wicked way
 2019-11-05 12:39:13 +01:00
Nicolas Maillat
bd5fadba22 Merge branch 'master' into kubernetes_ready 2019-11-05 12:34:23 +01:00
Nicolas Maillat
c9a0a0490c Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 12:26:43 +01:00
Nicolas Maillat
3da13c5a88 Merge branch 'master' into PHRAS-2792_Order_manager_Applied_choice_not_shown_before_order_validation 2019-11-05 12:18:48 +01:00
Nicolas Maillat
d36517982c Merge branch 'master' into PHRAS-2785_facets_on_date_restitued_in_wicked_way 2019-11-05 12:14:41 +01:00
Nicolas Maillat
be51b620d5 Merge pull request #3197 from jygaulier/PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
PHRAS-2808 #comment disable cterms on linked field  PHRAS-2806 #comment mask writable fields 4.1
 2019-11-05 12:14:00 +01:00
Jean-Yves Gaulier
32ec974341 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
fix unit test
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-11-04 16:01:50 +01:00
Harrys Ravalomanana
c1c76a6d9e PHRAS-2792 #comment upgrade phraseanet-production-client 2019-11-04 13:53:57 +04:00
Jean-Yves Gaulier
21bb2ffae4 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
fix php syntax error during circleci test (ok on devjy ?)
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-11-04 10:35:16 +01:00
Harrys Ravalomanana
9d31265574 PHRAS-2792 #time 4h 2019-11-04 11:20:49 +04:00
Jean-Yves Gaulier
b4e848a5e9 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
new : checkbox in admin/field to allow gui (prod) editing, default=checked.
rename "publish_cterms" to "generate_cterms"
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-10-31 19:31:12 +01:00
Jean-Yves Gaulier
ce13112105 PHRAS-2808_disable-cterms_4.1 
new : checkbox in admin/field to disable cterms generation.
fix : when cterms is cleared (during reindex), rejected terms are kept
WIP
 2019-10-31 18:12:26 +01:00
Harrys Ravalomanana
02e670880d PHRAS-2761 #comment Port of PHRAS-2801 (Fix on firefox) 2019-10-29 18:11:46 +04:00
Harrys Ravalomanana
df86aac2ba PHRAS-2766 #comment port 41 Add status change capabilities to quarantine #time 3h 2019-10-29 16:48:14 +04:00
Moctar
b22793f21a add missing cache directory 2019-10-24 18:06:50 +02:00
Alexandre BRACH
ccef7b11dc kubernetes #comment add yarn in the fpm/worker images 2019-10-18 16:49:01 +02:00
Alexandre BRACH
5f1f8b3b43 kubernetes #comment add composer in the fpm/worker images 2019-10-18 16:49:01 +02:00
Nicolas Maillat
ad76d73e64 Merge branch 'master' into kubernetes_ready 2019-10-18 11:23:59 +02:00
Nicolas Maillat
31d2032056 Merge branch 'master' into PHRAS-2785_facets_on_date_restitued_in_wicked_way 2019-10-11 17:10:52 +02:00
Nicolas Maillat
190ac6bb9f Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-10-09 17:19:09 +02:00
Nicolas Maillat
1becb29bc3 Merge pull request #3190 from xrousset78800/PHRAS-2791/serve-poster-image-with-subdef-permalink 
PHRAS-2791  #comment merge  in 4.1 Serve a permalink instead of direct url.
 2019-10-09 17:18:42 +02:00
Xavier Rousset
f6faaee857 PHRAS-2791 | 4.1 | Serve a permalink instead of direct url in case of specific subdef is selected 2019-10-09 17:04:08 +02:00
Nicolas Maillat
8551469c1f Merge branch 'master' into PHRAS-2785_facets_on_date_restitued_in_wicked_way 2019-10-09 10:52:03 +02:00
Nicolas Maillat
59900c3cdf Merge pull request #3189 from jygaulier/PHRAS-2751_geoloc-search-403err_master 
PHRAS-2751 #comment geoloc search 403err master
 2019-10-08 16:35:24 +02:00
Jean-Yves Gaulier
a4631cb434 PHRAS-2751_geoloc-search-403err_master 
fix : geoloc search should work again (missed method during PHRAS-2707)
 2019-10-08 15:30:19 +02:00
Harrys Ravalomanana
ce67d5f62d PHRAS-2785 #comment Port41 of PHRAS-2758 #time 1h 2019-10-08 16:40:07 +04:00
Alexandre BRACH
9b25efdc67 kubernetes #comment add global nginx configuration 2019-10-04 15:56:38 +02:00
Alexandre BRACH
9fdd704d5a kubernetes #comment create needed directory for worker 2019-10-04 09:30:42 +02:00
Alexandre BRACH
6660c7fe32 kubernetes #comment tmp owner is root at fpm startup 2019-10-03 16:40:02 +02:00
Harrys Ravalomanana
e0ee90e3af PHRAS-2761 #comment add status change to quarantine #time 8h 2019-10-01 16:10:46 +04:00
Alexandre BRACH
c85796fb29 kubernetes #comment fix permissions on datas and thumbnails directory at startup 2019-09-27 17:08:15 +02:00
Alexandre BRACH
b87ab0cd08 kubernetes #comment fpm stop on failure 2019-09-27 16:28:49 +02:00
Nicolas Maillat
d6c61eba28 Merge pull request #3179 from aynsix/PHRAS-2754-reactivate-permalink-41 
PHRAS-2754 #comment merge in  4.1, reactivate permalink when record moved from TRASH
 2019-09-27 16:27:05 +02:00
Nicolas Maillat
90959422eb Merge branch 'master' into PHRAS-2754-reactivate-permalink-41 2019-09-27 16:10:59 +02:00
Alexandre BRACH
b66aae5047 kubernetes #comment Reconfigure nginx to serve log on stdout 2019-09-27 14:31:17 +02:00
Nicolas Maillat
49ed81244e Merge pull request #3169 from HRavalomanana/PHRAS-2686_paging_new_design 
PHRAS-2686 #comment merge Prod - answer grid - Keep Pagination always visible. last fix for max page number
 2019-09-27 12:48:43 +02:00
Alexandre BRACH
b7f5a4cf3c kubernetes #comment Fix the owner of config to app at the fpm container startup 2019-09-27 10:20:58 +02:00