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

18978 Commits

Author SHA1 Message Date
Matias Didier 62b4ffb30b Merge branch 'ent-10591-vista-auditoria-gif-cargando-infinito' into 'develop' 
Ent 10591 vista auditoria gif cargando infinito

See merge request artica/pandorafms!5757
 2023-05-11 11:52:53 +00:00
Daniel Maya 45d6f2b5f5 #11179 Fixed heatmap and latest events 2023-05-11 12:05:00 +02:00
Jonathan b76635a54a #11140 wizzard module agent status unknow 2023-05-11 11:56:42 +02:00
miguel angel rasteu ef20ab00dd Update get_data_basic_info_sql to order by more filters 2023-05-11 11:10:13 +02:00
artica ba5e3a0f08 Auto-updated build strings. 2023-05-11 01:00:26 +02:00
Jorge Rincon 4b5cce3343 #11139 fixed the position of the magnifying glass icon, in the template column 2023-05-10 16:24:22 +02:00
Daniel Maya d26ae96670 #11171 Fix historical database with php 8.1 2023-05-10 15:15:03 +02:00
miguel angel rasteu 1fc0a43ca8 #11158 Fixed entities in agent name and icon size 2023-05-10 12:53:03 +02:00
Jorge Rincon be197de69a #11157 Adjusted URL update manager 2023-05-10 11:52:46 +02:00
artica 476b38c221 Auto-updated build strings. 2023-05-10 01:00:11 +02:00
Jonathan 1ba6566cff #10362 token recursive group VC default 1 2023-05-09 16:52:30 +02:00
Jonathan 13f0e3db23 #10362 recursive group visual console 2023-05-09 16:45:44 +02:00
Jorge Rincon 8fbe5aced7 #11148 fixed button copy file manager 2023-05-09 15:52:11 +02:00
Daniel Maya 9861aa527c #11155 Fixed language 2023-05-09 15:25:15 +02:00
daniel 32bc57e767 update files translate and current package pandora_enterprise#11151 2023-05-09 14:05:48 +02:00
miguel angel rasteu f8f53a0b62 #9610 Add OS filter and OS version filter in bulk operation 2023-05-09 13:01:42 +02:00
miguel angel rasteu f91c594bb7 #11136 Change color code to STATUS_SERVER_DOWN 2023-05-09 11:25:10 +02:00
artica c794e754e7 Updated version and build strings. 2023-05-09 11:02:11 +02:00
Matias Didier ec2195f32f Merge branch 'ent-11047-15490-no-se-pueden-agregar-mas-campos-a-los-plugins' into 'develop' 
Ent 11047 15490 no se pueden agregar mas campos a los plugins

See merge request artica/pandorafms!5780
 2023-05-09 08:18:40 +00:00
artica ea5bb351df Auto-updated build strings. 2023-05-09 01:00:23 +02:00
miguel angel rasteu ee427d2694 #11117 Add conditional to exclude some values from metaconsole 2023-05-08 16:54:27 +02:00
alejandro.campos@artica.es e0090aee95 wrap csv fields with string delimiter on export 2023-05-08 14:47:22 +02:00
Daniel Cebrian 0e58a9b2fb #added new type bars in widget and change legend 2023-05-08 14:46:46 +02:00
Jorge Rincon 53bd63a7d5 #11124 Visual changes are made to the detailed list of agents 2023-05-08 14:26:28 +02:00
miguel angel rasteu f9b7ac523e #11067 Fix IP target title 2023-05-08 11:59:08 +02:00
Daniel Rodriguez 2c4e1c0261 Merge branch 'ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs' into 'develop' 
Ent 10185 filtros personalizados para el visor de datos de logs

See merge request artica/pandorafms!5754
 2023-05-08 08:48:56 +00:00
Pablo Aragon 7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
Rafael Ameijeiras 37d0cff221 Merge branch 'ent-10340-gotty-quickshell-no-funciona' into 'develop' 
Fix gotty host missing on ws.php

See merge request artica/pandorafms!5812
 2023-05-08 06:05:31 +00:00
artica 4653ebd854 Auto-updated build strings. 2023-05-08 01:00:20 +02:00
artica 6a0d746892 Auto-updated build strings. 2023-05-07 01:00:13 +02:00
artica 0db1ef549a Auto-updated build strings. 2023-05-06 01:00:19 +02:00
Jorge Rincon 82db353dd1 #11098 The operation of the create module button from the SNPM Walk modal is adjusted 2023-05-05 14:10:41 +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
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
miguel angel rasteu b107069bf5 #11082 Fix JS code to show de name of the service 2023-05-05 10:09:14 +02:00
artica d4107cad5d Auto-updated build strings. 2023-05-05 01:00:19 +02:00
daniel 77be60e4a3 fixed modules adopted pandora_enterprise#11103 2023-05-04 18:24:11 +02:00
Jorge Rincon 9ab9087377 #11098 The Create agent module button is enabled 2023-05-04 16:48:20 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
Daniel Cebrian 8ee97ba7e0 #10355 fixed ldap timeout 2023-05-04 14:15:58 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Pablo Aragon b8bd5c437d 11078-Remove Create files and directories buttons from MIB Uploader 2023-05-04 11:32:04 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Pablo Aragon aeeae1a2b3 11078-Remove Create files and directories buttons from MIB Uploader 2023-05-04 09:55:32 +02:00
artica 151358190c Auto-updated build strings. 2023-05-04 01:00:20 +02:00
Pablo Aragon 4f9e09b84a 10815-Bulk operations do not edit modules created with policies 2023-05-03 17:01:21 +02:00
Daniel Maya 8c96baf68f #11099 Fix sunburst 2023-05-03 16:44:07 +02:00
Jonathan 07e511940d #9267 add recursive services childer 2023-05-03 14:29:37 +02:00
alejandro.campos@artica.es f061c16388 implement sql query item limit 2023-05-03 14:00:45 +02:00
alejandro.campos@artica.es f2cbfd930c implement sql query item limit 2023-05-03 13:44:58 +02:00
miguel angel rasteu 6813eb9d11 #11090 Fix the count that gave an error when there are no tags and the sql error when putting offset-20 when there are no tag 2023-05-03 13:24:11 +02:00
Daniel Cebrian d2c26ba607 #11092 fixed response tactical view 2023-05-03 11:07:20 +02:00
miguel angel rasteu 5cb01d2079 #10860 Create function get_agent_module_childs 2023-05-03 09:20:40 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
Jonathan 9da4f3d656 #11085 tinymce add plugins imagen link 2023-05-03 08:04:54 +02:00
artica 77ac357745 Auto-updated build strings. 2023-05-03 01:00:14 +02:00
artica b58ece6359 Auto-updated build strings. 2023-05-02 01:00:10 +02:00
artica 2e9c6a339f Auto-updated build strings. 2023-05-01 01:00:13 +02:00
artica 0bef49b5e7 Auto-updated build strings. 2023-04-30 01:00:18 +02:00
artica 459da487b8 Auto-updated build strings. 2023-04-29 01:00:23 +02:00
Matias Didier 56614f8df0 Merge branch 'ent-10474-mejorar-visualmente-mapa-dinamico-sunburst' into 'develop' 
Ent 10474 mejorar visualmente mapa dinamico sunburst

See merge request artica/pandorafms!5800
 2023-04-28 11:01:17 +00:00
Jonathan e1f473f985 #10638 format numbers network link 2023-04-28 10:51:02 +02:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
Daniel Rodriguez 0bc18b47db Merge branch 'ent-10420-14668-errores-en-usuarios-ldap-ad-con-apostrofes' into 'develop' 
Ent 10420 14668 errores en usuarios ldap ad con apostrofes

See merge request artica/pandorafms!5687
 2023-04-28 07:03:37 +00:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop' 
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
 2023-04-28 06:07:10 +00:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
artica 153294a9b0 Auto-updated build strings. 2023-04-28 01:00:28 +02:00
miguel angel rasteu 2fe3662724 #11064 Fixed a conditional in the jquery code that generates the toggle which was not executed when the value of the is_metaconsole variable was 1 2023-04-27 12:34:56 +02:00
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
alejandro.campos@artica.es 9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
artica 0b5672980d Auto-updated build strings. 2023-04-27 01:00:23 +02:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop' 
several minor fixes

See merge request artica/pandorafms!5638
 2023-04-26 08:57:03 +00:00
artica 8effae4991 Auto-updated build strings. 2023-04-26 01:00:20 +02:00
Matias Didier f0194286d6 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente-2' into 'develop' 
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente 2

See merge request artica/pandorafms!5778
 2023-04-25 15:39:49 +00:00
miguel angel rasteu 8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +02:00
Diego Muñoz-Reja ed6364d3c0 Merge branch 'ent-11024-pete-sql-en-remote-components' into 'develop' 
Ent 11024 pete sql en remote components

See merge request artica/pandorafms!5755
 2023-04-25 13:47:34 +00:00
Daniel Cebrian d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop' 
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
 2023-04-25 13:27:07 +00:00
Rafael Ameijeiras d08d5319dc Merge branch 'ent-10471-When-a-group-is-deleted-SNMP-alerts-that-used-it-disappear' into 'develop' 
added limitation to group deletion

See merge request artica/pandorafms!5643
 2023-04-25 13:25:03 +00:00
Jonathan d1361e38cb #11047 fix macro in plugin section node+meta 2023-04-25 14:20:44 +02:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
alejandro.campos@artica.es ee5f79bb7a change text 2023-04-25 09:16:48 +02:00
artica db2b2b796b Auto-updated build strings. 2023-04-25 01:00:22 +02:00
Pablo Aragon 2303b880b6 11044-Select2 black in graphs options 2023-04-24 16:49:44 +02:00
Pablo Aragon 20ff1692ae 10947-Change color heatmap notinit modules 2023-04-24 15:58:08 +02:00
Jorge Rincon 30697d5b33 #10963 icon change in the reset button, agent detail view 2023-04-24 14:31:20 +02:00
Rafael Ameijeiras ca7e1777e5 Merge branch 'ent-11035-graficas-envio-mail-cambio-escalas' into 'develop' 
flot axis Y minimum ticks size 0.5 pandora_enterprise#11035

See merge request artica/pandorafms!5766
 2023-04-24 12:18:56 +00:00
Rafael Ameijeiras 2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop' 
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
 2023-04-24 11:16:30 +00:00
Matias Didier d7ee0ca2da Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop' 
Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro

See merge request artica/pandorafms!5736
 2023-04-24 10:44:21 +00:00
daniel 45d5731029 flot axis Y minimum ticks size 0.5 pandora_enterprise#11035 2023-04-24 11:22:55 +02:00
Matias Didier b8b255f7a5 Merge branch 'ent-10985-14933-error-de-privacy-method-en-functions_snmp_browser-php' into 'develop' 
Ent 10985 14933 error de privacy method en functions snmp browser php

See merge request artica/pandorafms!5733
 2023-04-24 08:41:24 +00:00
Pablo Aragon b3f2c6cad1 11036-Incorrectly closed quotes 2023-04-24 09:51:33 +02:00
Rafael Ameijeiras 8bf8542676 Merge branch 'ent-11010-15353-elementos-de-la-consola-visual-no-se-refrescan' into 'develop' 
fix refresh elements VC pandora_enterprise#11010

See merge request artica/pandorafms!5752
 2023-04-24 07:33:40 +00:00
Jonathan 55485c43b2 #10972 remove console.log fullcalendar.js 2023-04-24 07:51:00 +02:00
artica 831e1ea05f Auto-updated build strings. 2023-04-24 01:00:17 +02:00
artica 5f79f7db89 Auto-updated build strings. 2023-04-23 01:00:18 +02:00
Jimmy Olano 1f2044386b Merge branch 'ent-10858-errata-en-mensaje-de-error-monitoring-views-tree-view' into 'develop', JJOS. 
Ent 10858 errata en mensaje de error monitoring views tree view

See merge request artica/pandorafms!5724
 2023-04-22 15:47:40 +00:00
artica 6a3c4fb9af Auto-updated build strings. 2023-04-22 01:00:20 +02:00
alejandro.campos@artica.es a453ed7cea changes regarding encoding of tables 2023-04-21 15:16:51 +02:00
Jonathan ec1eb38336 #10972 fix null calendar alerts correlation 2023-04-21 13:27:18 +02:00
miguel angel rasteu bfe8d58d81 Change background color of progress bar with skin pandora_dark is active 2023-04-21 13:24:14 +02:00
miguel angel rasteu c70082e12d Fix limit in SQL query 2023-04-21 09:40:14 +02:00
Jonathan f5c517ae7d #10191 event sound fix select2 2023-04-21 09:30:22 +02:00
Jonathan a28aef4050 #10191 fix url sound event on metaconsole 2023-04-21 08:48:19 +02:00
daniel 2ba088ff3e Merge remote-tracking branch 'origin/develop' into ent-11010-15353-elementos-de-la-consola-visual-no-se-refrescan 2023-04-21 07:33:23 +02:00
artica 180a3a52a8 Auto-updated build strings. 2023-04-21 01:00:19 +02:00
Daniel Rodriguez af80e204de Merge branch 'ent-10255-14940-Funcionalidad-cuadro-naranja-en-las-consolas-visuales-cuando-hay-una-alerta' into 'develop' 
setup check to enable/disable vc item alert frame

See merge request artica/pandorafms!5668
 2023-04-20 17:22:57 +00:00
alejandro.campos@artica.es 6dfbe394a4 fixed custom oids 2023-04-20 19:15:32 +02:00
miguel angel rasteu 4b33fa241d fix column name in sql sentence 2023-04-20 16:40:28 +02:00
Rafael Ameijeiras cd3d4cb98c Merge branch 'ent-10692-nuevo-widget-simple-graph' into 'develop' 
new widget basic chart pandora_enterprise#10692

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

See merge request artica/pandorafms!5649
 2023-04-20 11:51:13 +00:00
daniel 70c18d9605 fix refresh elements VC pandora_enterprise#11010 2023-04-20 13:23:13 +02:00
Daniel Cebrian 6ef34d78c4 #10991 fixed background in black theme 2023-04-20 12:47:06 +02:00
Jonathan fcde5e4452 #10899 fix custom fields server error 2023-04-20 12:25:37 +02:00
Diego Muñoz-Reja 46549f7d24 Merge branch 'ent-10331-vista-de-servidores-muestra-como-lag-tareas-manuales-del-discovery' into 'develop' 
Excluded manual discovery tasks from server lag calculation

See merge request artica/pandorafms!5636
 2023-04-20 09:33:38 +00:00
Daniel Cebrian 48d7eb2514 #10733 align text widget hotizontally 2023-04-20 11:15:34 +02:00
miguel angel rasteu 8e9bc5d0bb Fix style class invert_filter 2023-04-20 11:13:47 +02:00
Rafael Ameijeiras f2be417a5e Merge branch 'ent-10955-fallos-de-estilos-en-discovery-netscan' into 'develop' 
Ent 10955 fallos de estilos en discovery netscan

See merge request artica/pandorafms!5739
 2023-04-20 08:32:37 +00:00
Jorge Rincon 9acfa36d43 #10698 Adjusted style of comment field, event list view 2023-04-20 10:22:37 +02:00
daniel a89e1aa534 new widget basic chart pandora_enterprise#10692 2023-04-20 10:16:18 +02:00
Diego Muñoz-Reja 07cc7372b8 Merge branch 'ent-10339-15025-Filtro-de-busqueda-de-SNMP-console-no-funciona' into 'develop' 
fixed free string search

See merge request artica/pandorafms!5690
 2023-04-20 08:03:23 +00:00
alejandro.campos@artica.es a73c8347ed changed icons 2023-04-20 10:01:35 +02:00
miguel angel rasteu b7a7b4b597 Fix js code line that forced the selected version to 1 2023-04-20 09:09:34 +02:00
artica 4b663d94d6 Auto-updated build strings. 2023-04-20 01:00:19 +02:00
alejandro.campos@artica.es b293587aa9 implemented agent deploy wizard 2023-04-19 19:25:22 +02:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
Jorge Rincon e1e72ca882 #10955 Fixed Netscan styling bugs. Group, module templates, Description 2023-04-19 15:51:51 +02:00
Matias Didier 65e2c7d998 Merge branch 'ent-10959-actualizar-estilos-de-mensajes-emergentes' into 'develop' 
Ent 10959 actualizar estilos de mensajes emergentes

See merge request artica/pandorafms!5737
 2023-04-19 13:46:10 +00:00
Matias Didier 2902459197 Merge branch 'ent-11006-traza-en-la-vista-de-servicios' into 'develop' 
fix hd pandora_enterprise#11006

See merge request artica/pandorafms!5743
 2023-04-19 13:32:15 +00:00
Rafael Ameijeiras d40091a8f3 Merge branch 'ent-10066-poner-recursividad-para-grupos-en-widget-triggered-alerts-report' into 'develop' 
Ent 10066 poner recursividad para grupos en widget triggered alerts report

See merge request artica/pandorafms!5666
 2023-04-19 12:40:16 +00:00
daniel 4a5f8be859 fix hd pandora_enterprise#11006 2023-04-19 13:34:04 +02:00
Matias Didier 53c69f1176 Merge branch 'ent-10926-falta-boton-add-en-manage-scan-scripts' into 'develop' 
Ent 10926 falta boton add en manage scan scripts

See merge request artica/pandorafms!5715
 2023-04-19 10:51:00 +00:00
Daniel Rodriguez 063dbf07d6 Merge branch 'ent-10564-15146-bug-en-comentarios-de-eventos' into 'develop' 
fixed add commet event

See merge request artica/pandorafms!5672
 2023-04-19 10:45:50 +00:00
Diego Muñoz-Reja 60f895c2c7 Merge branch 'ent-10550-parametros-snmp-perduran-al-cambiar-opciones-en-credential-store' into 'develop' 
Ent 10550 parametros snmp perduran al cambiar opciones en credential store

See merge request artica/pandorafms!5651
 2023-04-19 08:18:14 +00:00
Diego Muñoz-Reja 541de77b17 Merge branch 'ent-10585-diagnostic-info-no-tiene-en-cuenta-los-path-personalizados' into 'develop' 
Ent 10585 diagnostic info no tiene en cuenta los path personalizados

See merge request artica/pandorafms!5571
 2023-04-19 08:09:42 +00:00
artica 277c6e9ba2 Auto-updated build strings. 2023-04-19 01:00:17 +02:00
Jonathan d56237e45c #10959 size image info mesagge 2023-04-18 16:51:19 +02:00
Jonathan 1efc9dab8e #10959 change style message info header 2023-04-18 16:47:44 +02:00
Diego Muñoz-Reja aa6c591a5e Merge branch 'ent-10646-15203-edicion-de-threshold-de-acciones' into 'develop' 
Ent 10646 15203 edicion de threshold de acciones

See merge request artica/pandorafms!5648
 2023-04-18 14:44:35 +00:00
Matias Didier 94fdf153d3 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente' into 'develop' 
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente

See merge request artica/pandorafms!5658
 2023-04-18 14:32:28 +00:00
Daniel Maya b39f4a2f04 #10910 Fix old image 2023-04-18 15:14:40 +02:00
Rafael Ameijeiras 2d065bca9d Merge branch 'ent-10966-widget-info-de-grupo-visual' into 'develop' 
Ent 10966 widget info de grupo visual

See merge request artica/pandorafms!5735
 2023-04-18 12:36:13 +00:00
Diego Muñoz-Reja 2a03861168 Merge branch 'ent-10653-14875-no-se-pueden-crear-eliminar-informes-con-acl-solo-custom-report' into 'develop' 
Ent 10653 14875 no se pueden crear eliminar informes con acl solo custom report

See merge request artica/pandorafms!5650
 2023-04-18 12:22:53 +00:00
Diego Muñoz-Reja b8569af77c Merge branch 'ent-10727-fechas-incorrectas-en-el-informe-de-tipo-agent-event-y-otros-fallos-menores-de-informes-de' into 'develop' 
Ent 10727 fechas incorrectas en el informe de tipo agent event y otros fallos menores de informes de

See merge request artica/pandorafms!5659
 2023-04-18 11:04:46 +00:00
Daniel Rodriguez fb2b261698 Merge branch 'ent-10631-15172-problema-con-carga-de-comentarios-en-tabla-de-eventos' into 'develop' 
fix comments events pandora_enterprise#10631

See merge request artica/pandorafms!5694
 2023-04-18 11:01:14 +00:00
Jonathan ad0e922ece #10966 change style widget info groups 2023-04-18 12:56:18 +02:00
Jonathan d501e49f4c #10899 required module inventory select 2023-04-18 11:36:17 +02:00
Daniel Maya 20c835a812 #10985 Fixed privacy method 2023-04-18 11:30:29 +02:00
Pablo Aragon 8167c93aad 10755-Confict 2023-04-18 10:52:24 +02:00
Jonathan 1940dcc49f #10727 fix timestamp format on report event agent 2023-04-18 10:33:41 +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
Jonathan 726ab896f1 #10899 remove entities from inventory custom fields 2023-04-18 09:49:35 +02:00
artica b1a5e9e473 Auto-updated build strings. 2023-04-18 01:00:17 +02:00
Pablo Aragon bfd00726bf 9555-Header and tactical view 2023-04-17 20:02:16 +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 53bbae5264 10755-Confict 2023-04-17 15:47:42 +02:00
Pablo Aragon 6cb74f18cd 9555-Features and styles fixes 2023-04-17 15:14:51 +02:00
Rafael Ameijeiras ec772f592d Merge branch 'ent-10803-no-hay-formulario-de-perfiles-al-crear-usuario' into 'develop' 
fix profiles and users pandora_enterprise#10803

See merge request artica/pandorafms!5721
 2023-04-17 12:44:16 +00:00
Matias Didier 75a40d3c5a Merge branch 'ent-10898-error-en-la-asignacion-de-grupo-secundario' into 'develop' 
Ent 10898 error en la asignacion de grupo secundario

See merge request artica/pandorafms!5697
 2023-04-17 12:27:23 +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
Jorge Rincon 9ef46ec9d5 #18085 fixed up error message 2023-04-17 08:52:36 +02:00
artica 3c01ffa27f Auto-updated build strings. 2023-04-17 01:00:12 +02:00
Pablo Aragon 0fa03f28b3 10067-Alerts triggered filter tree view 2023-04-16 20:21:29 +02:00
Pablo Aragon 6bc185e148 10848-confict 2023-04-16 18:06:54 +02:00
artica a493a9b0b4 Auto-updated build strings. 2023-04-16 01:00:39 +02:00
artica c4adfa7755 Auto-updated build strings. 2023-04-15 01:00:16 +02:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
alejandro.campos@artica.es 4bb88080ea Keep In process status for new events with same extra id 2023-04-14 08:59:19 +02:00
artica c84e416f44 Auto-updated build strings. 2023-04-14 01:00:11 +02:00
Pablo Aragon 3a80923de9 9555-New view: Services 2023-04-13 16:27:13 +02:00
Rafael Ameijeiras 57ec600bd1 Merge branch 'ent-10912-enlaces-a-agente-en-la-vista-tactica-de-grupo-lleva-a-la-edicion-de-agente-deberia-ir-a-la' into 'develop' 
Ent 10912 enlaces a agente en la vista tactica de grupo lleva a la edicion de agente deberia ir a la

See merge request artica/pandorafms!5716
 2023-04-13 13:07:05 +00:00
Rafael Ameijeiras 652432b660 Merge branch 'ent-10730-pequena-mejora-en-informes-de-inventario' into 'develop' 
Ent 10730 pequena mejora en informes de inventario

See merge request artica/pandorafms!5712
 2023-04-13 12:47:04 +00:00
Rafael Ameijeiras b78acc28ca Merge branch 'ent-10310-14620-Widget-General-group-status-no-funciona-correctamente-en-la-Metaconsola' into 'develop' 
fixed group link on General group status widget

See merge request artica/pandorafms!5711
 2023-04-13 12:45:19 +00:00
Rafael Ameijeiras dbba723c08 Merge branch 'ent-10918-pantallas-de-fondo-de-la-vista-de-login' into 'develop' 
Ent 10918 pantallas de fondo de la vista de login

See merge request artica/pandorafms!5708
 2023-04-13 12:33:42 +00:00
Matias Didier bf7397157c Merge branch 'ent-10002-cli-anadir-comentarios-con-usuario-con-espacios-no-mete-el-nombre-en-el-comentario' into 'develop' 
Ent 10002 cli anadir comentarios con usuario con espacios no mete el nombre en el comentario

See merge request artica/pandorafms!5679
 2023-04-13 11:49:31 +00:00
Jonathan 7730ca6469 #10912 link to agent view in tactical group view 2023-04-13 12:16:32 +02:00
Jonathan bc8528f511 #10926 fix visual - add button add netscanscripts 2023-04-13 11:49:10 +02:00
miguel angel rasteu dc41e1c377 fix if in header and declare correctly a value 2023-04-13 11:36:13 +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
Jonathan 7d9fb5c77a #10730 Regular expresion inventory reports 2023-04-13 10:42:37 +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
Pablo Aragon d144d77128 9555-Groups, agents counters 2023-04-13 09:38:52 +02:00
alejandro.campos@artica.es 153b978778 fixed group link on General group status widget 2023-04-13 09:18:55 +02:00
artica 19bb879cfc Auto-updated build strings. 2023-04-13 01:01:23 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Rodriguez 7ae8f185b0 Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop' 
Ent 10909 se han roto los iconos de grupo de agentes en v770

See merge request artica/pandorafms!5701
 2023-04-12 15:29:44 +00:00
daniel 3a9b8d31bf fix icons pandora_enterprise#10909 2023-04-12 17:21:27 +02:00
Pablo Aragon 2d8d501fe8 10918-Fix login background & text 2023-04-12 17:21:18 +02:00
daniel b186d51329 fix icons pandora_enterprise#10909 2023-04-12 17:06:58 +02:00
Daniel Maya cd030620b2 #10909 Fix icon group 4 2023-04-12 15:51:02 +02:00
Daniel Rodriguez 01e831312d Merge branch 'ent-10917-iconos-de-so-personalizados-se-ven-rotos' into 'develop' 
Ent 10917 iconos de so personalizados se ven rotos

See merge request artica/pandorafms!5707
 2023-04-12 13:50:30 +00:00
Daniel Maya 7570e0d3fb #10909 Fix icon group 3 2023-04-12 15:10:05 +02:00
Matias Didier d85c763892 Merge branch 'ent-10913-falta-el-icono-de-metaconsola' into 'develop' 
Ent 10913 falta el icono de metaconsola

See merge request artica/pandorafms!5702
 2023-04-12 13:06:05 +00:00
Pablo Aragon 4deec005c1 9555-Server status 2023-04-12 14:48:19 +02:00
Daniel Maya a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
daniel 07207ea8af fix size icons wizard snmp pandora_enterprise#10901 2023-04-12 14:07:31 +02:00
miguel angel rasteu 425da3b36d #10913 Fix metaconsole favicon path 2023-04-12 13:01:53 +02:00
Matias Didier ad3f1dd8d6 Merge branch 'ent-10526-derivado-del-trabajo-de-q-a-en-ticket-https-brutus-artica-es-8081-artica-pandora_enterprise' into 'develop' 
Ent 10526 derivado del trabajo de q a en ticket https brutus artica es 8081 artica pandora enterprise

See merge request artica/pandorafms!5691
 2023-04-12 10:16:24 +00:00
Matias Didier 5906ab595e Merge branch 'ent-10181-Conteo-de-numero-de-eventos-erroneo-en-vista-tactica' into 'develop' 
minor change

See merge request artica/pandorafms!5677
 2023-04-12 08:45:04 +00:00
Jonathan aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
Pablo Aragon c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
artica 01527dcc67 Auto-updated build strings. 2023-04-12 01:00:14 +02:00
Jonathan b36ade1821 #10191 fix url event sounds 2023-04-11 16:24:37 +02:00
daniel eaf71f39ec fix comments events pandora_enterprise#10631 2023-04-11 15:43:21 +02:00
Jonathan c6c8e60b1d #10191 no show old sound event modal 2023-04-11 15:04:21 +02:00
Jonathan 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Daniel Cebrian f5c31b0daf #10420 fixed fullname user in ldap 2023-04-11 14:49:34 +02:00
Daniel Rodriguez bb0d637c3f Merge branch 'ent-10893-Error-SQL-en-menu-de-welcome-tips' into 'develop' 
fixed collation compatibily with older mysql versions

See merge request artica/pandorafms!5683
 2023-04-11 12:06:52 +00:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
alejandro.campos@artica.es 5f0e9aac69 fixed free string search 2023-04-11 13:48:08 +02:00
Daniel Cebrian da2ede8627 #10420 fixed login ldap with quotes 2023-04-11 13:12:48 +02:00
alejandro.campos@artica.es 472c342f81 fixed collation compatibily with older mysql versions 2023-04-11 11:24:42 +02:00
Pablo Aragon b3becfc861 10889-500 acustic console 2023-04-11 10:06:47 +02:00
artica 9da3816a88 Auto-updated build strings. 2023-04-11 01:00:13 +02:00
Daniel Maya 837092d17e #10002 Fixed comments 2023-04-10 16:57:22 +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 c0172afc3d update composer 2023-04-10 16:38:37 +02:00
alejandro.campos@artica.es 6648ef34dd minor change 2023-04-10 16:02:28 +02:00
Pablo Aragon 8c1fa4b245 10835-Logs icons 2023-04-10 14:16:15 +02:00
Daniel Rodriguez 871a8f15c5 Merge branch 'ent-10873-mini-revision-de-consola-movil' into 'develop' 
Ent 10873 mini revision de consola movil

See merge request artica/pandorafms!5671
 2023-04-10 12:14:26 +00:00
daniel ba1f299440 fixed add commet event 2023-04-10 10:35:47 +02:00
Pablo Aragon 8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
Pablo Aragon 45ca03245c 10873-Mini mobile console review 2023-04-10 08:56:44 +02:00
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