709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
5b3fd5dd79
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:41 +02:00
eb98f695f9
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:34 +02:00
6963ce894b
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-10-22 13:26:15 +02:00
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
0cf3e01f74
Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop'
...
Ent 1880 umbrales inversos en negativo
See merge request artica/pandorafms!2818
2019-10-22 12:56:21 +02:00
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
547607c21e
Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop'
...
Ent 4794 permiso manage users no funciona
See merge request artica/pandorafms!2804
2019-10-21 10:48:36 +02:00
e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
adf3b08537
Add text (inv) in the help of the thresholds for inverse intervals - #1880
2019-10-17 11:50:50 +02:00
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
039d854441
Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop'
...
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos
See merge request artica/pandorafms!2800
2019-10-16 14:16:13 +02:00
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
8407d7fe9a
Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop'
...
Added current gis location to agent gis view list
See merge request artica/pandorafms!2772
2019-10-14 15:57:27 +02:00
a1c4b3eaeb
Fixed minor bug
2019-10-14 13:38:10 +02:00
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
8c556d7d19
Changed permissions for management users - #4794
2019-10-11 11:47:38 +02:00
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
2eca6c7df3
Merge branch 'ent-4717-nombre-de-extensiones-erroneo-en-menu-php' into 'develop'
...
Deleted unnecessary "if" statement
See merge request artica/pandorafms!2759
2019-10-08 15:32:55 +02:00
0b14cb64b6
Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop'
...
Fixed module update bug
See merge request artica/pandorafms!2769
2019-10-08 14:30:49 +02:00
941362776e
Fixed keepcounters ckbox bug
2019-10-08 14:06:30 +02:00
13b3099553
Merge branch 'ent-4775-Error-masivas-de-agente-sin-cambios' into 'develop'
...
added condition in agent massive edition
See merge request artica/pandorafms!2791
2019-10-08 13:11:55 +02:00
646f2607ab
added condition in agent massive edition
2019-10-07 19:02:19 +02:00
375fac7f3d
Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop'
...
Fixed modules_get_relations
See merge request artica/pandorafms!2751
2019-10-07 14:01:24 +02:00
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
658d71568a
Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop'
...
the itil type is removed in the report types
See merge request artica/pandorafms!2757
2019-10-04 13:55:54 +02:00
6802b32d93
Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop'
...
Fixed visual bug in item names from report template
See merge request artica/pandorafms!2707
2019-10-03 17:35:03 +02:00
ec86380ee7
changed hint from home screen edit user
2019-10-03 14:27:10 +02:00
a40592b041
Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
...
Fixed bug in list graphs view
See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
1eb0b27da3
Fixed module update bug
2019-09-27 16:09:11 +02:00
5e0b7fc2b7
fixed integria logo redirection in integria setup
2019-09-27 09:07:09 +02:00
2ec562fcc0
changed help in setup integria
2019-09-26 13:36:14 +02:00
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
ad01cd0303
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-26 09:48:13 +02:00
91f90d07d6
minor fixes in integria integration
2019-09-26 09:44:58 +02:00
63f4f894eb
Deleted unnecessary "if" statement
2019-09-26 09:41:08 +02:00
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
e363b17476
When an item is updated, it is redirected to the item lists
2019-09-25 10:51:02 +02:00
84ae4a8391
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
a5ea095734
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
2019-09-24 15:16:22 +02:00
7d52614064
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
2019-09-24 11:25:53 +02:00
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
4e47aede4c
Fixed modules_get_relations
2019-09-23 16:55:43 +02:00
f73cd80336
minor changes in integria integration
2019-09-23 15:16:31 +02:00
9153330832
minor changes in integria integration
2019-09-23 14:47:08 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
409ac061e0
Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
...
Ent 4047 simplificacion de la configuracion del sistema de email
See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
37fd876a22
Fixed bug
2019-09-19 10:31:54 +02:00
fbsanchez
Marcos Alconada
Daniel Rodriguez
Tatiana Llorente
Alejandro Fraguas
Luis Calvo
Jose Gonzalez
alejandro-campos
Kike
Daniel Maya