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

2593 Commits

Author SHA1 Message Date
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Daniel Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' 
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
 2023-07-17 07:53:10 +00:00
Daniel Cebrian 0e2d1ee47f #11326 security hardening 2023-07-12 15:54:04 +02:00
miguel angel rasteu 2af618b765 #11726 Fix alert status column name agent 2023-07-12 14:11:00 +02:00
Daniel Cebrian 0a34d06603 #10344 changed message in popup conexion check 2023-07-11 11:35:57 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' 
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
 2023-07-06 09:44:33 +00:00
Daniel Cebrian 951a468282 #11418 fixed id modules order in view graphs 2023-07-06 11:26:29 +02:00
Matias Didier af2def1a62 Merge branch 'ent-11205-vista-de-incidencias-con-estilo-no-homogeneo' into 'develop' 
Ent 11205 vista de incidencias con estilo no homogeneo

See merge request artica/pandorafms!5908
 2023-07-04 14:02:13 +00:00
Jonathan a385ff93a3 #9478 creation alerts to nodes on metaconsole 2023-07-04 12:47:04 +02:00
miguel angel rasteu 138fa636ad #10637 Change group view 2023-07-04 11:06:49 +02:00
Gorka Sanchez 9427ba68e0 Merge branch 'ent-11314-vista-detalle-de-agente-cajas-colapsadas-por-defecto-si-no-hay-informacion' into 'develop' 
Ent 11314 vista detalle de agente cajas colapsadas por defecto si no hay informacion

See merge request artica/pandorafms!5969
 2023-07-04 08:53:12 +00:00
Jonathan 1c69208a6a Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola 2023-07-03 10:21:55 +02:00
Gorka Sanchez ffc4f04989 Merge branch 'ent-11628-no-carga-el-total-amount-of-events-correctamente-si-hay-varios-widget-tactical-view' into 'develop' 
Ent 11628 no carga el total amount of events correctamente si hay varios widget tactical view

See merge request artica/pandorafms!6154
 2023-07-03 07:42:21 +00:00
Jonathan 5f8c2f1653 #11628 merge conflict solution 2023-07-03 09:34:04 +02:00
Gorka Sanchez 6a8a0e8b6f Merge branch 'ent-11469-selector-de-modulos-comunes-en-wizard-de-servicios-no-anade-nada' into 'develop' 
Ent 11469 selector de modulos comunes en wizard de servicios no anade nada

See merge request artica/pandorafms!6047
 2023-07-03 07:33:05 +00:00
Jorge Rincon ada52da898 #10850 agent detail view added to favorites system 2023-06-29 16:09:07 +02:00
Rafael Ameijeiras d082687c44 Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop' 
Ent 10020 eliminar login hash de vistas metaconsola

See merge request artica/pandorafms!5839
 2023-06-29 09:55:53 +00:00
Matias Didier 63ee67bdff Merge branch 'ent-11143-se-descoloca-menu-de-paginas-al-pasar-de-14' into 'develop' 
Ent 11143 se descoloca menu de paginas al pasar de 14

See merge request artica/pandorafms!5902
 2023-06-27 13:24:37 +00:00
Matias Didier ac25997f45 Merge branch 'ent-10963-icono-de-reset-erroneo' into 'develop' 
Ent 10963 icono de reset erroneo

See merge request artica/pandorafms!5770
 2023-06-27 12:16:36 +00:00
Rafael Ameijeiras d0f33605e0 Merge branch 'ent-10815-operaciones-masivas-permiten-cambiar-parametros-que-deberian-estar-bloqueados-de-modulos-de' into 'develop' 
Ent 10815 operaciones masivas permiten cambiar parametros que deberian estar bloqueados de modulos de

See merge request artica/pandorafms!5823
 2023-06-27 12:07:15 +00:00
Matias Didier fc3a0766f8 Merge branch 'ent-11152-parametro-de-filtro-de-monitor-detail-se-desmarca-solo' into 'develop' 
Ent 11152 parametro de filtro de monitor detail se desmarca solo

See merge request artica/pandorafms!5886
 2023-06-27 08:55:29 +00:00
Matias Didier e1fe10f3e3 Merge branch 'ent-11380-15677-selector-filtro-por-estado-monitor-view-metaconsola' into 'develop' 
Ent 11380 15677 selector filtro por estado monitor view metaconsola

See merge request artica/pandorafms!5981
 2023-06-26 12:48:46 +00:00
Rafael Ameijeiras f6a5e161f8 Merge branch 'ent-10765-meter-confirmacion-en-el-borrado-de-mapas' into 'develop' 
Ent 10765 meter confirmacion en el borrado de mapas

See merge request artica/pandorafms!5805
 2023-06-26 07:30:48 +00:00
Daniel Cebrian 4bda7090b7 #11335 controled name and group in network maps 2023-06-19 16:33:56 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Maya 6e8f0d1e93 #11469 Fixed add selected modules 2023-06-06 14:55:30 +02:00
Daniel Cebrian 3751af36c7 #11418 fixed css in graphs 2023-06-01 15:08:34 +02:00
Daniel Cebrian 54ba66e72a #11418 change graph in agent view 2023-06-01 14:53:45 +02:00
miguel angel rasteu 4e1e9a1d99 #11431 Fix alert conditional table and menu 2023-06-01 12:27:58 +02:00
Rafael Ameijeiras ea24cc8f1b Merge branch 'ent-10851-problemas-con-fechas-en-el-inventario' into 'develop' 
Ent 10851 problemas con fechas en el inventario

See merge request artica/pandorafms!5729
 2023-05-31 11:15:05 +00:00
Daniel Cebrian 6b869f8ca8 #11380 fixed arrow in metaconsole table and filter status in monitors view 2023-05-29 10:32:43 +02:00
Jorge Rincon 4984e2608a #11314 Collapses the boxes for modules, alerts and events when the agent does not have this information related 2023-05-26 12:30:36 +02:00
miguel angel rasteu cccb03010c #10851 change date order to asc and fix sql query 2023-05-25 10:30:34 +02:00
Daniel Cebrian 8c35fdbce8 #11330 fixed pagination in network map 2023-05-24 09:32:29 +02:00
Matias Didier a3787bf2ab Merge branch 'ent-11142-bugs-visuales-en-group-view' into 'develop' 
Ent 11142 bugs visuales en group view

See merge request artica/pandorafms!5882
 2023-05-22 08:25:00 +00:00
Matias Didier 1523952597 Merge branch 'ent-10869-group_id-en-vista-de-monitorizacion-de-agentes-cambia-aleatoriamente' into 'develop' 
Ent 10869 group id en vista de monitorizacion de agentes cambia aleatoriamente

See merge request artica/pandorafms!5774
 2023-05-18 07:08:19 +00:00
Diego Muñoz-Reja f19134b31f Merge branch 'ent-11119-mejora-estetica-de-la-visualizacion-de-modulos-en-la-vista-detallada-de-agente' into 'develop' 
Ent 11119 mejora estetica de la visualizacion de modulos en la vista detallada de agente

See merge request artica/pandorafms!5855
 2023-05-17 15:39:59 +00:00
Diego Muñoz-Reja b2edd9c19a Merge branch 'ent-11120-mejora-estetica-visualizacion-alertas-en-vista-detallada-de-agente' into 'develop' 
Ent 11120 mejora estetica visualizacion alertas en vista detallada de agente

See merge request artica/pandorafms!5838
 2023-05-17 07:06:59 +00:00
Jorge Rincon c3f569fbb1 #11205 Update of styles for the table Active issue on this agent 2023-05-16 15:43:02 +02:00
miguel angel rasteu b16260f08c #11143 Change dialog width to auto 2023-05-16 12:40:37 +02:00
Matias Didier 9603e98903 Merge branch 'ent-11118-no-gis-data-esa-caja-no-se-debe-ver-si-no-hay-datos-gis' into 'develop' 
Ent 11118 no gis data esa caja no se debe ver si no hay datos gis

See merge request artica/pandorafms!5844
 2023-05-16 09:48:56 +00:00
miguel angel rasteu 739414abae #11118 Evaluate if exist array 2023-05-16 11:37:46 +02:00
Jorge Rincon b88e765c75 #11152 keep select value in filter 2023-05-11 13:00:32 +02:00
miguel angel rasteu b58a3a79fc #11142 Fix group view table 2023-05-11 11:39:20 +02:00
Jonathan c5b2835215 #11119 change visual list of modules agent 2023-05-08 15:37:49 +02:00
Jorge Rincon 53bd63a7d5 #11124 Visual changes are made to the detailed list of agents 2023-05-08 14:26:28 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
miguel angel rasteu dab73a6972 #11118 Fix conditional. Don't show anything if don't exists GIS data 2023-05-08 10:10:25 +02:00
alejandro.campos@artica.es 9c0ef3e5aa send login hash info in post body in meta links to node 2023-05-05 13:05:38 +02:00
alejandro.campos@artica.es 4cac880eca send login hash info in post body in meta links to node 2023-05-05 13:04:02 +02:00
miguel angel rasteu c4d706f08b #11120 Change class and js code to fix the visual style 2023-05-05 13:03:38 +02:00
Pablo Aragon 4f9e09b84a 10815-Bulk operations do not edit modules created with policies 2023-05-03 17:01:21 +02:00
Jonathan fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
Jorge Rincon 841b1d66d3 #10765 The action of deleting a map is changed to confirmDialog 2023-04-27 14:35:22 +02:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
Jorge Rincon 1c41a91c14 #10869 removed the group_id from the url, in the detail agent filter 2023-04-25 10:19:30 +02:00
Jorge Rincon 30697d5b33 #10963 icon change in the reset button, agent detail view 2023-04-24 14:31:20 +02:00
Matias Didier 086a6f72aa Merge branch 'ent-10342-14680-problema-con-las-busquedas-de-agentes-en-nodo' into 'develop' 
Ent 10342 14680 problema con las busquedas de agentes en nodo

See merge request artica/pandorafms!5646
 2023-04-20 10:28:54 +00: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
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 54767d20a3 10848-Small input graph form 2023-04-17 15:30:56 +02: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
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
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
Pablo Aragon 514c1b300c 10867-Tactical view status 2023-04-05 14:33:06 +02:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +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
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
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
Pablo Aragon 7ada30c9b1 10718 & 10821 2023-03-29 12:12:56 +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 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +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
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +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 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +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
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +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
Daniel Cebrian 8e88e0a603 #10747 fixed error 500 in agent 2023-03-21 11:45:38 +01:00
Daniel Cebrian ed7b46eb22 #9662 fixed url tactic in list groups 2023-03-21 09:56:36 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +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
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
Jose Gonzalez bab3248d57 Monitor view with not normal at start 2023-03-15 08:56:15 +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 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
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
Calvo e2297171cb Process inventory modules with correct xml and empty data 2023-03-10 15:14:43 +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 6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jose Gonzalez 4af67db415 Export data view 2023-03-07 18:10:07 +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
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
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Daniel Cebrian 00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +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
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
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
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
alejandro.campos@artica.es fd13b376a5 Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' of brutus.artica.es:artica/pandorafms into ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas 2023-03-01 16:10:30 +01:00
alejandro.campos@artica.es 296ec44ef4 minor fix 2023-03-01 16:10:18 +01:00
alejandro.campos@artica.es 36cfcc3c2f error fix 2023-03-01 14:19:35 +01:00
daniel 774b32d7a0 fixed styles 2023-03-01 13:54:22 +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
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jimmy Olano a8d0f79540 Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS) 
Fix empty module data list view

See merge request artica/pandorafms!5472
 2023-02-28 17:35:56 +00: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
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
daniel 35241e0d38 restyling 2023-02-27 09:55:29 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
daniel 5477fdbb6c Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:45:14 +01:00
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
daniel 3575e199b0 restyling 2023-02-24 10:46:46 +01:00
daniel b34515d03c restyling 2023-02-23 17:57:48 +01:00
daniel 1be0fb94b0 restyling 2023-02-23 16:30:18 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
daniel 598a1b1456 restyling 2023-02-23 12:34:41 +01:00
Daniel Cebrian d6645ee283 #10324 added fav menu in network map and visual console 2023-02-23 11:37:23 +01:00
Daniel Cebrian c0dcc03388 #10324 added system fav in visual console and modules 2023-02-23 11:00:46 +01:00
daniel e672ba141b restyling 2023-02-23 11:00:38 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jose Gonzalez 6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Matias Didier f371747619 Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop' 
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard

See merge request artica/pandorafms!5509
 2023-02-22 15:09:19 +00:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00