Commit Graph

18388 Commits

Author SHA1 Message Date
artica 01e152a6e3 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica dc86557f19 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica fff8b78cb4 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica b9e546cbd6 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica f896eceb47 Auto-updated build strings. 2023-03-21 01:00:19 +01:00
artica 37940a2565 Auto-updated build strings. 2023-03-20 01:00:08 +01:00
artica e64d9e2b7b Auto-updated build strings. 2023-03-19 01:00:12 +01:00
artica 426f756d16 Auto-updated build strings. 2023-03-18 01:00:23 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Pablo Aragon b922b50688 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 11:34:00 +01:00
Pablo Aragon 6b140445c3 10712-New login 2023-03-17 11:33:50 +01:00
Calvo 284e20fc8a Unified default netflow interval and deleted from console setup 2023-03-17 10:58:58 +01:00
daniel f83acb99f0 fixed create user and add profile 2023-03-17 10:09:11 +01:00
Daniel Cebrian bb794d603b fixed button create tips and icon remove 2023-03-17 09:13:00 +01:00
Jose Gonzalez 0bbf8d0344 New dot icon 2023-03-17 08:58:25 +01:00
Jonathan c219ad91c7 Visual minor fix 2023-03-17 08:53:58 +01:00
Calvo 13f52c18bc Merge remote-tracking branch 'origin/develop' into ent-10411-15079-error-event-replication-en-vista-de-comentarios 2023-03-17 08:44:59 +01:00
artica 6b14fc0205 Auto-updated build strings. 2023-03-17 01:00:38 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jose Gonzalez bbb1855d81 External Tools 2023-03-16 17:38:51 +01:00
Daniel Cebrian f8f65bf5a1 fixed icon size 2023-03-16 17:26:48 +01:00
Daniel Cebrian 20b177d121 changed in welcome tips forms 2023-03-16 17:23:48 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
Jonathan 921e949947 cluster visual fix link 2023-03-16 16:06:03 +01:00
Jonathan ad5078fcc0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 13:31:22 +01:00
Jonathan f417772642 TipsWindow blacktheme 2023-03-16 13:31:16 +01:00
Pablo Aragon de93dd1c6e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 12:57:59 +01:00
Pablo Aragon 260caca63a 10021, 10224, 10652, 10414 2023-03-16 12:57:48 +01:00
Jose Gonzalez 3782fdaaf6 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 12:50:39 +01:00
Jose Gonzalez 7bd8f0cc0d Minor visual fix 2023-03-16 12:50:31 +01:00
Jonathan fa06b4e8a3 datepicker fix logviewer 2023-03-16 12:22:14 +01:00
Daniel Maya 1eae8a5a4d #9893 fixed images 2023-03-16 12:04:18 +01:00
Jonathan 45a055573a Log viewer datepicker fixed 2023-03-16 11:59:38 +01:00
Jonathan 02ef024905 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 10:42:46 +01:00
Jonathan 3aba51d0ed Borders and colors PDFS 2023-03-16 10:42:39 +01:00
Daniel Maya 1d4aeef893 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-16 10:10:16 +01:00
Jose Gonzalez e474ec0915 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 09:43:38 +01:00
Jose Gonzalez 9ac04fba28 Netflow fix 2023-03-16 09:42:59 +01:00
artica 2767d24f60 Auto-updated build strings. 2023-03-16 01:00:18 +01:00
daniel 39f342a982 fixed styles 2023-03-15 21:17:50 +01:00
Jose Gonzalez d2a807636e General Setup view 2023-03-15 17:43:35 +01:00
Jose Gonzalez e9526bf886 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 16:37:33 +01:00
Jonathan 9a21c40780 Background white PDFS 2023-03-15 16:35:49 +01:00
Jose Gonzalez 84fe5695d8 Visual styles Setup view 2023-03-15 16:34:18 +01:00
Jonathan ac3816709c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 16:06:47 +01:00
Jonathan 30538265e8 Cluster wizzard visual fix 2023-03-15 16:06:42 +01:00
Pablo Aragon 797f43ff3c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 15:58:34 +01:00
Pablo Aragon bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Jonathan 19b295060b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 13:53:34 +01:00
Jonathan 17ba51d2bf cluster view 2023-03-15 13:53:23 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
Pablo Aragon 00a5e8e84b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:30:40 +01:00
Pablo Aragon 938e8cd777 Dashboards widgets 2023-03-15 11:30:22 +01:00
Jonathan d323ab7fe5 Timezonevisual correction and fix conflict 2023-03-15 09:06:07 +01:00
Daniel Cebrian 1b0477bd1f Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-15 09:06:00 +01:00
Daniel Cebrian e0c5921d59 #10633 fixed size icon connection_check 2023-03-15 09:01:49 +01:00
artica b082910ca6 Auto-updated build strings. 2023-03-15 01:00:57 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/extras/mr/62.sql
2023-03-14 18:17:54 +01:00
Jonathan c2b8554713 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 17:28:24 +01:00
Jonathan f9fe35e0c3 log viewer and sort reporting 2023-03-14 17:28:17 +01:00
Daniel Cebrian 26c08ebe0f #10650 fixed bug when user access in view maintenance and show modules select 2023-03-14 17:13:19 +01:00
Pablo Aragon 302e3c8bf7 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 15:59:27 +01:00
Pablo Aragon 620bff28af Dashboards widgets 2023-03-14 15:59:20 +01:00
Jonathan 2424e5009c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 15:42:02 +01:00
Jonathan dac980e55e PDFs visual changes 2023-03-14 15:41:55 +01:00
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 2955df3b9c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 13:47:21 +01:00
Jonathan 9f953809a0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 13:26:31 +01:00
Jonathan 00ba02e23e Visual changes PDFs slicebar 2023-03-14 13:26:21 +01:00
Daniel Cebrian d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
Jose Gonzalez b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
Daniel Maya a7a283fe22 #8642 Fixed heatmap widget 2023-03-14 12:52:44 +01:00
Daniel Maya 62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Daniel Cebrian e4d6737192 #10324 fixed system fav in meta 2023-03-14 09:42:26 +01:00
Jose Gonzalez 3eced53695 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 09:06:08 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez 3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +01:00
artica cf23817a7f Auto-updated build strings. 2023-03-14 01:00:35 +01:00
daniel d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Jonathan fcdd585042 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 17:36:11 +01:00
Jonathan 4f2ab51252 UI Reporting PDF Changes 2023-03-13 17:36:04 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
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 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
Jose Gonzalez 3ebfee9ccb Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:21:35 +01:00
Jose Gonzalez c2ba5cfdd3 Agent status 2023-03-13 16:21:14 +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 1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Daniel Maya 0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +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
Jose Gonzalez 3ae465c1fe Fix header help icons 2023-03-13 14:33:42 +01:00
Jose Gonzalez 0624f16ce9 Minor fix 2023-03-13 14:23:54 +01:00
Jonathan a0bffb79bd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 14:21:17 +01:00
Jonathan 10c0d95f34 Reports PDFS changes 2023-03-13 14:21:10 +01:00
Calvo 8bdc528dc4 Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole 2023-03-13 12:58:14 +01:00
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Pablo Aragon 0203e5eba9 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 12:03:43 +01:00
Pablo Aragon 2cd09d7618 Datatable message info 2023-03-13 12:03:33 +01:00
Jose Gonzalez 590e7a3978 Netflow improvements 2023-03-13 11:25:43 +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
Jonathan 80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Daniel Cebrian f79d22b781 #9624 clear log 2023-03-13 09:57:57 +01:00
Jose Gonzalez bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
daniel 80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
2023-03-13 09:23:53 +01:00
Daniel Cebrian 3c614c7c46 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 09:01:59 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel 60f8c9bc95 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 07:55:43 +01:00
artica 87e165ff80 Auto-updated build strings. 2023-03-13 01:00:18 +01:00
artica ef04e54058 Auto-updated build strings. 2023-03-12 01:00:40 +01:00
Jose Gonzalez d449179765 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-11 02:10:23 +01:00
Jose Gonzalez f553019a40 Minor fixes 2023-03-11 02:10:16 +01:00
artica a4d1d2c9b2 Auto-updated build strings. 2023-03-11 01:00:20 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Calvo e2297171cb Process inventory modules with correct xml and empty data 2023-03-10 15:14:43 +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
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Jose Gonzalez f875fe674e Fix main_menu_icons 2023-03-10 12:52:18 +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 bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +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
Pablo Aragon b785696acd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:29:24 +01:00
Pablo Aragon 000874ea6e CSV button datatable. IPAM fix 2023-03-10 12:29:13 +01:00
Daniel Maya 030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +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
Jose Gonzalez 3f884d9aff Tree View fixed 2023-03-10 11:09:36 +01:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01: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
daniel 8736629954 fixed styles 2023-03-10 08:38:44 +01:00
artica 0cfe85770f Auto-updated build strings. 2023-03-10 01:00:21 +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
daniel 312efeaa1e Merge branch 'ent-10281-descuadre-vista-snmp-console' into 'develop'
Ent 10281 descuadre vista snmp console

See merge request artica/pandorafms!5526
2023-03-09 18:59:36 +00:00
daniel 89b3be06f9 fixed styles 2023-03-09 19:57:37 +01:00
daniel 6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Jonathan ff1b9b3b2b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 17:21:54 +01:00
Jonathan a9de0496f6 tables graphs info_table class 2023-03-09 17:21:36 +01:00
Pablo Aragon 188ad07be0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 17:21:29 +01:00
Pablo Aragon d3ed5a93fc Admin tools 2023-03-09 17:21:18 +01:00
alejandro.campos@artica.es 5148dcdaef fixes in event comments 2023-03-09 17:17:54 +01:00
Jose Gonzalez a41811ee58 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 16:37:49 +01:00
Jose Gonzalez a9abda1fd4 Network maps adjust 2023-03-09 16:37:43 +01:00
Jonathan 068f23f278 Tables icon svg correction reports 2023-03-09 16:33:58 +01:00
Rafael Ameijeiras bcc1775b1b Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop'
handling synchronizer instantiation when metaconsole is merging

See merge request artica/pandorafms!5580
2023-03-09 15:28:20 +00:00
Jonathan 7b3ed98d4b Agent inventory fix graph 2023-03-09 16:28:08 +01:00
Daniel Maya d6dec9d869 #9893 merge develop 2023-03-09 16:27:47 +01:00
Daniel Maya 41e255ff9c #9893 added token legacy_database_ha 2023-03-09 16:24:43 +01:00
Jonathan 13261a1298 Availability Graph correction 2023-03-09 16:08:33 +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
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 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
Rafael Ameijeiras 6ecb49bbda Merge branch 'ent-10548-No-se-puede-acceder-a-las-colecciones-del-satalite' into 'develop'
fixed license check

See merge request artica/pandorafms!5585
2023-03-09 08:05:51 +00:00
Jonathan 69cc3bbd22 #10281 snmp browser details view 2023-03-09 08:37:58 +01:00
artica c109c45c20 Auto-updated build strings. 2023-03-09 01:00:20 +01:00
Jose Gonzalez 47c67ff131 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 00:45:48 +01:00
Jose Gonzalez c855061d43 Netflow view 2023-03-09 00:45:41 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Pablo Aragon d0c8794361 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 17:12:22 +01:00
Pablo Aragon bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Jonathan 08c2803970 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 17:09:47 +01:00
Jonathan 54e6a99cc3 Dashboard pagination visual position 2023-03-08 17:09:42 +01:00
Daniel Maya 72990ab177 #9662 Fixed pandora black 2023-03-08 16:41:26 +01:00
Daniel Cebrian 6efa1f46d7 #10324 fixed conflic wit tickets 10325 2023-03-08 16:01:50 +01:00
Jonathan 434aa1dbc3 z-index fix on buttons and mesage 2023-03-08 15:57:55 +01:00
Jose Gonzalez a8c177a248 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:57:19 +01:00
Jonathan b6aa5fc11e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:45:23 +01:00
Jonathan 63ecb7eb0b Tree view metaconsole view like nodo 2023-03-08 15:45:18 +01:00
Pablo Aragon 2934ff25ff Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:31:05 +01:00
Pablo Aragon 87e82c0410 10457-Audit log, save/load filters 2023-03-08 15:30:48 +01:00
Jose Gonzalez 0304c1f18e Calendar CSS styles 2023-03-08 15:23:42 +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 1d3d2fc5fd Minor fixes 2023-03-08 15:01:41 +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
daniel bc501ec552 fixed styles 2023-03-08 08:28:48 +01:00
daniel 8567cb55fb Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-08 08:06:05 +01:00
artica 27357b16b6 Auto-updated build strings. 2023-03-08 01:00:21 +01:00
Jose Gonzalez eefb62e520 Input improve 2023-03-07 22:45:48 +01: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
alejandro.campos@artica.es 7e5dee5418 fixed license check 2023-03-07 16:27:14 +01:00
daniel 1ba420a9ce fixed styles 2023-03-07 16:22:13 +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
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 226b80b7c7 Icon revision 2023-03-07 15:59:10 +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 d4125be1b6 Fix visual issue with radios 2023-03-07 15:00:34 +01:00
Matias Didier d206471673 Merge branch 'ent-10347-vista-tactica-de-grupo' into 'develop'
Ent 10347 vista tactica de grupo

See merge request artica/pandorafms!5572
2023-03-07 13:55:57 +00: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
vgilc 7c0259be78 Merge branch 'ent-10518-nuevo-menu-metaconsola' into 'develop'
Draft: Ent 10518 nuevo menu metaconsola

See merge request artica/pandorafms!5573
2023-03-07 13:00:17 +00: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 28a003706b Action messages in modals 2023-03-07 12:50:09 +01:00
daniel c3a297e096 fixed styles 2023-03-07 12:18:51 +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
Jose Gonzalez 70cf44cb8f Module Templates 2023-03-07 11:15:58 +01:00
Jose Gonzalez b68fe38102 Controls improve 2023-03-07 11:15:01 +01:00
Jose Gonzalez 1f45ee33b2 Header icon 2023-03-07 11:14:10 +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 d0f2f7a9c1 TreeController fixed 2023-03-07 09:48:23 +01:00
Jose Gonzalez e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Daniel Cebrian 031c8a8db1 #10311 ignore extraid in sql when is empty 2023-03-07 09:10:18 +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 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
artica 6f5cae9a1f Auto-updated build strings. 2023-03-07 01:00:57 +01:00
Jose Gonzalez 5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
Jose Gonzalez d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
alejandro.campos@artica.es 5cbd9114d9 fixed load of agents 2023-03-06 18:18:26 +01:00
daniel 70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
alejandro.campos@artica.es f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez 44fb762fdf Minor fixes with graphs 2023-03-06 15:44:32 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Daniel Cebrian 6a54b814f3 #9073 added arrow images and fixed format php 2023-03-06 13:07:39 +01:00
Jose Gonzalez 3c1c14576e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 11:34:10 +01:00
Jose Gonzalez a4655c221d Added action-button class 2023-03-06 11:34:03 +01:00
Jose Gonzalez e4f63206eb Network maps minor fixes 2023-03-06 11:33:42 +01:00
Jose Gonzalez 6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +01:00
Jose Gonzalez c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
Pablo Aragon f77f635b8d div>ul>li styles 2023-03-06 10:09:21 +01:00
Pablo Aragon 9c5203885e IPAM 2023-03-06 09:23:30 +01:00
Jose Gonzalez c13b77aea9 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 09:22:02 +01:00
Jose Gonzalez 7a2e929d3e CSS styles for services 2023-03-06 09:21:48 +01:00
Rafael Ameijeiras ec0d270078 Merge branch 'ent-10234-14931-codigo-generado-erroneamente-en-la-descarga-de-ficheros-de-colecciones-en-metaconsola' into 'develop'
Ent 10234 14931 codigo generado erroneamente en la descarga de ficheros de colecciones en metaconsola

See merge request artica/pandorafms!5485
2023-03-06 08:00:53 +00:00