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

18438 Commits

Author SHA1 Message Date
miguel angel rasteu cccb03010c #10851 change date order to asc and fix sql query 2023-05-25 10:30:34 +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
artica b1a5e9e473 Auto-updated build strings. 2023-04-18 01:00:17 +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
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
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
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
artica c84e416f44 Auto-updated build strings. 2023-04-14 01:00:11 +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 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
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
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
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
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 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +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
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