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

14384 Commits

Author SHA1 Message Date
Daniel Rodriguez 5fbfacd718 Merge branch 'ent-7558-Informe-group-event-report-no-saca-datos' into 'develop' 
Fixed issue with group events in reports

Closes pandora_enterprise#7558

See merge request artica/pandorafms!4144
 2021-05-21 12:10:04 +00:00
Daniel Rodriguez 85565ef7f9 Merge branch 'ent-7549-error-de-carga-link-publico-consolas-visuales' into 'develop' 
Ent 7549 error de carga link publico consolas visuales

See merge request artica/pandorafms!4140
 2021-05-21 12:09:30 +00:00
artica f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
José González 11d1b785b2 Fixed issue with group events in reports 2021-05-20 14:44:40 +02:00
artica 63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
Daniel Rodriguez 4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
fbsanchez 4711ca4856 Avoid connection accumulation 2021-05-19 17:44:07 +02:00
fbsanchez 538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
fbsanchez 4b114e63a4 Minor fix 2021-05-19 10:13:25 +02:00
artica f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
fbsanchez 8fc438f913 Fix in item load vc-public link 2021-05-18 18:50:01 +02:00
fbsanchez 074fadda35 Fix in item load vc-public link 2021-05-18 18:49:20 +02:00
José González 91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
José González 46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop' 
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
 2021-05-13 11:14:44 +00:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
artica 671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
Daniel Rodriguez dcbeaa1b3e Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop' 
Fixed visual bug on event modal event responses

See merge request artica/pandorafms!4022
 2021-05-11 13:49:40 +00:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Daniel Rodriguez 858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +00:00
Daniel Rodriguez ac0ef3c61c Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop' 
minor change in integria ims setup

See merge request artica/pandorafms!4104
 2021-05-11 07:39:16 +00:00
Daniel Rodriguez de58f0533b Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop' 
Ent 6618 giss nombres de servicios aleatorios

See merge request artica/pandorafms!4039
 2021-05-11 07:37:49 +00:00
Daniel Rodriguez 197e156869 Merge branch 'ent-5264-Report-vacio-mails-console-tasks' into 'develop' 
Added function for use templates in emails

Closes pandora_enterprise#5264

See merge request artica/pandorafms!4027
 2021-05-11 07:35:01 +00:00
artica 6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
Daniel Rodriguez fd7eb10f3e Merge branch 'ent-7340-Mensaje-ajax-php-permanente-en-el-log-de-consola' into 'develop' 
remove log input

See merge request artica/pandorafms!4103
 2021-05-10 09:52:08 +00:00
Luis 61dc2e833b Ent 5680 llamada api set update agent field 2021-05-10 09:49:43 +00:00
Daniel Rodriguez b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez 826e9edddb Merge branch 'ent-7481-black-theme-segunda-solapa-de-vista-de-un-agente-no-tiene-tabla' into 'develop' 
fixed visual error black theme event modal

See merge request artica/pandorafms!4098
 2021-05-10 09:16:19 +00:00
Marcos Alconada 8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00
Daniel Rodriguez 4c768bc6cd Merge branch 'ent-7439-metaconsola-dashboard-fallo-link-publico' into 'develop' 
Reference to base public_dashboard url

See merge request artica/pandorafms!4081
 2021-05-10 09:14:58 +00:00
Daniel Rodriguez 12ccb680d6 Merge branch 'ent-7099-11462-Crear-grupo-de-agentes-con-contraseña-mediante-la-API' into 'develop' 
Added new field in api call

See merge request artica/pandorafms!4040
 2021-05-10 09:14:25 +00:00
Daniel Rodriguez 3d8f0b58d6 Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop' 
Fix bugs with SLA item reports

Closes pandora_enterprise#7258

See merge request artica/pandorafms!4000
 2021-05-10 09:09:36 +00:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00