Commit Graph

838 Commits

Author SHA1 Message Date
Rafael Ameijeiras 0bb69dda4d Merge branch 'ent-10328-14815-campos-ocultos-no-se-ocultan-en-comandos-segun-el-navegador' into 'develop'
Ent 10328 14815 campos ocultos no se ocultan en comandos segun el navegador

See merge request artica/pandorafms!5783
2023-05-17 14:47:08 +00:00
miguel angel rasteu cb63ee92f7 #10328 Fix JS code 2023-05-17 10:54:43 +02:00
miguel angel rasteu 52886b96b3 #10328 Fix security font and values 2023-05-16 17:03:10 +02:00
miguel angel rasteu 1d885f5e42 Fix functions_html 2023-05-16 16:15:18 +02:00
miguel angel rasteu 1fc0a43ca8 #11158 Fixed entities in agent name and icon size 2023-05-10 12:53:03 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes'
# Conflicts:
#   pandora_console/include/styles/pandora.css
2023-04-28 08:07:10 +00:00
miguel angel rasteu 8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +02:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop'
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
2023-04-25 13:27:07 +00:00
Rafael Ameijeiras 2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop'
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
2023-04-24 11:16:30 +00:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
daniel 4a5f8be859 fix hd pandora_enterprise#11006 2023-04-19 13:34:04 +02:00
Diego Muñoz-Reja aa6c591a5e Merge branch 'ent-10646-15203-edicion-de-threshold-de-acciones' into 'develop'
Ent 10646 15203 edicion de threshold de acciones

See merge request artica/pandorafms!5648
2023-04-18 14:44:35 +00:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
Pablo Aragon d144d77128 9555-Groups, agents counters 2023-04-13 09:38:52 +02:00
Pablo Aragon c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
Pablo Aragon e64053eb22 10646-Threshold zero value 2023-04-03 10:00:08 +02:00
Pablo Aragon 2dcba8c8fb 10643 2023-04-03 08:43:24 +02:00
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop'
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
2023-03-31 07:33:26 +00:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +01:00
Pablo Aragon 122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
Rafael Ameijeiras 766664470d Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop'
Ent 9893 nuevo sistema de ha

See merge request artica/pandorafms!5563
2023-03-23 12:58:53 +00:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
daniel 732000f7bd fixed styles 2023-03-21 18:42:31 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
Daniel Maya b446e89728 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-13 15:08:44 +01:00
Daniel Maya 695f3fb282 #9893 Added img disabled 2023-03-13 15:07:38 +01:00
daniel 503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
2023-03-13 10:43:38 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
daniel 6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Pablo Aragon cbc05f7ea0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 15:15:06 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
Jose Gonzalez c855061d43 Netflow view 2023-03-09 00:45:41 +01:00
Jonathan 434aa1dbc3 z-index fix on buttons and mesage 2023-03-08 15:57:55 +01:00
Jose Gonzalez 1d3d2fc5fd Minor fixes 2023-03-08 15:01:41 +01:00
Jose Gonzalez eefb62e520 Input improve 2023-03-07 22:45:48 +01:00
Jonathan 8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Pablo Aragon f3b9d73855 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 12:43:35 +01:00
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
2023-03-03 08:20:44 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Pablo Aragon 816f0f4770 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:10:01 +01:00
Pablo Aragon 0e9f7331db Ipam 2023-03-02 17:08:47 +01:00
Jose Gonzalez 4519bd3d72 Improve label input block function 2023-03-02 15:24:54 +01:00
daniel 7b1d8a535a fixed styles 2023-03-01 13:19:12 +01:00
Jonathan f72ec5eb9d Fix html_print_label_input_block default id 2023-02-28 16:09:13 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jonathan dcdf0a5188 SNMP and reporting visual changes 2023-02-27 16:33:54 +01:00
Jose Gonzalez 526bff976c Improve functionality 2023-02-27 16:33:46 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
daniel 598a1b1456 restyling 2023-02-23 12:34:41 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jose Gonzalez ec58cb4593 Plugins view 2023-02-22 14:19:57 +01:00
Jose Gonzalez 370ee54d9f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 12:16:14 +01:00
Jose Gonzalez fd0c181820 Margin reversed 2023-02-22 12:16:04 +01:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Jose Gonzalez 98bd383141 Minor html and ui improvements 2023-02-20 11:49:54 +01:00
Jose Gonzalez d8230dba94 Minor change in buttons 2023-02-16 12:35:02 +01:00
Jose Gonzalez 8673ea57b1 Fix issues with view button in setup view 2023-02-15 16:28:40 +01:00
Jose Gonzalez 2d52327285 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-15 12:51:54 +01:00
Jose Gonzalez e539fa9697 Minor HTML input checkbox fix 2023-02-15 12:48:41 +01:00
Jonathan 7e864a4db2 Select2 fix styles 2023-02-15 10:39:45 +01:00
Jose Gonzalez e499e13753 Minor fix with submit buttons 2023-02-14 12:16:09 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Pablo Aragon 971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +01:00
Jose Gonzalez 4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez ab1d2f38f6 Changed function name 2023-02-07 15:39:53 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Jose Gonzalez dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00
Pablo Aragon 6d85b912e2 9962-Omnishell in agent view 2023-02-06 16:34:40 +01:00
Jose Gonzalez 891e485781 Fixed users list view 2023-01-30 16:14:05 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Jose Gonzalez 8728551c08 Agent details modules table upgraded 2023-01-04 15:46:32 +01:00
Jose Gonzalez 977c358fa0 Grouped somethings 2022-12-19 15:08:53 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
jose.gonzalez@pandorafms.com 4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
jose.gonzalez@pandorafms.com 63e6fac6a4 Minor changes 2022-12-07 18:16:47 +01:00
jose.gonzalez@pandorafms.com 912f1d0d7a Module manager upgrade 2022-12-05 13:39:51 +01:00
jose.gonzalez@pandorafms.com 4278ffff26 Module editor improvements 2022-12-02 14:25:22 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +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
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
jose.gonzalez@pandorafms.com 88766eb7cc Fixed action-buttons 2022-11-16 16:04:22 +01:00
jose.gonzalez@pandorafms.com 03157caefe Redo agent edition-creation view 2022-11-15 16:02:40 +01:00
jose.gonzalez@pandorafms.com 325bbea8db Agent view fixed and other minor fixes 2022-11-15 08:05:04 +01:00
jose.gonzalez@pandorafms.com 197aced536 Inputs update and several style improvements 2022-11-10 15:06:39 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
jose.gonzalez@pandorafms.com 37c63a5001 Styles ando code adaptation 2022-11-04 12:55:41 +01:00
jose.gonzalez@pandorafms.com ead583b3bf Input type file changed 2022-11-04 08:43:18 +01:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop'
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
2022-10-28 15:18:15 +00:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
jose.gonzalez@pandorafms.com 809fbb4dc0 Fix somethings about styles 2022-10-27 17:31:48 +02:00
jose.gonzalez@pandorafms.com e6af39a3d7 Changes 2022-10-27 16:22:18 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com 5aaa415ed9 Several fixes 2022-10-25 17:11:18 +02:00
jose.gonzalez@pandorafms.com bb58fef610 Fixed for only icon buttons 2022-10-25 16:26:23 +02:00
jose.gonzalez@pandorafms.com 3634aab807 Code improvement 2022-10-24 19:54:15 +02:00
jose.gonzalez@pandorafms.com 9cc811a436 Improve code for buttons 2022-10-24 13:14:19 +02:00
jose.gonzalez@pandorafms.com 20a41a1b2d New buttons code changes 2022-10-21 13:35:57 +02:00
Daniel Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/functions_modules.php
2022-10-14 11:46:20 +02:00
Daniel Rodriguez 095732eab5 Merge branch 'ent-9467-no-se-pueden-cambiar-umbrales-warning-y-critical-en-ciertos-modulos' into 'develop'
Ent 9467 no se pueden cambiar umbrales warning y critical en ciertos modulos

See merge request artica/pandorafms!5148
2022-10-14 08:17:34 +00:00
Daniel Barbero ce823dca38 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 11:20:03 +02:00
Daniel Maya 87d4c03467 #5584 Added edit users 2022-09-30 14:12:18 +02:00
edu.corral b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Daniel Barbero 229436b972 fixed agent/module widget pandora_enterprise#9519 2022-09-19 14:40:31 +02:00
alejandro.campos@artica.es d7ab8dcc03 fixed php 7 error 2022-09-01 13:23:14 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Jimmy Olano a296a58b61 Merge branch 'ent-9104-selector-multiple-a-veces-escoge-elementos-incorrectos' into 'develop'
Ent 9104 selector multiple a veces escoge elementos incorrectos

#9104 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9104

See merge request artica/pandorafms!5006
2022-07-19 01:33:57 +00:00
Jimmy Olano 8f00e9da6c Merge branch 'ent-9044-Mejorar-interfaz-de-herramienta-de-copia-de-configuraciones-remotas' into 'develop'
Added Go Back input function

pandora_enterprise#9044

See merge request artica/pandorafms!4997
2022-07-18 22:35:09 +00:00
edu.corral 4673a253f9 ent-9104 selector multiple 2022-07-05 13:38:59 +02:00
Daniel Barbero Martin a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
José González d0622e7a3b Added Go Back input function 2022-06-30 13:41:56 +02:00
Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
2022-06-28 17:02:01 +02:00
Daniel Barbero Martin ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
2022-06-27 08:38:50 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
2022-06-23 10:07:24 +00:00
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
2022-06-21 14:43:47 +02:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
José González dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
Daniel Barbero Martin 9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
Daniel Barbero Martin c437b894a3 fixed modal size configuration widgets pandora_enterprise#8827 2022-05-18 12:55:10 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
Conflicts:
	pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop'
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
2022-03-15 10:08:48 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop'
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
2022-03-11 08:51:33 +00:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
2022-03-09 09:28:08 +01:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Daniel Rodriguez 3092a00edb Merge branch 'ent-8532-widget-agent-modulos-no-muestra-modulos' into 'develop'
Fix agentmodules widget conf style

See merge request artica/pandorafms!4693
2022-02-22 11:47:55 +00:00
Daniel Barbero Martin 3b1b9938ee fixed select2 multiple pandora_enterprise#8606 2022-02-22 11:00:11 +01:00
Calvo 8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
Calvo a642f88364 Multiselect filtered revomed all/common modules select and added switch 2022-02-16 12:26:22 +01:00
Calvo e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Rodriguez cc2685676a Merge branch 'ent-8486-datos-discovery-sap-al-reves' into 'develop'
patterns for text inputs

See merge request artica/pandorafms!4655
2022-02-08 16:17:38 +00:00
Daniel Barbero Martin 07ed6689d6 external alerts new filters pandora_enterprise#7933 2022-02-08 13:56:19 +01:00
Daniel Barbero Martin 1146afe94c bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 13:52:40 +01:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/pandoradb.sql
2022-02-01 15:16:21 +01:00
Daniel Rodriguez d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop'
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
2022-02-01 09:38:12 +00:00
fbsanchez e263d9a0c5 patterns for text inputs 2022-01-26 12:52:36 +01:00
Daniel Barbero Martin d76745cc9f chrome never autocomplete 2022-01-26 12:17:07 +01:00
Calvo 5b624fc388 Added searchbar to select multiple modules on custom graph 2022-01-26 11:52:49 +01:00
Daniel Barbero Martin 7b956d3ca1 select 2 never autocomplete 2022-01-26 09:14:19 +01:00
Calvo f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop'
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
2022-01-25 10:27:25 +00:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
fbsanchez 32c0229966 php8 review 2022-01-13 12:43:55 +01:00
José González f18e0693da Merge branch 'develop' into 'ent-8409-bug-widget-agent-module-view'
# Resolve Conflicts:
#   pandora_console/include/javascript/pandora_dashboards.js
2022-01-13 08:58:21 +00:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
Jose Gonzalez 9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
fbsanchez 3b6f5bd02f services php8 2022-01-11 14:30:59 +01:00
fbsanchez 7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00
Jose Gonzalez 8cdf1acd42 Fix issue with modules 2022-01-06 16:23:13 +01:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Jose Gonzalez 32a98ee5ae Regenerate DB Backup Manager 2022-01-05 11:08:49 +01:00
Calvo 3cee99cbed Fix Cluster visual bugs 2021-12-30 18:26:59 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
Conflicts:
	pandora_console/include/functions_html.php
2021-11-24 08:39:03 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
Daniel Rodriguez 3fc8e0cf7f Merge branch 'ent-7994-carrefour-anadir-filtro-en-la-vista-de-custom-field-view-metaconsola' into 'develop'
added search capacity to multiple select

See merge request artica/pandorafms!4459
2021-11-17 15:14:31 +00:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
alejandro.campos@artica.es 21c1bacc0e added search capacity to multiple select 2021-10-07 17:12:00 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3ab921acbb Merge branch 'ent-7950-errores-en-log-viewer' into 'develop'
Ent 7950 errores en log viewer

See merge request artica/pandorafms!4383
2021-10-05 09:29:24 +00:00
Daniel Rodriguez 4cff768f4b Merge branch 'ent-7760-bug-visual-con-el-times-in-al-añadir-una-accion-a-una-alerta-de-correlacion' into 'develop'
fixed visual error with time in action on ca

See merge request artica/pandorafms!4294
2021-10-05 09:27:30 +00:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop'
fallo critico del swich regordete

See merge request artica/pandorafms!4288
2021-10-05 09:24:51 +00:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez 7bdb730abd Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop'
Fix select fields size

Closes pandora_enterprise#8018

See merge request artica/pandorafms!4418
2021-09-24 07:12:52 +00:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop'
Fix widgets style bugs

See merge request artica/pandorafms!4272
2021-09-22 08:58:51 +00:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
Daniel Maya 5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos 61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
marcos 83084f54bd fixed visual error with time in action on ca 2021-07-13 11:38:46 +02:00
marcos 640c81b487 fallo critico del swich regordete 2021-07-12 13:06:30 +02:00