ccf971c2eb
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:18:19 +01:00
b54ece2b70
Add menu omnishell
2019-10-28 10:46:25 +01:00
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
de22fb70e3
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-23 19:51:49 +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
b35c9dd96d
ajust changes
2019-10-22 16:42:13 +02:00
33d26144f1
Fixed planned downtime acl
2019-10-22 16:00:01 +02:00
bbeb750e46
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
...
Conflicts:
pandora_console/include/functions_graph.php
2019-10-22 15:51:38 +02:00
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +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
ca49cefb0d
fixed
2019-10-22 12:19:25 +02:00
ee97ed8a5e
segunda ronda
2019-10-21 18:36:02 +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
353246f9f6
first changed to welcome window
2019-10-18 10:30:19 +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
a31e66a9bd
add feedback
2019-10-15 12:16:50 +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
66bad65550
refactoriced diagnostics pandoraFMS
2019-10-11 14:55:20 +02:00
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
4c6d924495
Review remote execution modules
2019-10-11 12:50:29 +02:00
8c556d7d19
Changed permissions for management users - #4794
2019-10-11 11:47:38 +02:00
4fedfe92fc
fix is enterprise
2019-10-11 09:39:20 +02:00
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
7eb4d3c51c
add CMD command a network components
2019-10-10 11:55:32 +02:00
40076b0a55
remove debug
2019-10-09 17:33:06 +02:00
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +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
380ce879ef
Added io_safe_output to custom graphs name - #4664
2019-10-02 10:59:40 +02:00
5de2b8f069
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-30 08:09:08 +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
cf0ad42e2a
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-27 08:20:29 +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
df7f4553c0
fixed visual error
2019-09-25 17:52:06 +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
cd5fd4782c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/visual-console-client/vc.main.css
2019-09-24 13:20:25 +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
1177cce25f
added attached files section to incident edition
2019-09-19 10:24:43 +02:00
0c59c89d8f
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-19 09:35:52 +02:00
4adf584827
Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
...
Changed caption Expires
See merge request artica/pandorafms!2736
2019-09-18 16:49:55 +02:00
c81cb1d222
Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop'
...
Ent 3878 report type summation not working properly
See merge request artica/pandorafms!2599
2019-09-18 14:41:35 +02:00
73a341912f
Changed caption Expires
2019-09-18 13:35:11 +02:00
f2a6dbb60e
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
2019-09-17 14:56:54 +02:00
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
027f9fd9d4
New view - List of Integria IMS tickets - #4642
2019-09-17 12:59:29 +02:00
66a97f2f66
Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2669
2019-09-17 11:36:07 +02:00
0b8ff69a36
Fixed modules first load on edit agent/module item report
2019-09-16 12:57:37 +02:00
a04268b33c
Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly
2019-09-16 11:02:18 +02:00
daa70f84db
Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.item_editor.php
2019-09-16 10:09:52 +02:00
ca6fe42298
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
2019-09-13 12:00:04 +02:00
2218ad7d60
Added email check functionality
2019-09-12 15:37:16 +02:00
482037b378
Fixed file.png in plugin
2019-09-12 15:28:32 +02:00
33296f448c
Hidden field module in edit agent view - #4620
2019-09-12 10:29:14 +02:00
3eadb07058
Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop'
...
Fixed bug in custom unit #4166
See merge request artica/pandorafms!2675
2019-09-11 16:47:40 +02:00
4722d4a08b
changed setup option text
2019-09-10 11:38:02 +02:00
93b9c76f58
Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email
2019-09-10 10:50:53 +02:00
c2e47e0ffa
Revert "ddded comment"
...
This reverts commit 4ec832f523
2019-09-10 10:06:33 +02:00
4ec832f523
ddded comment
2019-09-10 10:03:30 +02:00
90c94e74d9
Fixed bug in list graphs view
2019-09-09 21:02:53 +02:00
d02f3621f3
Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop'
...
Removed autofill proxi in auth server
See merge request artica/pandorafms!2361
2019-09-05 18:29:43 +02:00
9e4b5ca5c8
Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font
2019-09-05 12:03:37 +02:00
c12d672109
Add visual condition for JA and CH Lenguage
2019-09-05 12:01:25 +02:00
e4d014923b
Fixed visual bug in item names from report template
2019-09-05 10:44:18 +02:00
2f0a19ae6e
Merge branch 'ent-4446-Bug-Creacion-filtro-SNMP' into 'develop'
...
Fixed bug create snmp filter - #4446
See merge request artica/pandorafms!2638
2019-09-03 17:07:27 +02:00
b3b0f082d7
Merge branch 'ent-4484-Acceso-update-manager-offline-en-open' into 'develop'
...
Don't allow access to update manager offline in community edition - #4484
See merge request artica/pandorafms!2648
2019-09-03 13:37:02 +02:00
81511d1ac4
Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop'
...
Fixed empty http_auth_user and pass
See merge request artica/pandorafms!2656
2019-09-03 12:09:04 +02:00
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
20cc562911
Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop'
...
Fixed bug in report deletions
See merge request artica/pandorafms!2362
2019-09-02 13:18:20 +02:00
c47b24d84c
Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop'
...
Fixed bug permissions on filter events- 4278
See merge request artica/pandorafms!2671
2019-08-30 16:07:45 +02:00
aa383e3f56
Merge branch 'ent-4513-bugs-en-password-policy' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2678
2019-08-30 14:35:57 +02:00
ab5ad9a459
Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop'
...
fixed error
See merge request artica/pandorafms!2665
2019-08-30 14:12:42 +02:00
85b7ee034f
Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop'
...
Changed input for textarea in command field - #4524
See merge request artica/pandorafms!2676
2019-08-30 14:12:21 +02:00
f292780aa2
Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop'
...
Added item type text to list of items- #4377
See merge request artica/pandorafms!2652
2019-08-30 14:11:18 +02:00
cbfb8b1e89
Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop'
...
Show alias instead of name - #4389
See merge request artica/pandorafms!2651
2019-08-30 14:10:52 +02:00
a9a2ca5178
Change label for disabled status - #4573
2019-08-30 11:58:50 +02:00
d650ff6959
fixed error
2019-08-30 11:28:24 +02:00
94e377c3c3
Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module
...
Conflicts:
pandora_console/godmode/agentes/configurar_agente.php
2019-08-30 09:46:27 +02:00
ce4f4f003d
Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-08-30 09:30:11 +02:00
8fd1f3c99e
Added compact mode to show timestamp - #4233
2019-08-29 10:07:50 +02:00
d38f1f8aec
Fixed bug in unit in massive operations - #4166
2019-08-27 12:21:00 +02:00
4bdcab108f
ajuste visual en tabla user management
2019-08-27 10:32:48 +02:00
2dc084da8a
Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url
2019-08-27 09:11:45 +02:00
efd6a72bb8
Merge remote-tracking branch 'origin/develop' into ent-4513-bugs-en-password-policy
2019-08-26 08:09:14 +02:00
8d8e08d37b
fixed visual error
2019-08-22 15:25:35 +02:00
e8a873de7c
Changed input for textarea in command field - #4524
2019-08-22 11:22:40 +02:00
1e5b6a8416
Merge branch 'ent-4507-bug-visual-en-version-open' into 'develop'
...
fixed visual error in Open
See merge request artica/pandorafms!2670
2019-08-22 08:43:44 +02:00
b444be87b4
Fixed bug in custom unit #4166
2019-08-21 14:46:58 +02:00
d515e510f3
Fixed bug in custom unit #4166
2019-08-21 13:38:53 +02:00
a8c351d177
Custom fields type hint BBCode updated
2019-08-21 09:55:53 +02:00
ff44666e41
fixed visual error2
2019-08-21 09:49:17 +02:00
ee1eed93b4
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-08-21 07:58:08 +02:00
32a3776260
Fixed bug permissions on filter events- 4278
2019-08-20 13:46:13 +02:00
38547052fb
Fixed bug permissions on filter events- 4278
2019-08-20 13:42:04 +02:00
a77a72cea5
fixed visual error on Open
2019-08-20 13:07:47 +02:00
d46e013567
fixed visual error!
...
ç2
2019-08-19 14:29:04 +02:00
44eb8dd3d1
fixed visual error
2019-08-19 12:31:47 +02:00
e83f001948
fixed error
2019-08-16 13:47:06 +02:00
747e06c8b0
Added margin - #4300
2019-08-12 12:54:06 +02:00
db349a4783
Fixed empty http_auth_user and pass
2019-08-12 12:26:00 +02:00
b893d55a49
Added item type text to list of items- #4377
2019-08-09 12:09:49 +02:00
8bfde74a06
Show alias instead of name - #4389
2019-08-09 11:06:17 +02:00
97353bbfed
backup changes
2019-08-08 13:36:12 +02:00
77f57ae87f
Don't allow access to update manager offline in community edition - #4484
2019-08-08 09:23:23 +02:00
b7009657f5
fixed visual ID agent error
2019-08-07 10:32:00 +02:00
c32c15ed94
Fixed bug create snmp filter - #4446
2019-08-07 09:35:08 +02:00
9cfa8be1e9
font size for jap and chinese adjusted agents
2019-08-06 14:35:15 +02:00
9b8e3c540c
created integria integration setup
2019-08-05 13:42:01 +02:00
6ac21acd39
wip agent deployment scan
2019-07-25 18:35:51 +02:00
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
9b57ab8c13
Review minor
2019-07-17 17:17:54 +02:00
6b6d852ceb
Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server
...
Conflicts:
pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
2019-07-17 15:06:38 +02:00
c97074ea74
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
...
fixed macros reports
See merge request artica/pandorafms!2595
2019-07-17 13:49:38 +02:00
657515d79c
Merge branch 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' into 'develop'
...
Added selector for all or common modules- #2140
See merge request artica/pandorafms!2540
2019-07-17 13:14:39 +02:00
7f4701f22e
exec server error wizard
2019-07-17 11:11:38 +02:00
f0bfe6910d
WIP agent deployment
2019-07-16 20:56:47 +02:00
4dc5ee2fca
Merge branch 'ent-4318-Añadir-buscador-en-operaciones-masivas-vol2' into 'develop'
...
Added filter by agent - #4318
See merge request artica/pandorafms!2588
2019-07-16 14:05:39 +02:00
0fbe7e0128
Merge branch 'develop' into 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard'
...
Conflicts:
pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
2019-07-16 11:57:36 +02:00
ab7743b578
Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop'
...
Changed disabled to readonly in agent name and id- #4307
See merge request artica/pandorafms!2578
2019-07-16 11:52:12 +02:00
e69024f4e2
Merge branch 'ent-4267-edicion-text-informes' into 'develop'
...
Solved wrong variable rewriting
See merge request artica/pandorafms!2553
2019-07-16 10:10:53 +02:00
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
8c55c1b287
Merge branch 'ent-4094-Error-al-cambiar-intervalo-de-agentes-por-masivas' into 'develop'
...
fixed bug: agent interval not being changed in agent config when changing its…
See merge request artica/pandorafms!2601
2019-07-15 16:56:41 +02:00
81c4bd1a76
Merge branch 'ent-3333-etiquetas-a-los-items-en-el-builder-de-consolas-visuales' into 'develop'
...
Ent 3333 etiquetas a los items en el builder de consolas visuales
See merge request artica/pandorafms!2344
2019-07-15 14:12:16 +02:00
5f3684fb4e
Merge branch 'ent-3786-evitar-cambio-tipo-modulo-politicas' into 'develop'
...
Modified control for module edition
See merge request artica/pandorafms!2563
2019-07-15 14:09:32 +02:00
6765544b66
Merge branch 'ent-3382-comprobacion-de-grupos-secundarios-y-primarios-al-creareditar-un-agente' into 'develop'
...
Added advice when a primary group will be selected when is currentl a secondary group
See merge request artica/pandorafms!2353
2019-07-15 13:59:29 +02:00
9ea7ac0859
Merge branch 'ent-4080-nombre-agente-lista-modulos' into 'develop'
...
Modified agent alias name
See merge request artica/pandorafms!2556
2019-07-15 13:02:37 +02:00
ab308b7d10
Merge branch 'ent-4167-cambio-recon-task-listado-servidores' into 'develop'
...
Changed link to Discovery task list and added ui_get_full_url function over other links
See merge request artica/pandorafms!2555
2019-07-15 12:36:52 +02:00
ef9502a552
Fixed errors on sum report uncompressed checkbox
2019-07-15 11:56:57 +02:00
95254341ce
add condition to check if agent interval token should be updated in massive operations based on previous result
2019-07-15 11:53:25 +02:00
eb831dbbcd
fixed bug: agent interval not being changed in agent config when changing its value through massive operations
2019-07-15 11:46:35 +02:00
2f110b8e2e
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
2019-07-15 11:37:02 +02:00
9fb32c4699
Deployment area single targets
2019-07-12 18:29:58 +02:00
bfc267691b
Merge branch 'ent-3105-comportamiento-public_url' into 'develop'
...
Ent 3105 comportamiento public url
See merge request artica/pandorafms!2568
2019-07-12 13:02:42 +02:00
a1e2693d4b
Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly
2019-07-12 11:33:27 +02:00
41d8afaeea
added summation report uncompressed module cehckbox
2019-07-12 11:32:56 +02:00
24cbe3bd8e
Merge branch 'ent-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop'
...
Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles
See merge request artica/pandorafms!2598
2019-07-12 10:26:05 +02:00
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
c386a29b80
Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url
2019-07-12 09:38:28 +02:00
1e05f9a396
WIP agent deployment
2019-07-11 19:25:49 +02:00
99a219aa64
Merge branch 'ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into 'develop'
...
Ent 3545 8250 7558 7882 monitorizar servicios de azure
See merge request artica/pandorafms!2591
2019-07-11 18:28:34 +02:00
5fd7b87a06
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-11 18:27:49 +02:00
f701bcb44e
Fixed several minor visual bugs - #4347
2019-07-11 17:00:50 +02:00
cdf7c84b81
Merge branch 'ent-4302-Opcion_para_deshabilitar_aviso_de_suscripcion_a_newsletter' into 'develop'
...
new tocken user edit newslatter info
See merge request artica/pandorafms!2589
2019-07-11 15:36:56 +02:00
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
7c8cb75faf
WIP discovery agent deployment
2019-07-11 13:25:29 +02:00
518443ea4e
Improved menus
2019-07-11 12:32:48 +02:00
9548cd4028
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-11 11:14:34 +02:00
f0c539cfcf
Merge branch 'ent-4203-Meter-submenus-de-discovery' into 'develop'
...
Added discovery submenus to main menu - #4203
See merge request artica/pandorafms!2571
2019-07-11 11:14:24 +02:00
47cc0d9d6e
WIP: Agent deployment center
2019-07-10 23:59:09 +02:00
58465090b2
Merge remote-tracking branch 'remotes/origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-10 22:05:02 +02:00
ed0688f853
fixed macros reports
2019-07-10 18:20:43 +02:00
3b23810323
Added filter by agent in massive copy - #4318
2019-07-10 16:37:24 +02:00
96fbca35a4
Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
...
Created black theme - #4194
See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
f864573486
Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop'
...
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias
See merge request artica/pandorafms!2577
2019-07-10 09:33:41 +02:00
cab4a6dc03
Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure
2019-07-09 17:28:14 +02:00
eaf29b798a
Fixed minor visual bugs in black theme- #4194
2019-07-09 15:03:38 +02:00
ab3cfd4cc9
new tocken user edit newslatter info
2019-07-09 14:08:06 +02:00
0cabc4d4da
Azure discovery task form completed
2019-07-09 12:02:29 +02:00
7fa79f2043
Merge branch 'ent-4227-Componentes_de_red_no_funcionan_bien' into 'develop'
...
fixed error network component plugin
See merge request artica/pandorafms!2581
2019-07-09 10:27:08 +02:00
972e7447ea
Merge branch 'ent-4195-Status-sets-Visual' into 'develop'
...
Changed default images status set for css - #4195
See merge request artica/pandorafms!2530
2019-07-09 10:01:09 +02:00
297bd7c107
Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure
2019-07-09 09:53:04 +02:00
0f280494a0
Changed images for divs to show preview in visual styles - #4195
2019-07-09 09:33:49 +02:00
127f67f2ac
fixed error in network component
2019-07-08 19:33:54 +02:00
6d6c8fe197
Added filter by agent - #4318
2019-07-08 17:57:23 +02:00
aafba795ee
Update visual console
2019-07-08 17:51:01 +02:00
6e7dfb38fd
fixed error network component plugin
2019-07-05 13:46:48 +02:00
7175d716f0
fixed translate
2019-07-05 10:32:10 +02:00
d269f3b69c
Merge branch 'ent-3714-Eliminar-opciones-template-y-wizard-en-la-visual-console-open' into 'develop'
...
Hidden buttons template and wizard in the open visual console
See merge request artica/pandorafms!2264
2019-07-04 17:10:05 +02:00
de6a0c2192
Changed disabled to readonly in agent name and id- #4307
2019-07-04 16:20:01 +02:00
22734a4ea2
WIP failover
2019-07-03 17:51:47 +02:00
04cd368410
Merge branch 'ent-4152-excec-satellite-serever-warn-remote-conf-needed' into 'develop'
...
Added satellite remote conficg check in snmp wizard
See merge request artica/pandorafms!2539
2019-07-03 16:54:39 +02:00
18d8f90f90
Credential store upgrade Azure
2019-07-03 16:04:40 +02:00
c7e410b16d
Added discovery submenus to main menu - #4203
2019-07-03 11:08:17 +02:00
ffbaac6edc
Merge branch 'develop' into 'ent-3742-Perdida-de-recursion-en-paginacion-inferior'
...
# Conflicts:
# pandora_console/godmode/agentes/modificar_agente.php
2019-07-02 18:22:49 +02:00
86610ebe96
Merge branch 'ent-4294-7984-Desplegable-de-grupos-desordenados' into 'develop'
...
Fixed unordered groups
See merge request artica/pandorafms!2559
2019-07-02 16:06:33 +02:00
eb01e9baaf
public_url with force option
2019-07-02 14:17:53 +02:00
209681e4c2
ADD failover option availability_graph
2019-07-02 11:50:58 +02:00
3a76f331c8
Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'
...
Add module filter by text -#2094
See merge request artica/pandorafms!2520
2019-07-02 11:37:01 +02:00
0064bc0cba
fixed errors
2019-07-01 17:07:39 +02:00
52025efbee
Modified control for module edition
2019-07-01 13:55:44 +02:00
eb94438c7f
Merge branch 'ent-3541-7513-nuevo-modificar-informe-de-eventos-por-grupo' into 'develop'
...
Show new filters for group events reports
See merge request artica/pandorafms!2534
2019-07-01 12:38:48 +02:00
1ee2e94766
Merge branch 'ent-3748-component-group-creation-not-working-after-delete-component' into 'develop'
...
Fixed create from bug: added action with refresh url
See merge request artica/pandorafms!2284
2019-07-01 10:19:44 +02:00
39ac83ae5e
Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop'
...
Style changes - #4250
See merge request artica/pandorafms!2557
2019-07-01 10:02:02 +02:00
47838a1134
Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
...
Ent 4213 snmp walk dede modulo creado no muestra parametros v3
See merge request artica/pandorafms!2511
2019-07-01 09:48:33 +02:00
63e0df4434
Fixed unordered groups
2019-06-28 12:11:25 +02:00
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
03edb75b7c
Modified agent alias name
2019-06-27 17:19:48 +02:00
411e62fb0d
Changed link to Discovery task list and added ui_get_full_url function over other links
2019-06-27 16:38:00 +02:00
a2877b46f3
Solved wrong variable rewriting
2019-06-27 14:58:57 +02:00
470e399f50
Fixed url edit task in RDS
2019-06-26 19:34:34 +02:00
321ea717af
Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
...
Changed js
See merge request artica/pandorafms!2544
2019-06-26 13:02:50 +02:00
c223e0bdad
Changed js
2019-06-26 12:50:19 +02:00
006e0cd4ec
Changed js
2019-06-26 12:31:47 +02:00
d68617eda1
Merge branch 'ent-4265-array-en-valor-min' into 'develop'
...
Changed variable that modify min values
See merge request artica/pandorafms!2538
2019-06-26 12:04:41 +02:00
0ea5b7ff1b
Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop'
...
Removed option to show qr code in header - #4196
See merge request artica/pandorafms!2494
2019-06-26 12:04:00 +02:00
6976ba9c8e
Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop'
...
Ent 3800 mal enrutamiento discovery
See merge request artica/pandorafms!2350
2019-06-26 12:02:43 +02:00
7224974520
Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop'
...
first steps credential store
See merge request artica/pandorafms!2523
2019-06-26 11:21:49 +02:00
f66e5b5ef8
Fix class names to avoid addblock hide them
2019-06-26 11:11:21 +02:00
4754e20784
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
2019-06-26 09:52:22 +02:00
61e07abf3a
Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop'
...
Ent 4238 eventos csv e historico
See merge request artica/pandorafms!2515
2019-06-25 18:33:49 +02:00
e1bf12a1fb
Credential store
2019-06-25 18:21:23 +02:00
22d936d4f3
credential store some js controls
2019-06-25 16:43:38 +02:00
04d3f315b0
Added selector for all or common modules- #2140
2019-06-25 15:19:40 +02:00
f69fea81c2
Added satellite remote conficg check in snmp wizard
2019-06-25 14:28:33 +02:00
63eca254f6
Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop'
...
changed title plugin creation to plugin registration
See merge request artica/pandorafms!2358
2019-06-25 14:25:34 +02:00
1966c81f2d
Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico
2019-06-25 14:10:32 +02:00
afd72eff42
Changed variable that modify min values
2019-06-25 13:37:44 +02:00
2ab7e26d07
Merge branch 'ent-3821-Option-servers-operator-read' into 'develop'
...
Deleted Servers menu option for operator(read)
See merge request artica/pandorafms!2328
2019-06-25 13:09:23 +02:00
c5be8e55ae
Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
...
Ent 3807 html special chars conversion
See merge request artica/pandorafms!2320
2019-06-25 12:19:01 +02:00
569bfa2329
Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop'
...
Pending Q&A
See merge request artica/pandorafms!2262
2019-06-25 12:06:07 +02:00
2a95fbb87a
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
2019-06-24 19:58:33 +02:00
c1ac6b7ed6
mini_severity virtual column added
2019-06-24 19:23:41 +02:00
280459dc1a
Show new filters for group events reports
2019-06-24 17:28:46 +02:00
ce1231eae6
Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop'
...
Added option in massive delete alerts to show alerts on disabled modules
See merge request artica/pandorafms!2396
2019-06-24 09:55:44 +02:00
38f72bed8d
AWS multi account
2019-06-22 13:11:35 +02:00
c11cd556ce
WIP: AWS CS controller
2019-06-22 01:10:05 +02:00
5658b98f0b
intuitive credential store
2019-06-21 23:51:22 +02:00
e9ef9b64a3
credential_store
2019-06-21 19:34:47 +02:00
6682bad19f
first steps credential store
2019-06-21 12:03:25 +02:00
9fa9a346ca
Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico
2019-06-20 19:23:39 +02:00
8671c7c88c
events qa adjustments
2019-06-20 19:23:13 +02:00
265202f1ed
Merge branch 'ent-4136-button-styles' into 'develop'
...
Review 1
See merge request artica/pandorafms!2470
2019-06-20 16:35:12 +02:00
4660ca286f
Merge branch 'ent-4225-No-se-pueden-crear-componentes-de-red-en-la-meta' into 'develop'
...
Ent 4225 no se pueden crear componentes de red en la meta
See merge request artica/pandorafms!2516
2019-06-20 11:41:21 +02:00
c084adfa27
Add module filter by text -#2094
2019-06-20 09:31:36 +02:00
988eb2e257
Add module filter by text -#2094
2019-06-19 17:36:55 +02:00
45d544ca5d
remove typo error in commit
2019-06-19 15:14:41 +02:00
5503abc8e1
fix bug in metaconsoles network component creation
2019-06-19 15:12:17 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
d290b91b28
RC1 event viewer v2
2019-06-18 16:07:53 +02:00
10b337f713
Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop'
...
Add javascript for insert name to reports
See merge request artica/pandorafms!2424
2019-06-18 13:53:52 +02:00
c68f2ada94
Merge branch 'ent-4085-no-se-muestra-lista-de-modulos-con-licencia-invalida' into 'develop'
...
Fixed module_manager with Agent limit surpassed or license expired
See merge request artica/pandorafms!2475
2019-06-18 13:02:43 +02:00
8f2feac676
Added DESTDIR in license.php
2019-06-18 11:35:59 +02:00
9bdf048fae
Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers
2019-06-17 16:39:27 +02:00
2401ac5c6e
Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop'
...
Change module type ifOperStatus on Interface Wizard
See merge request artica/pandorafms!2473
2019-06-17 16:34:14 +02:00
132076198d
minor fixes and event ACL - groups
2019-06-14 13:20:34 +02:00
4362bf3131
Merge branch 'ent-3429-event-report-options-saving' into 'develop'
...
Added missing options parameters
See merge request artica/pandorafms!2173
2019-06-14 13:19:43 +02:00
5c7b45173b
Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop'
...
fix bug in item edition in metaconsole
See merge request artica/pandorafms!2500
2019-06-14 13:05:27 +02:00
8554baef20
fix bug in item edition in metaconsole
2019-06-13 11:11:39 +02:00
af62bb1ae3
Fixed visual bug in discovery vmware - #4199
2019-06-12 16:47:53 +02:00
7d54a37e13
Fixed visual bug in discovery vmware - #4199
2019-06-12 16:44:09 +02:00
f399023d46
Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
...
Solucionado pantalla en blanco
See merge request artica/pandorafms!2269
2019-06-12 14:25:58 +02:00
b930588f84
Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
...
Ent 3892 bug en bulk operations de plugins
See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
1305e267de
Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop'
...
Remove autocomplete user and password in the form to create wmi modules - #3437
See merge request artica/pandorafms!2485
2019-06-12 13:03:56 +02:00
c1d1c23a4f
Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph
2019-06-12 12:37:52 +02:00
608f079ca0
now you need put an agent or visual console, else you cant create or update a Static Grap
2019-06-12 12:36:56 +02:00
fdce139f84
Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop'
...
fix bug when adding connection maps in gis map builder
See merge request artica/pandorafms!2490
2019-06-11 18:01:54 +02:00
e4139874dd
Removed option to show qr code in header - #4196
2019-06-11 18:00:41 +02:00
cc9a7553bc
Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-06-11 16:18:29 +02:00
577ddef8b3
fix bug when adding connection maps in gis map builder
2019-06-10 17:04:36 +02:00
ef3d299d58
wip event view
2019-06-10 15:18:35 +02:00
89ff40e2b9
moved mail server setup to general setup
2019-06-10 09:43:27 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
4f9f9e65c2
Remove autocomplete user and password in the form to create wmi modules - #3437
2019-06-06 16:51:11 +02:00
c6d1bb6533
Fixed fields not saving in event reports
2019-06-06 10:33:46 +02:00
3475684cdc
Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving
2019-06-05 09:36:57 +02:00
a1be1e7332
styles review
2019-06-04 22:16:58 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
c741020538
styles review
2019-06-04 13:57:55 +02:00
974db824a8
style review
2019-06-03 19:13:29 +02:00
efd7abfc66
Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop'
...
ticket resolved
See merge request artica/pandorafms!2207
2019-06-03 18:16:32 +02:00
31257c02a4
style review
2019-06-03 14:50:22 +02:00
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
ddf3b7a258
Review 1
2019-06-03 11:21:44 +02:00
9de5dadbf2
style review
2019-06-03 11:16:51 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
1aa6d8c298
Change module type ifOperStatus on Interface Wizard
2019-05-31 10:39:48 +02:00
69054571ab
Style review
2019-05-31 09:50:59 +02:00
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
16d34bf584
Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
...
ticket resolved, duplicated sentece
See merge request artica/pandorafms!2239
2019-05-30 15:33:27 +02:00
94153b823f
Help links
2019-05-30 11:25:09 +02:00
30320b7897
Fixed login button style and removed help icons from agent_management
2019-05-30 11:12:37 +02:00
bc279e99b0
Merge branch 'fix/styles' into 'develop'
...
Fix/styles
See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
f16f35ad10
Changes styles
2019-05-29 17:49:09 +02:00
3c730fbedf
BC updated
2019-05-29 17:10:21 +02:00
47c9220cbb
clippy positions and control overflow
2019-05-29 17:02:01 +02:00
8c0bfd72a8
avoid icon overlap report view lsit
2019-05-29 16:52:38 +02:00
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
2e3338b595
Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
...
Ent 3961 añadir caché para los elementos de la consola visual
See merge request artica/pandorafms!2443
2019-05-29 15:48:45 +02:00
4a42756ec6
group_management styles profiles
2019-05-29 15:44:51 +02:00
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
487ff53825
Min. fields lenght headers
2019-05-29 12:09:45 +02:00
ee7cd68d39
Merge branch 'ent-1668-update-manager' into 'develop'
...
UM register, UM newsletter flow improved
See merge request artica/pandorafms!2463
2019-05-29 11:55:34 +02:00
c8649a8dc4
Styles
2019-05-29 11:21:57 +02:00
552467286c
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
c0763b86d2
Merge branch 'ent-3924-eHorus-settings' into 'develop'
...
Ent 3924 e horus settings
See merge request artica/pandorafms!2417
2019-05-29 10:51:59 +02:00
32424ddae1
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 10:50:38 +02:00
5e3ca1664f
UM unregister restriction, only admins
2019-05-29 10:37:02 +02:00
4a60dbe415
Unregistration form
2019-05-29 10:27:28 +02:00
28555e09de
Unregistration form
2019-05-29 10:26:53 +02:00
9096444f8f
Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop'
...
Do not add disabled modules to the execution queue.
See merge request artica/pandorafms!2456
2019-05-29 09:53:38 +02:00
c35cb56699
fixed errors
2019-05-29 08:50:46 +02:00
f5d5cbf5b8
VC item cache improvements.
...
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
2019-05-28 18:34:07 +02:00
6fdd88ab65
Fixed errors on eHorus user level conf
2019-05-28 17:19:13 +02:00
3b943ae902
fixed errors disabled/enabled module from list agents because not write in conf
2019-05-28 17:11:14 +02:00
348f0c2a65
agent view styling
2019-05-28 13:27:17 +02:00
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
9a12b34847
Updates styling
2019-05-28 12:13:29 +02:00
92ca217800
minor fixes in style view tasklist
2019-05-28 10:57:36 +02:00
e338d5ba95
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-27 22:40:11 +02:00
f1499082fa
agent view rebuilt
2019-05-27 21:30:46 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
3736d84589
Edit ehorus user
2019-05-27 18:49:47 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
f0fb6d7fd9
wip styles
2019-05-27 18:03:56 +02:00
61d3720787
Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop'
...
Removed empty help icons in modules
See merge request artica/pandorafms!2454
2019-05-27 17:53:06 +02:00
513a74d120
Removed empty help icons in local components
2019-05-27 17:13:25 +02:00
556c07ad99
Minor changes in configurar_agente
2019-05-27 17:12:35 +02:00
0280547465
some changes
2019-05-27 15:41:23 +02:00
bc64589046
fixed error create modules
2019-05-27 15:27:46 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
7347324601
Minor fixes - discovery styles
2019-05-27 13:19:08 +02:00
ce8ba54e09
Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual
2019-05-27 11:31:24 +02:00
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
0ee2ed6f5e
Removed empty help icons in modules
2019-05-24 12:59:25 +02:00
0319e4d4e6
Removed empty help icons
2019-05-24 11:11:30 +02:00
f5586d7b70
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
...
fixed label reports and more fixed
See merge request artica/pandorafms!2413
2019-05-24 10:47:15 +02:00
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
51f846af05
Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
...
Fixed visual bug in policies operations actions
See merge request artica/pandorafms!2369
2019-05-23 17:24:59 +02:00
7c236149b0
Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop'
...
Fixed bug in items reports deleted
See merge request artica/pandorafms!2208
2019-05-23 17:18:00 +02:00
7097481cca
Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop'
...
fixed bug in macros of plugin modules
See merge request artica/pandorafms!2442
2019-05-23 17:08:34 +02:00
1529a04507
Merge branch 'ent-1668-update-manager' into 'develop'
...
fixed: um url relative
See merge request artica/pandorafms!2444
2019-05-23 11:33:46 +02:00
0ee42fbafe
fixed: um url relative
2019-05-23 11:23:42 +02:00
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
dd8af874fa
Merge branch 'ent-1668-update-manager' into 'develop'
...
license forms sync MC-N
See merge request artica/pandorafms!2441
2019-05-23 10:36:43 +02:00
7b5ae40868
multiple fixes
2019-05-23 10:27:50 +02:00
0728c73844
fixed bug in macros of plugin modules
2019-05-22 19:14:01 +02:00
2cfe4378c2
license forms sync MC-N
2019-05-22 18:50:51 +02:00
dfb7067db2
Merge branch 'ent-1668-update-manager' into 'develop'
...
minor fix MC environments
See merge request artica/pandorafms!2439
2019-05-22 16:54:33 +02:00
86cb526893
minor fix MC environments
2019-05-22 15:40:17 +02:00
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
f6171de522
Merge branch 'ent-3468-Ayudas_online' into 'develop'
...
helpers
See merge request artica/pandorafms!2381
2019-05-21 17:28:27 +02:00
ce359bfaf6
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
...
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
2019-05-21 12:11:53 +02:00
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
0046e209fe
lint changes
2019-05-17 14:46:19 +02:00
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
833c2d91a7
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop'
...
Fixed error window in visual console
See merge request artica/pandorafms!2426
2019-05-17 11:27:57 +02:00
0cd60d0431
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
2019-05-16 18:11:33 +02:00
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
c40e0ec702
pandora_console/extras/delete_files/delete_files.txt
...
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
0f35923073
Recovered event criticity field from event alert
...
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
2019-05-16 13:23:47 +02:00
3cdbfd3646
minor fix in php requirements
...
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
2019-05-16 12:50:16 +02:00
0173c856af
Merge branch 'ent-4036-8031-no-funcionan-las-custom-graph-cuando-el-idioma-es-frances' into 'develop'
...
Changed simple quote in alerts
See merge request artica/pandorafms!2419
Former-commit-id: 9cab37f3ab87dd3c056f2750a1be9e5204f73e51
2019-05-16 12:17:22 +02:00
8f2dce439b
Add javascript for insert name to reports
...
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
2019-05-16 12:13:58 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
be20163073
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2421
Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
2019-05-14 17:38:55 +02:00
ff8abf9b40
updated function for show and hide ehorus form
...
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
2019-05-14 15:34:22 +02:00
6e35f6aec7
UM updates and fixes
...
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
2019-05-14 13:41:21 +02:00
79701bba60
Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
2019-05-14 12:34:40 +02:00
ae11ea18c9
Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas
...
Conflicts:
pandora_console/include/functions_graph.php
Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
2019-05-14 12:27:02 +02:00
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
421e6b559d
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
2019-05-14 11:46:39 +02:00
b508e40a73
Changed simple quote in alerts
...
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
4497554b37
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
2019-05-14 10:40:49 +02:00
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
9347fc17aa
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
2019-05-13 17:10:06 +02:00
a38ef3e729
Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop'
...
Added condition type not normal in alert templates
See merge request artica/pandorafms!2376
Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
2019-05-13 16:51:34 +02:00
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
2f2385c9cb
Merge remote-tracking branch 'remotes/origin/ent-3611-Vista-Creación-Edición-de-Agente' into develop
...
Former-commit-id: bcd067e3b702c3eaa60fff2aeae7e39625f565ef
2019-05-13 15:57:19 +02:00
b6e8578d1d
Fixed a minor sintax error - #3611
...
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
2019-05-13 15:54:06 +02:00
14717a6c6d
Fixed merge conflict
...
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
2019-05-13 15:15:14 +02:00
e6fa42ddca
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
2019-05-13 15:02:13 +02:00
895588ebe0
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
2019-05-13 15:00:35 +02:00
27096276ec
agent view user acces ehorus
...
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
2019-05-13 15:00:29 +02:00
e9082c5d8a
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
2019-05-13 14:55:15 +02:00
ecacf2d3f5
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2403
Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
2019-05-13 14:54:25 +02:00
f281dda622
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop'
...
Fixed error window in visual console
See merge request artica/pandorafms!2412
Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
2019-05-13 14:52:17 +02:00
5f2bd0bc8d
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
2019-05-13 13:17:17 +02:00
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +02:00
b51cdb93df
arreglo con la vista del formulario
...
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
793304b52d
Se habilita el boton de ehorus
...
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
a9834dc415
Merge branch 'develop' into 'ent-4004-Estilos-Discovery'
...
Conflicts:
pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
2019-05-10 09:55:54 +02:00
44b14debdc
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
2019-05-10 09:38:31 +02:00
12c9952e4a
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
43ce4f9883
Added helps
2019-05-09 17:20:27 +02:00
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
dab12ecdc5
Fixed error window in visual console
...
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
2019-05-09 15:06:03 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
143def5d87
Added helps
2019-05-09 13:43:53 +02:00
7c3e883c01
Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
...
Ent 3770 texto del pandora diag
Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252
See merge request artica/pandorafms!2393
Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +02:00
23b3d07f37
Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated
2019-05-09 09:29:27 +02:00
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
0a7539cc3a
Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
...
fixed filemanager
See merge request artica/pandorafms!2408
2019-05-08 18:26:23 +02:00
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
72a127c085
Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop'
...
Fixed pagination in Alert templates
See merge request artica/pandorafms!2391
2019-05-08 13:40:18 +02:00
247605f308
Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
...
Eliminated the cache when update agents
See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
297f53b9de
Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
...
Ent 3608 update manager online
See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
610e0dabbf
Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts
2019-05-08 11:17:15 +02:00
99f5cab83d
fixed filemanager
2019-05-08 10:55:20 +02:00
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
fa14fa9510
Show new values after update
2019-05-07 17:47:47 +02:00
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
b2b4372c9d
Added helps
...
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
2019-05-07 11:34:09 +02:00
fff3a783a1
Se restablece archivo modificado
...
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
e1951c45a4
Se añade al 28
...
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
eb64dbae86
add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item
...
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
2019-05-03 14:16:26 +02:00
7da5f518d8
Fixed the form when you try to create an agent without alias - #3611
...
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
2019-05-03 14:00:24 +02:00
fbsanchez
Daniel Barbero Martin
marcos
Luis Calvo
manuel
Daniel Rodriguez
Tatiana Llorente
Alejandro Fraguas
Jose Gonzalez
alejandro-campos
Kike
Daniel Maya
Manuel Montes
ismael.moreno
Alejandro Gallardo Escobar
root
slerena
Ramon Novoa