Commit Graph

7062 Commits

Author SHA1 Message Date
Pablo Aragon 6e4fe7bc48 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 14:56:52 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Jose Gonzalez bd9ec31c2b User list and other fixes 2023-03-14 13:46:49 +01:00
Jose Gonzalez b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
Daniel Cebrian dff82df484 #10324 fixed deleted filter event in fav menu 2023-03-14 10:31:31 +01:00
Jose Gonzalez e71014607a 10669 fix revision 2023-03-14 09:05:59 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez 397c4bd720 Fix plugin icon 2023-03-14 08:35:05 +01:00
Jose Gonzalez 3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +01:00
Jose Gonzalez f0a424a493 Module manager fix 2023-03-14 08:04:05 +01:00
Jose Gonzalez ca39fa8560 #10669 Fix configure_user issue 2023-03-13 21:21:25 +01:00
Jose Gonzalez 79fbab3696 Tubercles removal 2023-03-13 21:17:55 +01:00
Jose Gonzalez fe20b4c49c Plugins view 2023-03-13 17:32:20 +01:00
Jose Gonzalez b6251edb79 Minor fix 2023-03-13 17:31:43 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Pablo Aragon 51ab985784 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:14:02 +01:00
Pablo Aragon 6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Jose Gonzalez 1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Jose Gonzalez bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
Daniel Cebrian 596ade6d37 #10324 added system fav in tactical view group 2023-03-13 09:14:16 +01: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
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
Matias Didier 7d6452554f Merge branch 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' into 'develop'
fixed entities

See merge request artica/pandorafms!5578
2023-03-10 11:54:46 +00: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 bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +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 92e5c4efa0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 08:40:48 +01:00
Pablo Aragon ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel 9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez d4fa2831bf Inventory tab 2023-03-09 16:44:45 +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 1a63f8070a fixed styles 2023-03-09 15:06:03 +01:00
Jonathan 72a3cb0e3f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 14:15:23 +01:00
Jonathan 1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
Diego Muñoz-Reja c977188e75 Merge branch 'ent-9883-mejora-de-informes-de-inventario-de-monitorizacion' into 'develop'
Ent 9883 mejora de informes de inventario de monitorizacion

See merge request artica/pandorafms!5490
2023-03-09 11:28:48 +00:00
daniel f2123efa16 fixed styles 2023-03-09 11:32:50 +01:00
alejandro.campos@artica.es 4c926f1e04 fixed entities 2023-03-09 09:07:04 +01:00
alejandro.campos@artica.es 15afa2d976 Merge remote-tracking branch 'origin/develop' into ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre 2023-03-09 08:49:27 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Pablo Aragon bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Jose Gonzalez c51c00f974 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:05:35 +01:00
Jose Gonzalez f5daa72c6b Scheduled downtime 2023-03-08 15:04:07 +01:00
Jose Gonzalez 0373cd3514 Scheduled downtime 2023-03-08 15:02:12 +01:00
Jonathan 862e1c0ad3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:45:29 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Pablo Aragon 78eccfd73b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:36:49 +01:00
Pablo Aragon 1a7e063c60 Alerts 2023-03-08 13:36:36 +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 abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Alejandro Campos 7c9b4c6944 Merge branch 'develop' into 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre'
# Conflicts:
#   pandora_console/godmode/reporting/map_builder.php
2023-03-07 17:05:08 +00:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez 5925cb0b2c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 17:50:57 +01:00
Jose Gonzalez 2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
Pablo Aragon dbd565fd1d Alerts 2023-03-07 16:17:48 +01:00
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
daniel 5a41c8b61c fixed styles 2023-03-07 16:00:33 +01:00
Jose Gonzalez f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Pablo Aragon d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Jose Gonzalez 1b0fe3887f Fixed issue with spinner 2023-03-07 15:08:03 +01:00
Daniel Maya 6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Jose Gonzalez 4ea1d697dc Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:00:40 +01:00
Jose Gonzalez 845a637082 Inventory modules forms 2023-03-07 14:59:59 +01:00
Jonathan 8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
Jose Gonzalez f01b18b965 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 14:11:23 +01:00
Jose Gonzalez d4f900d1a4 Manage inventory icons 2023-03-07 14:11:20 +01:00
daniel b316542044 fixed styles 2023-03-07 14:03:04 +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
Daniel Cebrian fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez dd68cc7a9e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 11:48:20 +01:00
Jose Gonzalez 8f2a2f12c6 Templates view 2023-03-07 11:48:14 +01:00
Jonathan d6a461acb8 Graph container create styles 2023-03-07 11:21:25 +01:00
Jonathan 89780a7085 Container graph visual 2023-03-07 09:53:19 +01:00
Pablo Aragon 6cb78d312f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:52:05 +01:00
Pablo Aragon 6c6943c591 Alerts 2023-03-07 09:51:53 +01:00
Jose Gonzalez 1d93c666ba Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:51:23 +01:00
Jose Gonzalez e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Pablo Aragon 62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon 5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
daniel 70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Jose Gonzalez c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Jose Gonzalez 6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
Jose Gonzalez df6dddb586 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 13:52:49 +01:00
Jose Gonzalez 128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Daniel Cebrian 00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +01:00
Daniel Cebrian 7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
alejandro.campos@artica.es 6cee279de7 fixed entities 2023-03-03 12:49:54 +01:00
Jonathan 5d73f96823 Graphs template wizard visual change 2023-03-03 12:41:32 +01:00
Jonathan e5cbe07a86 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 10:12:28 +01:00