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

26978 Commits

Author SHA1 Message Date
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Rodriguez 751d7ec3cf Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop' 
Ent 7161 cambiar opciones de skin en usuarios y grupos

See merge request artica/pandorafms!3972
 2021-04-13 09:26:50 +00:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
marcos 27df4348be resolved error with mail graph 2021-04-13 10:29:42 +02:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
artica c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
Daniel Rodriguez a6f2b364f6 Merge branch 'ent-7281-Aumentar-carácteres-de-la-caja-de-consulta-SQL-en-Informes' into 'develop' 
Ent 7281 aumentar carácteres de la caja de consulta sql en informes

See merge request artica/pandorafms!4014
 2021-04-12 14:44:33 +00:00
Daniel Maya 8a27517cc5 Ent 7281 aumentar carácteres de la caja de consulta sql en informes 2021-04-12 14:44:33 +00:00
Daniel Rodriguez b4e469c463 Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Reverted failed change

Closes pandora_enterprise#7040

See merge request artica/pandorafms!4007
 2021-04-12 14:40:28 +00:00
Jose Gonzalez 3b4927e9b0 Fixed missed params to update max_agents 2021-04-12 13:20:21 +02:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez d96dd76b26 Merge branch 'ent-7100-bug-en-instalacion-de-servicio-systemctl-agente' into 'develop' 
changed systemctl check for command -v

See merge request artica/pandorafms!3983
 2021-04-12 10:38:57 +00:00
Daniel Rodriguez 9184d2b11f Merge branch 'ent-6857-implementar-control-de-descarga-csv-del-log-viewer-en-metaconsola' into 'develop' 
Ent 6857 implementar control de descarga csv del log viewer en metaconsola

See merge request artica/pandorafms!3917
 2021-04-12 08:48:16 +00:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Jose Gonzalez 141daec1ab Missed value for add 2021-04-12 10:42:13 +02:00
Daniel Rodriguez 34aeb4ddd8 Merge branch 'ent-6883-11170-pandora_server_installer-pandora_server-spec-borra-configuracion-de-logrotate' into 'develop' 
Prevent logrotate file to be overwritten

See merge request artica/pandorafms!3992
 2021-04-12 08:32:49 +00:00
Daniel Rodriguez 558ba562ee Merge branch 'ent-7292-bug-creacion-grupos' into 'develop' 
Added boolean casting for check acl

Closes pandora_enterprise#7292

See merge request artica/pandorafms!4016
 2021-04-12 08:17:34 +00:00
artica 4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica 3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Daniel Rodriguez bcb0832309 Merge branch 'ent-7070-archivo-raro-0-en-pandoa_console' into 'develop' 
Avoid file 0 with log in pandora_console

See merge request artica/pandorafms!3863
 2021-04-09 11:53:26 +00:00
Daniel Rodriguez b1f174e687 Merge branch 'ent-7266-black-theme-mala-implementacion-de-vista-de-ticket-integracion-integria' into 'develop' 
Ent 7266 black theme mala implementacion de vista de ticket integracion integria

See merge request artica/pandorafms!4009
 2021-04-09 10:00:12 +00:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Daniel Rodriguez 19a1945385 Merge branch 'ent-7264-custom-graphs-en-black-theme' into 'develop' 
set black theme custom graph colors

See merge request artica/pandorafms!3999
 2021-04-09 09:52:28 +00:00
Marcos Alconada 225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Daniel Rodriguez a203a6e80d Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' 
fixed size box log sources status

See merge request artica/pandorafms!4006
 2021-04-09 09:35:50 +00:00
Daniel Rodriguez ae655da711 Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' 
add black theme style on visual map

See merge request artica/pandorafms!4008
 2021-04-09 09:34:59 +00:00
Daniel Rodriguez 040fdbae01 Merge branch 'ent-7262-fondo-de-la-grafica-de-acceso-no-es-transparente-casca-en-blactheme' into 'develop' 
set black theme on agent access rate flot

See merge request artica/pandorafms!3997
 2021-04-09 09:29:26 +00:00
Marcos Alconada a1fceb2e81 set black theme on agent access rate flot 2021-04-09 09:29:26 +00:00
Daniel Rodriguez bda9cbe3e8 Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3994
 2021-04-09 09:28:25 +00:00
Daniel Rodriguez 1b9916c6e9 Merge branch 'ent-6818-bug-en-label-de-informes-y-plantillas' into 'develop' 
fixed error with label reporting views

See merge request artica/pandorafms!3938
 2021-04-09 09:24:44 +00:00
Daniel Rodriguez 1fb259c35f Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop' 
fixed error on bulk operations edit agents

See merge request artica/pandorafms!3995
 2021-04-09 09:21:36 +00:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
Daniel Rodriguez 4adb9827cb Merge branch 'ent-7278-no-se-despliegan-agentes-en-templates-wizard-ni-en-generacion-dinamica-de-reports-desde' into 'develop' 
minor fix while empty search condition

See merge request artica/pandorafms!4012
 2021-04-08 07:49:16 +00:00
artica 2e27cebad2 Auto-updated build strings. 2021-04-08 01:00:37 +02:00
fbsanchez c64f05dc17 minor fix while empty search condition 2021-04-07 20:31:24 +02:00
fbsanchez 201d3194de Some inclusions in mobile view (MC) and minor fixes 2021-04-07 18:17:08 +02:00
fbsanchez cf6ad584d4 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 2021-04-07 17:46:43 +02:00
Daniel Rodriguez b62dc5c0c2 Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' 
fixed visual error report wizard

See merge request artica/pandorafms!3896
 2021-04-07 15:10:32 +00:00
daniel d78c276721 fixed visual error report wizard 2021-04-07 15:10:32 +00:00
Daniel Rodriguez 1f61161e6f Merge branch 'ent-6997-bug-unidades-item-general-summation' into 'develop' 
General report exponent prefix shows with blankspace

See merge request artica/pandorafms!3924
 2021-04-07 13:15:38 +00:00
Daniel Rodriguez 078901924c Merge branch 'ent-6967-mensaje-error-constante-YAML-Tiny' into 'develop' 
Changed message disposition

Closes pandora_enterprise#6967

See merge request artica/pandorafms!3852
 2021-04-07 13:14:38 +00:00
marcos 4395f21e4e add black theme style on visual map 2021-04-07 13:27:24 +02:00
Jose Gonzalez 34b01fdf51 Merge 2021-04-07 13:10:52 +02:00
Jose Gonzalez d4d3350c8c Reverted failed change 2021-04-07 13:03:18 +02:00
Daniel Rodriguez b89a860ba7 Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' 
Fixed mixed response from event datatables

See merge request artica/pandorafms!3952
 2021-04-07 10:55:25 +00:00
Daniel Rodriguez 517d7378d4 Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop' 
Addded param to escape API url call raw_decode

See merge request artica/pandorafms!3914
 2021-04-07 10:54:47 +00:00
Daniel Rodriguez 9813586f0d Merge branch 'ent-6935-OPEN-mouse-over-confuso-items' into 'develop' 
Added more clear message

Closes pandora_enterprise#6935

See merge request artica/pandorafms!3853
 2021-04-07 10:54:20 +00:00