Daniel Barbero Martin
|
33d9db657e
|
wip reports alert actions
|
2021-11-29 20:45:35 +01:00 |
|
Daniel Barbero Martin
|
e8bf86a789
|
wip reports alert actions
|
2021-11-29 17:55:09 +01:00 |
|
Daniel Barbero Martin
|
75354a97d9
|
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
|
2021-11-29 08:05:45 +01:00 |
|
artica
|
1bbcf965a8
|
Auto-updated build strings.
|
2021-11-29 01:00:15 +01:00 |
|
artica
|
7631585546
|
Auto-updated build strings.
|
2021-11-28 01:00:16 +01:00 |
|
artica
|
800faaf504
|
Auto-updated build strings.
|
2021-11-27 01:00:46 +01:00 |
|
Daniel Barbero Martin
|
1d7c27c64d
|
wip reports alert actions
|
2021-11-26 14:29:46 +01:00 |
|
Daniel Barbero Martin
|
81277246a5
|
wip reports alert actions
|
2021-11-26 14:10:21 +01:00 |
|
Daniel Barbero Martin
|
960c2de6c3
|
wip reports alert actions
|
2021-11-26 14:06:10 +01:00 |
|
Daniel Barbero Martin
|
cb0039d7a7
|
wip reports alert actions
|
2021-11-26 13:52:15 +01:00 |
|
Daniel Barbero Martin
|
be5fe18762
|
wip reports alert actions
|
2021-11-26 13:23:46 +01:00 |
|
Daniel Barbero Martin
|
0b04ba44f2
|
wip reports alert actions
|
2021-11-26 12:15:39 +01:00 |
|
Daniel Rodriguez
|
2cca2e94b6
|
Merge branch 'ent-8306-Bug-al-editar-elemento-en-File-repository-manager' into 'develop'
Ent 8306 bug al editar elemento en file repository manager
See merge request artica/pandorafms!4555
|
2021-11-26 10:50:49 +00:00 |
|
Daniel Rodriguez
|
137b3b132f
|
Merge branch 'ent-8296-12744-Problemas-Create-a-new-webserver-module' into 'develop'
Ent 8296 12744 problemas create a new webserver module
See merge request artica/pandorafms!4554
|
2021-11-26 10:49:03 +00:00 |
|
Daniel Barbero Martin
|
780d2bf87d
|
wip reports alert actions
|
2021-11-26 11:43:57 +01:00 |
|
Daniel Rodriguez
|
a249ad43e8
|
Merge branch 'ent-8292-update-manager-dbpass-encriptada' into 'develop'
Fixed issue
Closes pandora_enterprise#8292
See merge request artica/pandorafms!4545
|
2021-11-26 09:20:56 +00:00 |
|
Daniel Rodriguez
|
adb538dd71
|
Merge branch 'ent-8073-No-esta-funcionando-correctamente-el-install-php-cuando-hace-los-ultimos-grants' into 'develop'
minor fix
See merge request artica/pandorafms!4547
|
2021-11-26 08:54:31 +00:00 |
|
Daniel Rodriguez
|
8fac24a469
|
Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop'
Ent 8277 12706 lista de alertas no filtra correctamente
See merge request artica/pandorafms!4539
|
2021-11-26 07:58:38 +00:00 |
|
Daniel Rodriguez
|
67f85f92e2
|
Merge branch 'ent-8251-fallo-a-la-hora-de-guardar-ip-de-agente' into 'develop'
Fix delete agent secondary ip bug
See merge request artica/pandorafms!4551
|
2021-11-26 07:57:40 +00:00 |
|
Daniel Barbero Martin
|
9b62aa11da
|
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
|
2021-11-26 08:16:46 +01:00 |
|
artica
|
b1a55ad102
|
Auto-updated build strings.
|
2021-11-26 01:00:21 +01:00 |
|
Daniel Barbero Martin
|
dae6182ef0
|
wip reports alert actions
|
2021-11-25 17:28:00 +01:00 |
|
Daniel Maya
|
2894d23e40
|
#7316 Fixed config_url
|
2021-11-25 16:15:44 +01:00 |
|
alejandro.campos@artica.es
|
d94ed13f76
|
minor fixes
|
2021-11-25 15:03:46 +01:00 |
|
alejandro.campos@artica.es
|
6469f8053d
|
minor fixes
|
2021-11-25 15:00:57 +01:00 |
|
Daniel Rodriguez
|
05e61492c0
|
Merge branch 'ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado' into 'develop'
Ent 8228 se puede crear/editar/borrar un usuario desde cli en nodo centralizado
See merge request artica/pandorafms!4544
|
2021-11-25 10:52:58 +00:00 |
|
Daniel Rodriguez
|
f66d6e7f9c
|
Merge branch 'ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado' into 'develop'
Ent 8224 se puede crear/editar/borrar un grupo desde el cli en nodo centralizado
See merge request artica/pandorafms!4542
|
2021-11-25 10:52:08 +00:00 |
|
Daniel Barbero Martin
|
f7233604fe
|
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
|
2021-11-25 08:19:35 +01:00 |
|
Daniel Barbero Martin
|
8746db24c9
|
demo
|
2021-11-25 08:19:05 +01:00 |
|
artica
|
1f428a25ad
|
Auto-updated build strings.
|
2021-11-25 01:00:20 +01:00 |
|
Daniel Rodriguez
|
5fcabbf959
|
Merge branch 'ent-7902-Bug-visual-en-modal-de-edición-de-acciones-de-alertas' into 'develop'
Ent 7902 bug visual en modal de edición de acciones de alertas
See merge request artica/pandorafms!4541
|
2021-11-24 17:20:35 +00:00 |
|
Daniel Rodriguez
|
fff8f910f8
|
Merge branch 'ent-8015-palabras-conflictivas' into 'develop'
Removed some cheerful words in the project
Closes pandora_enterprise#8015
See merge request artica/pandorafms!4460
|
2021-11-24 17:18:38 +00:00 |
|
Daniel Maya
|
922088c306
|
resolved conflict
|
2021-11-24 17:48:34 +01:00 |
|
Daniel Maya
|
4185e34984
|
Merge branch 'develop' into ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado
|
2021-11-24 17:47:33 +01:00 |
|
Daniel Maya
|
0d2e4a99a3
|
resolved conflict
|
2021-11-24 17:46:23 +01:00 |
|
artica
|
3ec3e5e0a2
|
Updated version and build strings.
|
2021-11-24 17:45:09 +01:00 |
|
Daniel Maya
|
3cc3cef7fa
|
oMerge branch 'develop' into ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado
|
2021-11-24 17:36:48 +01:00 |
|
Daniel Maya
|
716e04a6b1
|
#8224 Fixed print_log
|
2021-11-24 16:11:32 +01:00 |
|
Daniel Maya
|
f52dc0c319
|
#8228 Fixed print_log
|
2021-11-24 16:07:20 +01:00 |
|
Daniel Rodriguez
|
eb4666e2c2
|
Merge branch 'ent-8294-Graficos-de-area-se-ven-como-graficos-de-linea' into 'develop'
fix chart area
See merge request artica/pandorafms!4546
|
2021-11-24 14:45:39 +00:00 |
|
Daniel Rodriguez
|
e3d7134dc8
|
Merge branch 'ent-8278-No-funcionan-las-gráficas-de-Agente-en-la-versión-Opensource' into 'develop'
Ent 8278 no funcionan las gráficas de agente en la versión opensource
See merge request artica/pandorafms!4538
|
2021-11-24 14:43:52 +00:00 |
|
Calvo
|
f76670dd28
|
Fix delete agent secondary ip bug
|
2021-11-24 14:39:42 +01:00 |
|
Daniel Rodriguez
|
8ed3042f9a
|
Merge branch 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' into 'develop'
added resolution field in creation and update operations
See merge request artica/pandorafms!4534
|
2021-11-24 11:20:18 +00:00 |
|
Daniel Rodriguez
|
07ef0477af
|
Merge branch 'ent-8301-Fallo-pandora-manage-pl' into 'develop'
minor fix
See merge request artica/pandorafms!4548
|
2021-11-24 10:23:48 +00:00 |
|
Daniel Barbero Martin
|
7a5f91188b
|
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
Conflicts:
pandora_console/include/functions_html.php
|
2021-11-24 08:39:03 +01:00 |
|
artica
|
98f4bfbcc1
|
Auto-updated build strings.
|
2021-11-24 01:00:10 +01:00 |
|
Daniel Barbero Martin
|
e0fec6470d
|
minor fix
|
2021-11-23 18:04:34 +01:00 |
|
alejandro.campos@artica.es
|
08ad73e34e
|
minor fix
|
2021-11-23 16:29:25 +01:00 |
|
Daniel Barbero Martin
|
aae0016191
|
fix chart area
|
2021-11-23 13:14:56 +01:00 |
|
Jose Gonzalez
|
67f893f4ee
|
Fixed issue
|
2021-11-23 12:50:12 +01:00 |
|