Commit Graph

2438 Commits

Author SHA1 Message Date
miguel angel rasteu 19696b1f89 #10967 Fix blue background in event list dialog 2023-05-30 08:50:58 +02:00
Matias Didier a32d9351df Merge branch 'ent-11150-vista-de-logs-se-desborda' into 'develop'
Ent 11150 vista de logs se desborda

See merge request artica/pandorafms!5892
2023-05-26 09:16:25 +00:00
Rafael Ameijeiras 6ec71d7d30 Merge branch 'ent-11302-vista-de-about-da-pena' into 'develop'
Ent 11302 vista de about da pena

See merge request artica/pandorafms!5949
2023-05-25 14:51:33 +00:00
Jorge Rincon bbeeb5b052 #11153 Fixed the size of the steps so that it doesn't take up 100% 2023-05-25 14:58:33 +02:00
Jonathan aa22026b45 #11271 fix style azure configuration 2023-05-25 10:17:59 +02:00
Rafael Ameijeiras 3eb49f318d Merge branch 'ent-11044-15486-cambiar-color-de-desplegables-en-modo-oscuro' into 'develop'
Ent 11044 15486 cambiar color de desplegables en modo oscuro

See merge request artica/pandorafms!5771
2023-05-24 16:35:55 +00:00
Jorge Rincon b422bf75b2 Fixed scrolling of the database tab 2023-05-24 13:03:31 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Jorge Rincon 5a9fcbde95 #11302 Fixed bugs in modal UI about 2023-05-23 15:12:06 +02:00
Daniel Rodriguez dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop'
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
2023-05-23 10:07:14 +00:00
Rafael Ameijeiras 900b1fb3f5 Merge branch 'ent-10968-el-campo-comentario-mostrado-en-la-vista-deberia-tener-una-fuente-dos-puntos-mas-pequena' into 'develop'
Ent 10968 el campo comentario mostrado en la vista deberia tener una fuente dos puntos mas pequena

See merge request artica/pandorafms!5747
2023-05-22 15:51:45 +00:00
Daniel Maya 2eb617e1e6 #11268 Fixed css 2023-05-18 11:38:44 +02:00
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
Rafael Ameijeiras b3f37f8bb4 Merge branch 'ent-10991-15445-usuario-estandar-con-perfil-pandora-administrator-no-puede-ver-vista-authentication' into 'develop'
Ent 10991 15445 usuario estandar con perfil pandora administrator no puede ver vista authentication

See merge request artica/pandorafms!5751
2023-05-17 14:42:27 +00:00
miguel angel rasteu 52886b96b3 #10328 Fix security font and values 2023-05-16 17:03:10 +02:00
Daniel Rodriguez 9fdfdf0288 Merge branch 'ent-11081-selectores-de-cron-no-funcionan' into 'develop'
Ent 11081 selectores de cron no funcionan

See merge request artica/pandorafms!5891
2023-05-16 11:23:53 +00:00
Daniel Rodriguez 05a2aa07d5 Merge branch 'ent-11092-vista-tactica-de-grupo-es-demasiado-ancha' into 'develop'
Draft: Ent 11092 vista tactica de grupo es demasiado ancha

See merge request artica/pandorafms!5817
2023-05-16 10:12:57 +00:00
miguel angel rasteu af2f8fcab8 Fix font family 2023-05-12 12:56:22 +02:00
miguel angel rasteu cbb98a2f9d #11150 Add new properties to pre-wrap class 2023-05-12 10:56:48 +02:00
miguel angel rasteu ee40d0443d #11081 Change background color for disabled cron inputs 2023-05-12 10:01:52 +02:00
Matias Didier e92490875a Merge branch 'ent-11036-pagination-does-not-work' into 'develop'
Ent 11036 pagination does not work

See merge request artica/pandorafms!5765
2023-05-12 07:05:42 +00:00
miguel angel rasteu c3d8aa39bd #11161 Fix conditional to evaluate user_admin. Fix style CSS. Fix process_user_log 2023-05-11 14:48:06 +02:00
Jonathan 382d8b9b24 #11162 visual fix sunburst 2023-05-10 15:37:25 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
Pablo Aragon 7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
Rafael Ameijeiras 37d0cff221 Merge branch 'ent-10340-gotty-quickshell-no-funciona' into 'develop'
Fix gotty host missing on ws.php

See merge request artica/pandorafms!5812
2023-05-08 06:05:31 +00:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Jonathan 07e511940d #9267 add recursive services childer 2023-05-03 14:29:37 +02:00
Daniel Cebrian d2c26ba607 #11092 fixed response tactical view 2023-05-03 11:07:20 +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
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop'
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
2023-04-28 06:04:18 +00:00
Daniel Cebrian cc2ab53db4 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-26 13:02:13 +02:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
Pablo Aragon 2303b880b6 11044-Select2 black in graphs options 2023-04-24 16:49:44 +02:00
Jorge Rincon 30697d5b33 #10963 icon change in the reset button, agent detail view 2023-04-24 14:31:20 +02:00
Daniel Cebrian 46fe04983a #9771 added class to control show icon in actions 2023-04-24 12:29:26 +02:00
Pablo Aragon b3f2c6cad1 11036-Incorrectly closed quotes 2023-04-24 09:51:33 +02:00
Rafael Ameijeiras cd3d4cb98c Merge branch 'ent-10692-nuevo-widget-simple-graph' into 'develop'
new widget basic chart pandora_enterprise#10692

See merge request artica/pandorafms!5748
2023-04-20 12:07:11 +00:00
Daniel Rodriguez f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop'
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
2023-04-20 11:51:13 +00:00
Daniel Cebrian 6ef34d78c4 #10991 fixed background in black theme 2023-04-20 12:47:06 +02:00
Jorge Rincon 9acfa36d43 #10698 Adjusted style of comment field, event list view 2023-04-20 10:22:37 +02:00
daniel a89e1aa534 new widget basic chart pandora_enterprise#10692 2023-04-20 10:16:18 +02:00
alejandro.campos@artica.es a73c8347ed changed icons 2023-04-20 10:01:35 +02:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
Jonathan 1efc9dab8e #10959 change style message info header 2023-04-18 16:47:44 +02:00
Matias Didier 94fdf153d3 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente' into 'develop'
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente

See merge request artica/pandorafms!5658
2023-04-18 14:32:28 +00:00
Jonathan ad0e922ece #10966 change style widget info groups 2023-04-18 12:56:18 +02:00
Pablo Aragon 8167c93aad 10755-Confict 2023-04-18 10:52:24 +02:00
Pablo Aragon 53bbae5264 10755-Confict 2023-04-17 15:47:42 +02:00
Pablo Aragon 6bc185e148 10848-confict 2023-04-16 18:06:54 +02:00
Rafael Ameijeiras dbba723c08 Merge branch 'ent-10918-pantallas-de-fondo-de-la-vista-de-login' into 'develop'
Ent 10918 pantallas de fondo de la vista de login

See merge request artica/pandorafms!5708
2023-04-13 12:33:42 +00:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
2023-04-13 08:24:18 +00:00
Pablo Aragon 2d8d501fe8 10918-Fix login background & text 2023-04-12 17:21:18 +02:00
Jonathan 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
Pablo Aragon 8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Pablo Aragon c8ca3ad68f 10848-Small input graph form 2023-04-05 17:29:28 +02:00
Pablo Aragon 5f6213f0f0 10863-Buttons Network maps 2023-04-05 14:15:23 +02:00
Daniel Maya 91f2336ff4 #10740 heatmap improvements 2 2023-04-05 12:25:33 +02:00
Rafael Ameijeiras cc2709c42c Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
2023-04-05 06:47:31 +00:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Pablo Aragon e10b072df8 10755-Horizontal graph legend 2023-04-04 14:30:43 +02:00
Jonathan 99b07a2fb2 Conflict solution 2023-04-04 11:35:26 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Pablo Aragon 435c944c75 10375-Vertical align Tactical view 2023-04-04 09:50:00 +02:00
Pablo Aragon e4c8097e9c 10402 remove passwords box & 10856 vcard 2023-04-04 09:24:29 +02:00
Pablo Aragon 2dcba8c8fb 10643 2023-04-03 08:43:24 +02:00
slerena 20df35e399 Removed border conflicting with white/black styles. 2023-03-31 12:29:35 +00:00
slerena 484c4d4d03 Update event row style (removed duped line) 2023-03-31 12:28:52 +00:00
slerena 07dcc57a5b Styles for events in default (white) style 2023-03-31 12:27:08 +00:00
Jonathan 8d950c3672 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 13:37:59 +02:00
Jonathan e8e7dcc5ec Actions select bulk operations view 2023-03-31 13:37:43 +02:00
Pablo Aragon be9be17398 10748 2023-03-31 13:24:20 +02:00
Pablo Aragon addd686ada 10834 2023-03-31 12:24:37 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
daniel 24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon 98acf2b864 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 16:50:40 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Jonathan 9635b4b721 Dashboard slides fix 2023-03-30 16:45:27 +02:00
Pablo Aragon a8333801bb Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 13:00:28 +02:00
Pablo Aragon 7c4d353d7c csv 2023-03-30 13:00:23 +02:00
daniel f2e1b2ef57 fixed styles 2023-03-30 12:36:05 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
Jonathan ae58add6a9 Dashboard pure fix options 2023-03-30 12:18:16 +02:00
Jonathan ace79d3ac1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 10:26:36 +02:00
Jonathan da08d4e802 SNMP Wizard visual changes 2023-03-30 10:26:29 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
daniel 2c1301f542 fixed styles 2023-03-30 08:59:40 +02:00
slerena 711b75247f Change header copyright and other details 2023-03-30 08:05:32 +02:00
slerena e9fcfe7449 Improved legibility for warning messages (warning class). 2023-03-30 08:05:32 +02:00
slerena d1e29075a3 Change header copyright and other details 2023-03-29 18:25:00 +00:00
slerena 68f417f3f3 Improved legibility for warning messages (warning class). 2023-03-29 18:24:18 +00:00
Pablo Aragon 168d03eecc New qrcode.js version & vcard 2023-03-29 15:35:18 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
daniel e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
daniel e4383a0573 fixed styles 2023-03-29 14:07:56 +02:00
Jonathan a64f9e98b3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 13:44:54 +02:00
Jonathan 49500af75f Visual console duplicate copy items border fix 2023-03-29 13:44:47 +02:00
daniel d2e642ca3e fixed styles 2023-03-29 13:37:13 +02:00
Jonathan 962562f12f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 13:35:03 +02:00
Jonathan d5ac49e9db Log viewer fix styles 2023-03-29 13:34:54 +02:00
daniel 6c189b8834 fixed styles 2023-03-29 13:31:15 +02:00
daniel 5d952a83fe fixed styles 2023-03-29 12:39:23 +02:00
Pablo Aragon 1a82056039 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 12:13:05 +02:00
Pablo Aragon 7ada30c9b1 10718 & 10821 2023-03-29 12:12:56 +02:00
daniel 32bc7335ac fixed styles 2023-03-29 09:11:26 +02:00
daniel 86e492f275 fixed styles 2023-03-28 17:26:14 +02:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
Pablo Aragon c7cd688b4b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 12:39:32 +02:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
Daniel Maya 712da9070f #10699 Fixed maps 2023-03-28 10:45:41 +02:00
Jonathan 87946161f3 Solution conflict 2023-03-28 09:30:18 +02:00
Jonathan 81be0da7fd Module manager editor relations visual change 2023-03-28 09:17:47 +02:00
Pablo Aragon 98f812b757 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 17:03:45 +02:00
Pablo Aragon 55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +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 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Pablo Aragon 8b163cd100 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 16:42:15 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Pablo Aragon 41a20a90fa Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 11:23:14 +01:00
Pablo Aragon 904b526b30 Change pass login. Graph tree view width 2023-03-22 11:23:07 +01:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
daniel 732000f7bd fixed styles 2023-03-21 18:42:31 +01:00
Pablo Aragon 583ec8209c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 18:12:11 +01:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Jonathan 93f5b62bd2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 14:23:15 +01:00
Jonathan a960644975 Omnishell fix view 2023-03-21 14:23:12 +01:00
daniel 64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Pablo Aragon 1f7183c701 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 13:31:18 +01:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Daniel Cebrian 388c6c3a2f fixed color in counter refresh in node 2023-03-21 11:07:44 +01:00
Daniel Cebrian 2db4ec6a2b fixed color in counter refresh 2023-03-21 10:53:23 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +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
Jose Gonzalez 0bbf8d0344 New dot icon 2023-03-17 08:58:25 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +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
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 3aba51d0ed Borders and colors PDFS 2023-03-16 10:42:39 +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
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
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
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
Pablo Aragon 620bff28af Dashboards widgets 2023-03-14 15:59:20 +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
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 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
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
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
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
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
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Pablo Aragon 2cd09d7618 Datatable message info 2023-03-13 12:03:33 +01:00
Jonathan 80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +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
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
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 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 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 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
daniel 9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01: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
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
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
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
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
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
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
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
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 bc501ec552 fixed styles 2023-03-08 08:28: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
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
Pablo Aragon d529e6f384 Alerts 2023-03-07 15:59:36 +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
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
Jose Gonzalez b68fe38102 Controls improve 2023-03-07 11:15:01 +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
Jose Gonzalez d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
alejandro.campos@artica.es f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +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
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
Pablo Aragon 6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +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 9ad97ee267 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 14:51:07 +01:00
Jose Gonzalez 6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +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 7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
Jonathan 8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
Daniel Maya ccb0d69edd #10518 Added new menu 2023-03-03 09:15:51 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jose Gonzalez 18076d27cc 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:25:00 +01:00
Jose Gonzalez 7a11ce4145 Visual Consoles 2023-03-02 17:24:52 +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
daniel 6545bdbaf1 fixed styles 2023-03-02 14:25:52 +01:00
Daniel Cebrian dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00
Jose Gonzalez 9a295cf974 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 12:59:47 +01:00
Jose Gonzalez d65852e9aa Visual console 2023-03-02 12:59:40 +01:00
daniel 6c87ec3c99 fixed styles 2023-03-02 11:29:47 +01:00
Daniel Cebrian a4a5650a01 #10347 added modal in heatmap agent 2023-03-02 11:10:37 +01:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Daniel Cebrian ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
Diego Muñoz-Reja 2057cf8d47 Merge branch 'ent-9666-nuevo-widget-event-cardboard' into 'develop'
Ent 9666 nuevo widget event cardboard

See merge request artica/pandorafms!5533
2023-03-01 15:49:47 +00:00
Jonathan cc13726718 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:17:40 +01:00
Jonathan c4096f7d25 Reporting wizards 2023-03-01 14:17:03 +01:00
daniel 7b1d8a535a fixed styles 2023-03-01 13:19:12 +01:00
Jose Gonzalez 92c72d2026 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:37:27 +01:00
Jose Gonzalez 7958793e1a Service 2023-03-01 12:37:17 +01:00
Pablo Aragon 81e349bfd7 Ipam 2023-03-01 12:23:49 +01:00
Pablo Aragon a5758a86a9 Ipam 2023-03-01 12:22:46 +01:00
Jonathan 7e4337e4f3 Reporting templates 2023-03-01 12:14:23 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jose Gonzalez fa354ff8e6 Minor changes 2023-02-28 17:54:22 +01:00
Jose Gonzalez ad34dfef21 Minor changes 2023-02-28 17:53:10 +01:00
Pablo Aragon c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00