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
13,259 Commits 268 Branches 107 Tags
f9d307555900b101a041eca0c17b5fe9b2a1eb4a
Commit Graph

13259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
f9d3075559 PHRAS-2824 #comment add translation 2019-11-15 11:15:32 +04:00
Nicolas Maillat
06dc8aa8df Merge branch 'master' into PHRAS-2824_admin_add_string_translation 2019-11-14 18:04:17 +01:00
Nicolas Maillat
b8934f17e0 Merge pull request #3215 from AlexandreBrach/embed_README 
PHRAS-2817 #comment Embed README
4.1.0 		2019-11-14 15:29:35 +01:00
Alexandre BRACH
9d537532ce Embed README 2019-11-14 14:44:24 +01:00
Harrys Ravalomanana
d2209412a9 PHRAS-2824 #comment generate translation #time 1h 2019-11-14 12:33:03 +04:00
Nicolas Maillat
e4516644c4 Merge pull request #3212 from alchemy-fr/PHRAS-2749_create_cache_directory_in_4.1 
PHRAS-2749 #comment Add missing cache directory
 2019-11-13 18:31:19 +01:00
Nicolas Maillat
1180ccf0d2 Merge branch 'master' into PHRAS-2749_create_cache_directory_in_4.1 2019-11-13 17:44:46 +01:00
Nicolas Maillat
e8400bcf5d Merge pull request #3211 from HRavalomanana/PHRAS-2760_fix_help_menu_in_view_2 
PHRAS-2760 #comment HELP menu : close submenu on click a div out of this
 2019-11-13 16:44:23 +01:00
Nicolas Maillat
372e98b387 Merge branch 'master' into PHRAS-2760_fix_help_menu_in_view_2 2019-11-13 16:07:54 +01:00
Nicolas Maillat
0fbe121162 Merge pull request #3204 from jygaulier/PHRAS-2815_generate-cterms-multi-db_4.1 
PHRAS-2815 #comment generate cterms in multi db context on 4.1
 2019-11-13 16:07:32 +01:00
Harrys Ravalomanana
d4de76662f PHRAS-2760 #comment close submenu on click a div out of this #time 1h 2019-11-13 18:37:02 +04:00
Nicolas Maillat
3df845a2d7 Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1 2019-11-13 15:22:03 +01:00
Nicolas Maillat
0a4d597a58 Merge pull request #3209 from alchemy-fr/dependabot/npm_and_yarn/lodash.merge-4.6.2 
PHRAS-2515 #comment Bump lodash.merge from 4.6.1 to 4.6.2
 2019-11-13 15:21:21 +01:00
Nicolas Maillat
5378d593ca Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1 2019-11-13 15:16:06 +01:00
Nicolas Maillat
956aff393c Merge branch 'master' into dependabot/npm_and_yarn/lodash.merge-4.6.2 2019-11-13 14:54:31 +01:00
Nicolas Maillat
d77d1d8428 Merge pull request #3210 from HRavalomanana/PHRAS-2816_analyse_hidden_fields_on__roll_over_and_detailled_view_phras_2809 
PHRAS-2816 #comment Hidden fields is roll over and detailled view
 2019-11-13 14:45:51 +01:00
Nicolas Maillat
34e2e718ea Merge branch 'master' into PHRAS-2816_analyse_hidden_fields_on__roll_over_and_detailled_view_phras_2809 2019-11-13 10:19:38 +01:00
Harrys Ravalomanana
5f2617e5f7 PHRAS-2816 #comment add attribute gui_visible to show fields on roll over and detailled view #time 2h 2019-11-12 18:13:05 +04:00
dependabot[bot]
1260e87d8b Bump lodash.merge from 4.6.1 to 4.6.2 
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-12 13:20:08 +00:00
Nicolas Maillat
81b4dc6646 Merge pull request #3192 from alchemy-fr/kubernetes_ready 
PHRDPL-80 #comment dockerfile Kubernetes ready
 2019-11-12 14:19:27 +01:00
Harrys Ravalomanana
beb57b3af2 PHRAS-2816 #comment hidden fields on roll over and detailled view depending on gui_editable attribute #time 6h 2019-11-11 15:47:11 +04:00
Nicolas Maillat
c1b1ed0fab Merge branch 'master' into kubernetes_ready 2019-11-08 17:49:04 +01:00
Nicolas Maillat
8279fb64ec Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1 2019-11-08 17:37:17 +01:00
Nicolas Maillat
d0f4d650f0 Merge pull request #3200 from jygaulier/PHRAS-2748_bad-chars-cterms_4.1 
PHRAS-2748 #comment bad chars cterms 4.1
 2019-11-08 17:36:39 +01:00
Nicolas Maillat
a1d00fc2aa Merge branch 'master' into PHRAS-2748_bad-chars-cterms_4.1 2019-11-08 14:45:25 +01:00
Nicolas Maillat
70010a08b6 Merge pull request #3205 from HRavalomanana/PHRAS-2792_Order_manager_Applied_choice_not_shown_before_order_validation_upgrade_ppc 
PHRAS-2792  #comment merge of upgrade phraseanet-production-client@0.34.76-d
 2019-11-08 14:41:07 +01:00
Harrys Ravalomanana
deb7f70a52 PHRAS-2792 #comment upgrade phraseanet-production-client@0.34.76-d 2019-11-08 15:14:21 +04:00
Nicolas Maillat
df20d05d1b Merge pull request #3201 from HRavalomanana/PHRAS-2760_fix_help_menu_in_view 
PHRAS-2760 #comment help menue NOK in /view
 2019-11-08 11:36:08 +01:00
Jean-Yves Gaulier
38e7f6038f PHRAS-2815_generate-cterms-multi-db_4.1 
fix unit test
 2019-11-07 17:50:50 +01:00
Jean-Yves Gaulier
cba5f8a1a2 PHRAS-2815_generate-cterms-multi-db_4.1 
fix : the "generate cterms" setting is applied by db
how : the "global_structure" (fields merged) now also contains field settings by db
 2019-11-07 17:24:57 +01:00
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