Commit Graph

690 Commits

Author SHA1 Message Date
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