Commit Graph

26935 Commits

Author SHA1 Message Date
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez 04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop'
fixed minor error

See merge request artica/pandorafms!3958
2021-03-29 07:15:32 +00:00
Daniel Rodriguez 652d84ffde Merge branch 'ent-7226-iconos-barra-de-busqueda-no-se-visualizan' into 'develop'
fixed lost icons

See merge request artica/pandorafms!3971
2021-03-29 07:15:19 +00:00
marcos 88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
Daniel Rodriguez 812007169d Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop'
fixed visual error

See merge request artica/pandorafms!3969
2021-03-26 13:52:44 +00:00
Daniel Rodriguez c5d6daa018 Merge branch 'ent-7207-error-visual-en-relaciones-de-network-maps' into 'develop'
fixed visual error

See merge request artica/pandorafms!3968
2021-03-26 13:41:31 +00:00
Daniel Rodriguez e6be5e61f9 Merge branch 'ent-7194-varios-bugs-visuales-metaconsola' into 'develop'
fixed visual error

See merge request artica/pandorafms!3945
2021-03-26 13:40:56 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Calvo 3b185d3a70 Added missing classes to main.css mobile 2021-03-26 14:33:48 +01:00
marcos 56462b1b06 fixed visual error 2021-03-26 14:32:29 +01:00
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop'
fixed minor error

See merge request artica/pandorafms!3967
2021-03-26 13:05:28 +00:00
marcos 89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect
Conflicts:
	pandora_console/godmode/users/user_list.php
2021-03-26 13:52:01 +01:00
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop'
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Daniel Rodriguez 1f74bd071c Merge branch 'ent-7221-icono-lupa-cambiado-por-ojo' into 'develop'
Substituted eye with operation (magnifier) icon on credential store and tasklist

See merge request artica/pandorafms!3964
2021-03-26 12:05:29 +00:00
Calvo 887742a675 Restored not update error message on update manager offline 2021-03-26 13:02:55 +01:00
Daniel Rodriguez 316aa0a691 Merge branch 'ent-7222-Bug-en-widget-Defined-custom-graph' into 'develop'
fixed minor error

See merge request artica/pandorafms!3960
2021-03-26 11:39:14 +00:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
Daniel Rodriguez 3ea9a49136 Merge branch 'ent-7219-Bug-en-widget-Groups-status-Dashboards' into 'develop'
fixed minor error

See merge request artica/pandorafms!3959
2021-03-26 11:04:19 +00:00
Daniel Rodriguez f67528f7a5 Merge branch 'ent-6958-messaging-integration' into 'develop'
messaging integrations

See merge request artica/pandorafms!3793
2021-03-26 11:00:15 +00:00
fbsanchez 024640bcae Added a searchbox for module list in mobile/agent 2021-03-26 11:55:44 +01:00
Daniel Barbero Martin 021675d825 fixed minor error 2021-03-26 11:28:34 +01:00
Daniel Barbero Martin 193d6bf2d2 fixed minor error 2021-03-26 10:37:44 +01:00
Daniel Barbero Martin 8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez b9f0ac8239 Merge branch 'ent-7205-fallos-visuales-en-monitoring' into 'develop'
fixed visual error

See merge request artica/pandorafms!3955
2021-03-26 09:32:30 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop'
fixed visual error

See merge request artica/pandorafms!3954
2021-03-26 09:32:08 +00:00
Daniel Rodriguez 20bc1fdaec Merge branch 'ent-7213-Barras-de-desplazamiento-en-consolas-visuales' into 'develop'
fixed minor error

See merge request artica/pandorafms!3956
2021-03-26 08:26:26 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Junichi Satoh d4b8916c54 Fixed following problems.
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
2021-03-26 17:11:10 +09:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop'
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop'
fixed visual error

See merge request artica/pandorafms!3939
2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
marcos a6b9998bbe fixed visual error 2021-03-25 13:42:21 +01:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop'
fixed visual error

See merge request artica/pandorafms!3946
2021-03-25 11:55:33 +00:00
Daniel Rodriguez c4b6f709c9 Merge branch 'ent-6979-fallo-discovery-contraseñas-caracteres-especiales' into 'develop'
Fix issue

Closes pandora_enterprise#6979

See merge request artica/pandorafms!3821
2021-03-25 11:54:45 +00:00
marcos f5ceb2384e fixed visual error 2021-03-25 12:35:40 +01:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01:00
Daniel Rodriguez 1d374fca46 Merge branch 'ent-2561-llamadas-api-para-modulos-de-politicas' into 'develop'
minor changes

See merge request artica/pandorafms!3779
2021-03-25 09:57:53 +00:00
Daniel Rodriguez f99e4763e2 Merge branch 'ent-7197-estilos-log-viewer' into 'develop'
Fix some documentary issues

Closes pandora_enterprise#7197

See merge request artica/pandorafms!3948
2021-03-25 09:53:41 +00:00
Daniel Rodriguez effda26dc6 Merge branch 'ent-7201-no-se-muestra-el-modal-de-detalle-de-modulos-en-la-vista-de-agent-detail' into 'develop'
resolved error with modal module detail on agent detail

See merge request artica/pandorafms!3950
2021-03-25 09:51:43 +00:00