tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
34,512 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

18896 Commits

Author SHA1 Message Date
artica 538f8266dc Auto-updated build strings. 2023-04-10 01:00:11 +02:00
artica c5cd6b08e8 Auto-updated build strings. 2023-04-09 01:00:13 +02:00
artica 33904e3ed7 Auto-updated build strings. 2023-04-08 01:00:11 +02:00
artica b1489c9245 Auto-updated build strings. 2023-04-07 01:00:14 +02:00
artica 86d6c24540 Auto-updated build strings. 2023-04-06 01:00:18 +02:00
Pablo Aragon c8ca3ad68f 10848-Small input graph form 2023-04-05 17:29:28 +02:00
alejandro.campos@artica.es d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Jonathan 1dbe161ea9 Merge branch 'develop' into ent-9662-second-round 2023-04-05 14:37:13 +02:00
Pablo Aragon 5f6213f0f0 10863-Buttons Network maps 2023-04-05 14:15:23 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Pablo Aragon 2dc8b25ddc 10066-Recursion group widget alerts triggered 2023-04-05 12:59:52 +02:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
Daniel Maya 91f2336ff4 #10740 heatmap improvements 2 2023-04-05 12:25:33 +02:00
Pablo Aragon 73d7345844 10067-Alerts triggered filter tree view 2023-04-05 09:14:01 +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
artica ce43cc9bb2 Auto-updated build strings. 2023-04-05 01:00:19 +02:00
Jonathan 90b4b5d46d Merge branch 'develop' into ent-9662-second-round 2023-04-04 16:56:53 +02:00
Pablo Aragon 2ee17683e2 10859-Tree view buttons 2023-04-04 15:43:02 +02: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 2d3c3b70e6 #10727 PDF correction agent event module 2023-04-04 14:27:47 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Jonathan 99b07a2fb2 Conflict solution 2023-04-04 11:35:26 +02:00
Jonathan b1b516d664 Merge branch 'develop' into ent-10490-theme-base-de-tinymce 2023-04-04 11:31:47 +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
Matias Didier e7d71cf99c Merge branch 'ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos' into 'develop' 
Process inventory modules with correct xml and empty data

See merge request artica/pandorafms!5593
 2023-04-04 07:24:44 +00:00
Pablo Aragon e4c8097e9c 10402 remove passwords box & 10856 vcard 2023-04-04 09:24:29 +02:00
artica 0fb35a02fe Auto-updated build strings. 2023-04-04 01:00:15 +02:00
Calvo 1d6a0d049c Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-04-03 17:10:51 +02:00
Pablo Aragon fdcdde6c78 10550-Credential store clean snmp fields 2023-04-03 15:35:46 +02:00
Pablo Aragon f798149502 10653-ACL reporting 2023-04-03 14:09:37 +02:00
Daniel Rodriguez e8f7246e54 Merge branch 'ent-10826-actualizacion-traducciones' into 'develop' 
translates

See merge request artica/pandorafms!5647
 2023-04-03 11:41:51 +00:00
Rafael Ameijeiras 2a5bf21621 Merge branch 'ent-10793-fallo-de-filtro-en-welcome-tips' into 'develop' 
Ent 10793 fallo de filtro en welcome tips

See merge request artica/pandorafms!5626
 2023-04-03 10:19:11 +00:00
Calvo 764823c93f Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-04-03 10:25:58 +02:00
Pablo Aragon e64053eb22 10646-Threshold zero value 2023-04-03 10:00:08 +02:00
Pablo Aragon 2dcba8c8fb 10643 2023-04-03 08:43:24 +02:00
artica 715cedb20f Auto-updated build strings. 2023-04-03 01:00:12 +02:00
artica 2bcd4de201 Auto-updated build strings. 2023-04-02 01:00:09 +02:00
artica 070105c766 Auto-updated build strings. 2023-04-01 01:00:17 +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
daniel 631767aaef translates 2023-03-31 13:46:02 +02: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
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +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
Ramon Novoa 112de35eeb Add Netflow Server information (needs a new icon). 2023-03-31 10:54:48 +02:00
Pablo Aragon 2f619d1ef6 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 10:45:43 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Jonathan 4aaddf063c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 09:52:06 +02:00
Jonathan 93966788eb Slides require mesage 2023-03-31 09:51:48 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
artica a0828ac25c Auto-updated build strings. 2023-03-31 01:00:22 +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
alejandro.campos@artica.es a82fe73aab added limitation to group deletion 2023-03-30 15:56:48 +02:00
Calvo 307057f934 Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-03-30 15:29:55 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' 
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
 2023-03-30 12:39:06 +00:00
Jonathan 8b04d5981d Agent view follow menu change 2023-03-30 14:17:33 +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
daniel 27e13c26c6 fixed styles 2023-03-30 11:40:32 +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
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
artica 00ec0dee25 Auto-updated build strings. 2023-03-30 08:05:32 +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
artica 392139d22d Auto-updated build strings. 2023-03-30 01:00:16 +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
daniel 8458716ba9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 17:27:57 +02:00
Pablo Aragon e067a176a4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 17:09:49 +02:00
Pablo Aragon f26e70630a Blue background & Datatable fix 2023-03-29 17:09:41 +02:00
Jonathan ee0619cc4a Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 16:50:25 +02:00
Jonathan 8c3b5d650d tree view dashboard metaconsole 2023-03-29 16:50:17 +02:00
daniel 6a6c99dcab fixed styles 2023-03-29 16:31:25 +02: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
Matias Didier 4297481c35 Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop' 
Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas

See merge request artica/pandorafms!5633
 2023-03-29 12:32:44 +00:00
Calvo 16d0e7057c Excluded manual discovery tasks from server lag calculation 2023-03-29 14:31:34 +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
Daniel Maya 3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +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 c610063244 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 08:33:02 +02:00
Jonathan a760bbfbc2 MIB Uploader fix delete icon 2023-03-29 08:22:35 +02:00
Jimmy Olano 5044c23ef3 Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS. 
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios

See merge request artica/pandorafms!5492
 2023-03-29 02:28:47 +00:00
artica 5113117a39 Auto-updated build strings. 2023-03-29 01:00:25 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' 
implemented consoles management

See merge request artica/pandorafms!5558
 2023-03-28 15:33:37 +00:00
daniel 86e492f275 fixed styles 2023-03-28 17:26:14 +02:00
Daniel Maya eac71560cb #10819 Fixed policy alert img 2023-03-28 17:22:25 +02:00
Pablo Aragon dab2a29b6b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 17:07:19 +02:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
daniel 0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +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
Jonathan 7a3e894bb0 Menu fix follow reports 2023-03-28 11:06:03 +02:00
Daniel Maya 490e547202 #10699 Fixed central node 2023-03-28 11:03:59 +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
daniel 3d815d56c8 fixed styles 2023-03-28 08:45:40 +02:00
daniel 4e01838238 fixed styles 2023-03-28 08:43:46 +02:00
artica 061c9f8750 Auto-updated build strings. 2023-03-28 01:00:16 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +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
Jonathan 52076a56c2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 16:26:28 +02:00
Jonathan e06fc2f115 Collection visual fix 2023-03-27 16:26:12 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Jonathan ea6aa8629b Module check force 2023-03-27 14:07:36 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' 
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
 2023-03-27 10:43:48 +00:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
daniel af5f65a66d fixed styles 2023-03-27 11:14:58 +02:00
Jonathan 665976e011 Bulks masive visual action buttons 2023-03-27 11:10:51 +02:00
Matias Didier 2daea0e5c4 Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop' 
Ent 10764 favoritos y nuevos menus

See merge request artica/pandorafms!5618
 2023-03-27 09:01:48 +00:00
artica 78bc8e4f50 Updated version and build strings. 2023-03-27 09:41:48 +02:00
Jonathan 0ae7630714 Gis map fix view 2023-03-27 08:44:45 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
artica 75af4a2ca9 Auto-updated build strings. 2023-03-27 01:00:39 +02:00
artica 9528f59af9 Auto-updated build strings. 2023-03-26 01:00:17 +01:00
artica bcf3f1ba1f Auto-updated build strings. 2023-03-25 01:00:19 +01:00
Daniel Maya e311c81f84 #8642 Fixed meta 2023-03-24 14:11:08 +01:00
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +01:00
Daniel Cebrian 60f237b66e #10441 added version file in pandora flot 2023-03-24 12:53:48 +01:00
Pablo Aragon be1fb9298b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-24 12:29:09 +01:00
Pablo Aragon 95edb47d01 10408 2023-03-24 12:29:03 +01:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
Matias Didier 5529c33f0c Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop' 
Ent 10650 bugs funcionales en consolas visuales

See merge request artica/pandorafms!5601
 2023-03-24 09:11:26 +00:00
Rafael Ameijeiras f14be9c523 Merge branch 'ent-10311-14988-comentarios-de-eventos-se-muestran-en-evento-no-relacionado' into 'develop' 
Ent 10311 14988 comentarios de eventos se muestran en evento no relacionado

See merge request artica/pandorafms!5582
 2023-03-24 09:03:37 +00:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' 
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
 2023-03-24 07:25:52 +00:00
artica 8a14ec6725 Auto-updated build strings. 2023-03-24 01:00:23 +01:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +01:00
Pablo Aragon 0fa79e44f1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 17:44:16 +01:00
Pablo Aragon 122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
Daniel Cebrian 31fd4a616c #10793 fixed pagination filter 2023-03-23 16:36:06 +01:00
Daniel Cebrian d3408442d3 #10793 fixed collation in sql 2023-03-23 16:25:08 +01:00
Daniel Cebrian 69b573e266 #10441 added version in import files js and css 2023-03-23 14:43:13 +01:00
daniel 56e4770b93 fixed styles 2023-03-23 14:20:54 +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
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon 1ac37dd538 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 11:51:32 +01:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
Daniel Cebrian a60f9be920 #9624 changed default binary path daemon for sflow 2023-03-23 09:53:34 +01:00
Pablo Aragon e2820d1ad7 9680-Fix widget 2023-03-23 09:18:39 +01:00
daniel 0959f1a537 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 07:44:17 +01:00
artica cbbddd1ac6 Auto-updated build strings. 2023-03-23 01:00:18 +01:00
Pablo Aragon 1316968295 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 20:00:48 +01:00
Pablo Aragon bd48dba65f 10715-Fix width tree view graph 2023-03-22 20:00:42 +01:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Pablo Aragon d6bf16f536 10712-Login 2023-03-22 18:57:36 +01:00
Rafael Ameijeiras 4535fb85a3 Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop' 
fixes in event comments

See merge request artica/pandorafms!5591
 2023-03-22 17:05:54 +00: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
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +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
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' 
# Conflicts:
#   pandora_console/install.php
 2023-03-22 08:23:07 +00:00
artica 6e8eb9800f Auto-updated build strings. 2023-03-22 01:00:23 +01:00
daniel 64e5ceaea0 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-21 18:43:39 +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 e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
Daniel Cebrian fe70d7d44b #10650 added image maintenance mode 2023-03-21 16:26:05 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +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
Jonathan af00950dc5 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 12:07:25 +01:00
Jonathan 72778eb97c Wizzard template fix 2023-03-21 12:07:10 +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
Rafael Ameijeiras 361ecf4019 Merge branch 'ent-10411-15079-error-event-replication-en-vista-de-comentarios' into 'develop' 
Fix events comment tags acl

See merge request artica/pandorafms!5544
 2023-03-21 09:00:45 +00:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
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
KANAYAMA Akihiro 6ad160685b Fixed encoding multibyte characters 2023-03-16 19:55:41 +09: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
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 daf179f1f6 Conflit resolved 2023-03-06 08:32:28 +01: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
artica 15dd6e41ed Auto-updated build strings. 2023-03-06 01:01:00 +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 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
artica f813af7397 Auto-updated build strings. 2023-03-05 01:01:11 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
artica e4a2852be6 Auto-updated build strings. 2023-03-04 01:00:26 +01:00
Jimmy Olano aea0aa3fb9 Merge branch 'ent-10282-desactivar-la-edicion-de-traps-en-la-version-open' into 'develop', JJOS. 
Draft: Ent 10282 desactivar la edicion de traps en la version open

See merge request artica/pandorafms!5483
 2023-03-03 14:00:40 +00: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
Pablo Aragon f3b9d73855 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 12:43:35 +01:00
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
Calvo 4b31bc340e Fix code style 2023-03-03 11:50:21 +01:00
Daniel Maya 52b43410c7 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-03 11:47:03 +01:00
Calvo 2386b87c1d Functions servers lag query updated 2023-03-03 11:34:01 +01:00
Calvo c5b98a30aa Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole 2023-03-03 11:30:44 +01:00
Daniel Rodriguez 6f974508f0 Revert "Merge branch..." 
This reverts merge request !5555
 2023-03-03 10:11:35 +00:00
Daniel Maya 297a21c11d Merge branch 'develop' into 'ent-9893-nuevo-sistema-de-ha' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-03 09:18:56 +00: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
Jonathan 8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
Daniel Rodriguez cce6e2d222 Merge branch 'ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole' into 'develop' 
Core: Fix and optimized lag calculaton. Console: optimized and unified queries with server

See merge request artica/pandorafms!5555
 2023-03-03 08:32:34 +00:00
Daniel Maya ccb0d69edd #10518 Added new menu 2023-03-03 09:15:51 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00:00
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
artica 1f046e9446 Auto-updated build strings. 2023-03-03 01:00:24 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jimmy Olano 2d9406c53e Merge branch 'ent-9700-URLs-de-la-consola-en-elementos-de-CV-no-se-redirigen-bien' into 'develop', JJOS. 
fixed tinyMCE converting URLs to relative ones

See merge request artica/pandorafms!5523
 2023-03-02 17:38:41 +00:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Daniel Rodriguez 7e9abf01dd Merge branch 'ent-9805-14513-14958-problema-timestamp-vs-utimestamp-en-tevento-al-crear-eventos-por-api' into 'develop' 
Unified event timestamp and utimestamp

See merge request artica/pandorafms!5561
 2023-03-02 16:32:01 +00: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 Cebrian cdf359481a #10347 cleared code for apply acl permission 2023-03-02 17:06:16 +01:00
Daniel Rodriguez 006b35679d Merge branch 'ent-10093-Activar-modo-mantenimiento-en-politicas-cuando-se-ejecuta-el-pandora-db' into 'develop' 
policy maintenance mode

See merge request artica/pandorafms!5506
 2023-03-02 15:50:17 +00:00
Diego Muñoz-Reja 5d756ee393 Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop' 
Ent 9819 crear tip en consola sonora de eventos

See merge request artica/pandorafms!5466
 2023-03-02 15:25:31 +00:00
Daniel Cebrian af5a620883 #10347 fixed urls monitors and added name group 2023-03-02 16:22:25 +01:00
Diego Muñoz-Reja 873334fd97 Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop' 
Ent 9622 omnishell en la vista solapa de agente

See merge request artica/pandorafms!5508
 2023-03-02 14:52:45 +00:00
Jose Gonzalez b82b6bc1bc Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 15:25:10 +01:00
Jose Gonzalez 4519bd3d72 Improve label input block function 2023-03-02 15:24:54 +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 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +01:00
Daniel Maya 7cb1595b62 #9893 changed constant 2023-03-02 11:31:07 +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
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +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
artica f1bb7b450e Auto-updated build strings. 2023-03-02 01:00:46 +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
Jose Gonzalez a128151d9e 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:21:00 +01: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
Jose Gonzalez 627d6cc5ec 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:10:02 +01:00
daniel 774b32d7a0 fixed styles 2023-03-01 13:54:22 +01:00
Jose Gonzalez a16b4c11f4 Fix toggle and spinner issues 2023-03-01 13:32:15 +01:00
Daniel Rodriguez 23f91fa0f3 Merge branch 'ent-9962-14776-Mergear-resultados-de-ITEM-SQL-Query-de-informes-en-META' into 'develop' 
added all nodes option in sql query report item in meta

See merge request artica/pandorafms!5535
 2023-03-01 12:29:54 +00: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 0ebbf9f14f 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:15:08 +01:00
Jonathan 7e4337e4f3 Reporting templates 2023-03-01 12:14:23 +01:00
Jose Gonzalez ca6d722495 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:07:11 +01:00
Jose Gonzalez 63e05ff304 Update help tip icon 2023-03-01 12:07:03 +01:00
Jonathan 472b655ee6 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 08:18:50 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
artica 6b23a0c696 Auto-updated build strings. 2023-03-01 01:00:24 +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
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jonathan 1dca587455 SNMP Browser modals change visual styles 2023-02-28 17:22:17 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-02-28 16:11:46 +00:00
alejandro.campos@artica.es a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Jonathan f72ec5eb9d Fix html_print_label_input_block default id 2023-02-28 16:09:13 +01:00
Jonathan d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Matias Didier 9def6eb6d5 Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop' 
Ent 9047 vista de auditoria mejoras funcionales y esteticas

See merge request artica/pandorafms!5500
 2023-02-28 13:28:45 +00:00
Jonathan 78af41b700 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 14:27:24 +01:00
Jonathan 8d44bb7af1 Reporting view new style 2023-02-28 14:27:18 +01:00
Diego Muñoz-Reja 44cf59bfd3 Merge branch 'ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola' into 'develop' 
Ent 10253 enforcement de opciones de configuracion aviso en consola

See merge request artica/pandorafms!5499
 2023-02-28 12:27:54 +00:00