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

21526 Commits

Author SHA1 Message Date
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 128f67b058 Merge branch 'ent-7139-clickjacking' into 'develop' 
Avoiding clickjacking

Closes pandora_enterprise#7139

See merge request artica/pandorafms!4013
 2021-05-11 09:45:08 +00:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +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 a0197dab87 Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop' 
Ent 7453 busqueda alertas en vista de agente no funciona

See merge request artica/pandorafms!4084
 2021-05-10 09:15:40 +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 d1e0f070f1 Merge branch 'ent-7296-botones-descolocados-gestion-eventos-metaconsola' into 'develop' 
Event responses buttons visual bug

See merge request artica/pandorafms!4111
 2021-05-10 09:11:29 +00:00
Daniel Rodriguez 5a339ac76e Merge branch 'ent-7284-Warning-creación-agente' into 'develop' 
Ent 7284 warning creación agente

See merge request artica/pandorafms!4017
 2021-05-10 09:10:43 +00:00
Daniel Maya cdf0e1a4f4 Ent 7284 warning creación agente 2021-05-10 09:10:43 +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
Daniel Rodriguez d878fdfdb8 Merge branch 'ent-7184-duplicate-web-server-module' into 'develop' 
Ent 7184 duplicate web server module

Closes pandora_enterprise#7184

See merge request artica/pandorafms!3978
 2021-05-10 09:08:09 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' 
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
 2021-05-10 08:15:50 +00:00
artica dfba1da200 Auto-updated build strings. 2021-05-10 01:00:34 +02:00
artica fb1ea7bd1d Auto-updated build strings. 2021-05-09 01:00:25 +02:00
artica 68f4f6f135 Auto-updated build strings. 2021-05-08 01:00:43 +02:00
José González 48e464542a Fixed missing spinner 2021-05-07 13:50:28 +02:00
José González 214535bdaa Revert functions_ui 2021-05-07 11:11:36 +00:00
José González c7bb5ad430 Revert 2 2021-05-07 13:07:35 +02:00
José González c0e6bef136 Revert 2021-05-07 13:05:39 +02:00
José González 0a7c960630 Added control for autocomplete input icon 2021-05-07 12:40:38 +02:00
José González 5b709e6331 Aditional control for agent autocomplete input icon' 2021-05-07 11:53:42 +02:00
José González 856186ee59 Added function for control icon changes 2021-05-07 11:17:20 +02:00
fbsanchez fe932a0dd6 avoid some warnings 2021-05-07 10:50:25 +02:00
fbsanchez 2fb54dabf1 Avoid change path while adding resources in certain situations 2021-05-07 10:47:05 +02:00
artica 454e6120e4 Auto-updated build strings. 2021-05-07 01:00:44 +02:00
José González 9288a31e58 Fixed error with types 2021-05-06 17:44:32 +02:00
Calvo 3359b21d5b Event responses buttons visual bug 2021-05-06 16:06:21 +02:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Daniel Rodriguez 77a1de6b1b Merge branch 'ent-7285-No-aparece-mensaje-en-el-TreeView-al-filtrar' into 'develop' 
Ent 7285 no aparece mensaje en el tree view al filtrar

See merge request artica/pandorafms!4018
 2021-05-06 12:26:58 +00:00
Daniel Rodriguez 8b3ad8602a Merge branch 'ent-7097-varios-bugs-mensajes' into 'develop' 
Ent 7097 varios bugs mensajes

Closes pandora_enterprise#7097

See merge request artica/pandorafms!3996
 2021-05-06 12:25:03 +00:00
Daniel Rodriguez 6db71ec0fb Merge branch 'ent-7176-no-se-ven-los-valores-de-la-columna-de-intervlos-en-creacion-de-modulos-black-theme' into 'develop' 
set labels white color on module interval svg

See merge request artica/pandorafms!3993
 2021-05-06 12:23:47 +00:00
Daniel Rodriguez c39d013afb Merge branch 'ent-7227-Perfil-LM-no-permite-modificar-acciones-ni-templates' into 'develop' 
Ent 7227 perfil lm no permite modificar acciones ni templates

See merge request artica/pandorafms!3980
 2021-05-06 12:22:48 +00:00
Daniel Maya c003964394 Ent 7227 perfil lm no permite modificar acciones ni templates 2021-05-06 12:22:47 +00:00
Daniel Rodriguez 1e0eabdbf7 Merge branch 'ent-7114-no-se-puede-realizar-llamada-api-add-user-profile-modo-all' into 'develop' 
Fixed api add user profile with group all

See merge request artica/pandorafms!3974
 2021-05-06 12:19:23 +00:00
Daniel Rodriguez 5efb331568 Merge branch 'ent-7140-vista-agents-alerts-salta-vista-principal' into 'develop' 
Fixed agents/alerts view group change when public url foreced

See merge request artica/pandorafms!4108
 2021-05-06 12:17:38 +00:00