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

5236 Commits

Author SHA1 Message Date
Pablo Aragon 9e124933b0 10886-Confict 2023-04-18 10:42:37 +02:00
miguel angel rasteu 9da8e83633 Modified the timestamp according to input data. Added query with the timestamp of the filter. 2023-04-18 09:52:59 +02:00
Rafael Ameijeiras 852e7ae2a0 Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop' 
Ent 10714 mejoras de usabilidad en vista de inventario export csv

See merge request artica/pandorafms!5726
 2023-04-17 15:40:19 +00:00
Matias Didier e468c306b9 Merge branch 'ent-10848-mejorar-aspecto-de-formulario-de-graficas-de-interfaces-y-de-las-graficas-de-modulo' into 'develop' 
Ent 10848 mejorar aspecto de formulario de graficas de interfaces y de las graficas de modulo

See merge request artica/pandorafms!5669
 2023-04-17 14:50:32 +00:00
Pablo Aragon bd4066c690 10886-Timestamp events with ui_print_timestamp() 2023-04-17 15:43:53 +02:00
Pablo Aragon 54767d20a3 10848-Small input graph form 2023-04-17 15:30:56 +02:00
Rafael Ameijeiras 54326a444b Merge branch 'ent-10813#15305-Botones-101-no-funcionan-cuando-buscas-modulos-en-el-buscador' into 'develop' 
Ent 10813#15305 botones 101 no funcionan cuando buscas modulos en el buscador

See merge request artica/pandorafms!5723
 2023-04-17 12:34:13 +00:00
Jonathan cbf122f4c6 #10714 csv inventory button 2023-04-17 14:11:16 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop' 
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
 2023-04-17 11:06:10 +00:00
Pablo Aragon 6bc185e148 10848-confict 2023-04-16 18:06:54 +02:00
Jorge Rincon 4a4c3a0cdb #10813 Adjustment of the buttons in the Graph column 2023-04-14 11:05:55 +02:00
Daniel Rodriguez 895b1bea7c Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop' 
Ent 10945 timestamp desconocido en vista de eventos

See merge request artica/pandorafms!5717
 2023-04-13 14:53:45 +00:00
Rafael Ameijeiras b1ef24cae9 Merge branch 'ent-9464-14144-limitacion-en-el-campo-de-seleccion-etiquetas-metaconsola' into 'develop' 
Ent 9464 14144 limitacion en el campo de seleccion etiquetas metaconsola

See merge request artica/pandorafms!5698
 2023-04-13 12:49:43 +00:00
Daniel Maya a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02: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
Jorge Rincon 06203dc503 #9464 fix tag filters 2023-04-12 11:02:35 +02:00
Jonathan b36ade1821 #10191 fix url event sounds 2023-04-11 16:24:37 +02:00
Pablo Aragon 5f1e20e399 10886-Timestamp events with ui_print_timestamp() 2023-04-11 15:31:27 +02:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
daniel 086f742455 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/operation/agentes/ver_agente.php
 2023-04-10 16:42:41 +02:00
daniel 7302a108c0 fixed styles 2023-04-10 12:02:35 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
Jonathan a0ae7327c7 Conflict solution inventory 2023-04-10 09:23:40 +02:00
Pablo Aragon c8ca3ad68f 10848-Small input graph form 2023-04-05 17:29:28 +02:00
Jonathan 1dbe161ea9 Merge branch 'develop' into ent-9662-second-round 2023-04-05 14:37:13 +02:00
Pablo Aragon 514c1b300c 10867-Tactical view status 2023-04-05 14:33:06 +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
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +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
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +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 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
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
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Daniel Maya 27c4cc56e0 #10342 Fixed search 2023-03-31 13:27:30 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +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
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +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
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
daniel 27e13c26c6 fixed styles 2023-03-30 11:40:32 +02:00
alejandro.campos@artica.es e8323e4b00 several minor fixes 2023-03-29 17:45:37 +02:00
Pablo Aragon f26e70630a Blue background & Datatable fix 2023-03-29 17:09:41 +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
daniel e4383a0573 fixed styles 2023-03-29 14:07:56 +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
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
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
daniel 0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +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
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +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
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
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
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +01:00
daniel 25ea15fe0f fixed styles 2023-03-24 14:04:38 +01:00
Matias Didier f931a86f22 Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop' 
Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all

See merge request artica/pandorafms!5624
 2023-03-24 12:15:01 +00: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
Jimmy Olano eb833f2ad8 Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS. 
Ent 10747 version open error 500 en vista principal de un agente

See merge request artica/pandorafms!5616
 2023-03-24 10:14:01 +00:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +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
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
daniel bac1a7bf65 fixed styles 2023-03-23 17:44:06 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Daniel Cebrian 2683f9e6dc #10792 fixed error 500 in agent status list 2023-03-23 12:39:55 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Calvo 96017090ce Netflow monitoring filters forms 2023-03-22 14:22:17 +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
Calvo 784bd2dbcf Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 12:31:11 +01:00
Rafael Ameijeiras 3fcf4dfbc5 Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop' 
Ent 10737 15246 error 500 en mapa servicios metaconsola

See merge request artica/pandorafms!5617
 2023-03-22 10:34:42 +00: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
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
Jonathan d2d8b43c87 Custom fields agent view change size svg 2023-03-21 13:09:32 +01:00
Daniel Cebrian aec5e6b483 #10737 fixed error 500 in service map 2023-03-21 12:52:24 +01:00
Jonathan 9654ba4fa2 Snmp browser select multiple post 2023-03-21 12:35:25 +01:00
Daniel Cebrian 8e88e0a603 #10747 fixed error 500 in agent 2023-03-21 11:45:38 +01:00
Calvo a69151a3ca Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-21 11:23:02 +01:00
Daniel Cebrian ed7b46eb22 #9662 fixed url tactic in list groups 2023-03-21 09:56:36 +01:00
Jonathan 82dd6ebb37 Metaconsole view reports change 2023-03-21 09:52:21 +01: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
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
daniel a9633085bc fixed styles 2023-03-17 12:00:51 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jonathan b56cb0e78e log sources view hide on empty 2023-03-16 12:23:58 +01:00
Jose Gonzalez 9ac04fba28 Netflow fix 2023-03-16 09:42:59 +01:00
Pablo Aragon 4d6029ba3f 10408-Manage agents, Agent view 2023-03-15 17:02:25 +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
Jonathan d323ab7fe5 Timezonevisual correction and fix conflict 2023-03-15 09:06:07 +01:00
Jose Gonzalez bab3248d57 Monitor view with not normal at start 2023-03-15 08:56:15 +01:00
Calvo 4adaf31a5a Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-14 19:45:48 +01:00
Calvo 6950624cc9 Added new netflow server filters form 2023-03-14 18:55:43 +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
Jose Gonzalez 4f5d3ed924 Netflow meta 2023-03-14 18:15:31 +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
Daniel Maya 62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Pablo Aragon 2215097100 Manage agent, modules 2023-03-13 17:39:58 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Jose Gonzalez c2ba5cfdd3 Agent status 2023-03-13 16:21:14 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Daniel Maya 0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +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
Jose Gonzalez 1b4136d91e Minor fix 2023-03-13 14:10:20 +01:00
Jose Gonzalez 45ba4cdd15 Netflow 2023-03-13 14:03:00 +01:00
Jose Gonzalez 7bedd86e25 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 13:26:03 +01:00
Jose Gonzalez 5466cb5995 Netflow live view 2023-03-13 13:25:42 +01:00
Daniel Cebrian bdeb2240f3 10324 refactor duplicity code 2023-03-13 13:01:48 +01:00
Daniel Cebrian 339d7e8bfe #10324 fixed error 500 2023-03-13 12:57:09 +01:00
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Jose Gonzalez 590e7a3978 Netflow improvements 2023-03-13 11:25:43 +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 39ace10629 Fix image issue with Networkmap 2023-03-11 02:08:37 +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
Pablo Aragon 427ecf96e4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 13:03:35 +01:00
Pablo Aragon ceed3c5d51 Alert details validation 2023-03-10 13:02:23 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +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 edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel 6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez d8cdb13b59 Fix minor issue 2023-03-09 11:43:36 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
Jose Gonzalez c855061d43 Netflow view 2023-03-09 00:45:41 +01:00
Jonathan 63ecb7eb0b Tree view metaconsole view like nodo 2023-03-08 15:45:18 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jose Gonzalez 5017878701 Messages view 2023-03-07 22:05:06 +01:00
Jose Gonzalez 4af67db415 Export data view 2023-03-07 18:10:07 +01:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez 14246ea570 User edit notifications 2023-03-07 17:50:03 +01:00
Jose Gonzalez 2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +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
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
Jonathan 8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez 44fb762fdf Minor fixes with graphs 2023-03-06 15:44:32 +01:00
Jonathan 2a11873638 #9529 fix events last contact value 2023-03-06 12:12:36 +01:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
 2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS. 
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
 2023-03-05 22:56:35 +00:00
daniel 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 00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +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
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 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
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01: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
Jonathan cef5c478e9 Graph viewer and graph template item editor visual 2023-03-02 17:17:10 +01: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
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 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 ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
Matias Didier c4e8ff49d5 Merge branch 'ent-10569-Error-500-a-la-hora-de-abrir-vista-de-algun-agente-en-fenix' into 'develop' 
error fix

See merge request artica/pandorafms!5574
 2023-03-02 09:15:37 +00:00