Commit Graph

691 Commits

Author SHA1 Message Date
Daniel Rodriguez f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop'
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
2023-04-20 11:51:13 +00:00
Daniel Cebrian b1d1dbb80f #11003 fixed alerts options in metaconsole 2023-04-20 09:42:42 +02:00
miguel angel rasteu 65cfb69bfc #10941 remove class table_action_buttons to make alert status visible ever 2023-04-13 15:47:45 +02:00
Pablo Aragon 564085ee01 10258-Event mail to admin 2023-04-11 09:52:49 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Daniel Maya 3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
Jonathan e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
daniel 64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Jonathan 921e949947 cluster visual fix link 2023-03-16 16:06:03 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Jose Gonzalez 79fbab3696 Tubercles removal 2023-03-13 21:17:55 +01:00
Jose Gonzalez b6251edb79 Minor fix 2023-03-13 17:31:43 +01:00
Pablo Aragon 6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Pablo Aragon 1a7e063c60 Alerts 2023-03-08 13:36:36 +01:00
Pablo Aragon d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Pablo Aragon 6c6943c591 Alerts 2023-03-07 09:51:53 +01:00
Pablo Aragon 5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
daniel ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
2023-02-28 07:32:43 +01:00
Daniel Cebrian 2b185b5754 #10493 fixed pagination in alerts 2023-02-21 15:44:41 +01:00
Pablo Aragon 80818d7b6e 10489-Fix alerts edition and event response 2023-02-21 13:18:44 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +01:00
Enrique Martin 2cf0e301c5 Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop'
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view

See merge request artica/pandorafms!5369
2023-01-05 11:46:53 +00:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Jonathan b9d6898639 #9758 update_alert_count on enable/disable alerts 2023-01-03 15:09:18 +01:00
Jonathan 707763f5e2 #10074 snmp alert edit content_type 2022-12-29 14:55:30 +01:00
Luis Calvo aa85c73a3c Fix alert list view search bug 2022-12-09 08:59:03 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
alejandro.campos@artica.es 2925df80e9 changed wrong count 2022-11-29 12:04:03 +01:00
alejandro.campos@artica.es 6243229345 changed wrong count 2022-11-29 11:54:25 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
Daniel Rodriguez 49d0f336fd Merge branch 'ent-9514-14202-Problemas-ACL-Enterprise-no-deja-borrar-alertas' into 'develop'
fix alert deletion from agent alerts

See merge request artica/pandorafms!5192
2022-11-22 14:04:08 +00:00
jose.gonzalez@pandorafms.com bf678b55dc Several views updated 2022-11-11 16:15:17 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Daniel Maya 89bd5ec22c #9665 Fixed button 2 2022-10-20 10:42:27 +02:00
Daniel Maya fcb1cd24b5 #9665 Fixed button 2022-10-18 11:02:06 +02:00
alejandro.campos@artica.es 2c57873898 fix alert deletion from agent alerts 2022-10-13 12:03:15 +02:00
Daniel Rodriguez d833c7ba39 Merge branch 'ent-9485-14165-filtrado-alertas-metaconsola' into 'develop'
Ent 9485 14165 filtrado alertas metaconsola

See merge request artica/pandorafms!5128
2022-10-13 09:24:11 +00:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
edu.corral a13c2a24a9 ent 9485 metaconsole alert filter 2022-09-21 09:46:31 +02:00