Commit Graph

1867 Commits

Author SHA1 Message Date
Diego Muñoz-Reja fa2918e8ed Merge branch 'ent-10229-AXITY-Update-jquery-para-solventar-vulnerabilidades' into 'develop'
updated jquery-ui library

See merge request artica/pandorafms!5564
2023-03-13 16:03:04 +00:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
Jose Gonzalez a065833117 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:48:50 +01:00
Jose Gonzalez dc216ff788 Tree view black 2023-03-10 12:47:44 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
#   pandora_console/pandoradb.sql
2023-03-10 10:41:08 +00:00
Pablo Aragon ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
daniel 9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
Rafael Ameijeiras 857c84f034 Merge branch 'ent-10359-GUARDIA-15007-No-se-visualizan-agentes-deshabilitados-en-operaciones-masivas-en-meta-sin-usar-opcion-Show-agents' into 'develop'
fixed error in massive agent operations in metaconsole

See merge request artica/pandorafms!5527
2023-03-09 08:08:58 +00:00
Daniel Cebrian 6efa1f46d7 #10324 fixed conflic wit tickets 10325 2023-03-08 16:01:50 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
daniel 1ba420a9ce fixed styles 2023-03-07 16:22:13 +01:00
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Jose Gonzalez d0f2f7a9c1 TreeController fixed 2023-03-07 09:48:23 +01:00
daniel dba1554d74 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/general/login_page.php
2023-03-07 08:04:45 +01:00
Jose Gonzalez 5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
alejandro.campos@artica.es 5cbd9114d9 fixed load of agents 2023-03-06 18:18:26 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Jose Gonzalez 6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Rafael Ameijeiras 03a7d9e89a Merge branch 'ent-10230-AXITY-Vulnerabilidades-underscore-js' into 'develop'
updated underscore

See merge request artica/pandorafms!5570
2023-03-06 07:59:58 +00:00
Pablo Aragon 6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
2023-03-05 22:56:35 +00:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
daniel 6545bdbaf1 fixed styles 2023-03-02 14:25:52 +01:00
Jonathan d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel 76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
2023-02-27 18:25:45 +01:00
alejandro.campos@artica.es 930879b295 updated underscore 2023-02-27 17:26:58 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
Daniel Cebrian 8a33756e3a #10324 added limit in modal title 2023-02-27 11:17:17 +01:00
Daniel Cebrian 4917b40d10 10324 fixed modal in filter title 2023-02-27 10:05:16 +01:00
Daniel Cebrian e76d8606dc #10324 added star in menu 2023-02-27 09:45:15 +01:00
Daniel Cebrian 032fcdeae4 #10324 added fav menu in reporting viewer 2023-02-24 10:23:14 +01:00
Jose Gonzalez 6a5c2c58c7 Fix tree view 2023-02-24 10:19:56 +01:00
Jonathan a09c423284 SNMP views fix 2023-02-23 17:09:58 +01:00
alejandro.campos@artica.es ed93f55048 updated jquery-ui library 2023-02-23 16:48:57 +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
Jonathan 0fbf50673a Dashboard multiselect height + delete size modal 2023-02-23 10:11:35 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Pablo Aragon e7d6afd636 10488-Fix views reports 2023-02-22 10:35:33 +01:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Jonathan 05c2232daa Modals dashboard view fix 2023-02-21 17:07:03 +01:00
Pablo Aragon 57a6bf97b0 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 11:28:36 +01:00
Pablo Aragon 7ac794f5ff 10469-Fix omnishell view 2023-02-21 11:28:26 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Jose Gonzalez 98bd383141 Minor html and ui improvements 2023-02-20 11:49:54 +01:00
Daniel Cebrian ace67ba42d #9073 fixed bug when modal close 2023-02-17 14:22:41 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Daniel Cebrian 9a0dc247c0 #9073 added preview tip 2023-02-17 11:07:28 +01:00
Daniel Cebrian 0cee40e40a #9073 create button for preview tip 2023-02-16 18:13:34 +01:00
Daniel Cebrian dce5b07109 #9073 added control image and fixed bug with language filter 2023-02-16 16:14:50 +01:00
Jonathan f557309238 Button ok mesage too much agents 2023-02-16 09:09:40 +01:00
Daniel Cebrian d8cfc68585 #9073 order by language tips 2023-02-15 17:51:30 +01:00
Daniel Cebrian 8ea9a0fc7e #9073 added system system for edit images in edit tip 2023-02-15 16:41:14 +01:00
Daniel Cebrian 09d703f981 #9073 added images input in create tips 2023-02-15 11:58:34 +01:00
Daniel Maya cac9f67153 #10195 Fixed minimap drawing 2023-02-15 10:49:31 +01:00
Daniel Cebrian 5d6ac202df #9073 clear logs 2023-02-14 10:55:48 +01:00
Daniel Cebrian ad4750c409 #9073 fixed bug in firts tips 2023-02-14 10:55:01 +01:00
Daniel Cebrian dfb93d2cf5 #9073 added token for tips in user profile configuration 2023-02-14 10:34:08 +01:00
Daniel Cebrian 887d2f8f18 #9073 added counter round un footer 2023-02-13 16:21:37 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Daniel Cebrian 6619cf059d #9073 added design v1 2023-02-13 13:26:49 +01:00
Daniel Cebrian e62dee1c62 #9073 create files structure 2023-02-13 10:06:14 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Rafael Ameijeiras 616644c3cf Merge branch 'ent-10189-mejora-visual-para-el-boton-de-testeo-de-alertas-consola-sonora' into 'develop'
blink button test sound events pandora_enterprise#10189

See merge request artica/pandorafms!5470
2023-02-10 08:01:34 +00:00
alejandro.campos@artica.es 73db9c7088 fixed error in massive agent operations in metaconsole 2023-02-09 17:15:07 +01:00
Daniel Cebrian ea789804f4 #10190 fixed response option 2023-02-07 17:41:27 +01:00
Daniel Cebrian 6117e1741f #10190 added popup for edit events in sound console 2023-02-07 16:48:23 +01:00
Pablo Aragon 36fc9b2917 9987-New inventory view 2023-02-03 09:55:46 +01:00
Jose Gonzalez bd26aa8f8d Minor fixes 2023-02-01 15:31:02 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jonathan f0d20a5775 #10153 indexof pandora visual console 2023-01-31 10:47:31 +01:00
Jonathan 89442c3ef9 #10153 regenerate build:watch 2023-01-30 17:06:24 +01:00
Jose Gonzalez 6496c08f28 Polish TreeView 2023-01-30 13:39:27 +01:00
Rafael Ameijeiras 4984599132 Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop'
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan

See merge request artica/pandorafms!5392
2023-01-30 11:24:39 +00:00
Jonathan b48cd3ff73 #10153 refresh visual console maintenanceMode 2023-01-30 10:48:10 +01:00
Jonathan be6c3e1602 #10153 refresh visual console maintenanceMode 2023-01-30 09:51:12 +01:00
daniel 69db3c8031 blink button test sound events pandora_enterprise#10189 2023-01-27 12:44:15 +01:00
Jose Gonzalez deb69a0659 Fix issue with info box messages 2023-01-26 16:00:08 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
daniel ddebce7a3c fix validate events pandora_enterprise#10175 2023-01-25 11:25:20 +01:00
Pablo Aragon a50f50d99e 9987 Commit provisional 2023-01-24 09:33:47 +01:00
Jose Gonzalez 6f4b55e076 WIP: TreeView improve 2023-01-19 23:26:26 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Daniel Maya 04e039c515 resolved conflict 2023-01-18 11:31:26 +01:00
Daniel Maya 0f42a5fa88 #9783 Fixed networkmap 4 2023-01-18 11:29:06 +01:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00