61eb7f0635
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
2019-11-18 09:55:15 +01:00
91f28384b8
changed sap icon button
2019-11-15 16:22:30 +01:00
8edbb74354
discovery help link and minor fixes
2019-11-14 21:52:02 +01:00
f69b86663a
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00
f348310675
ADD function to get SAP agents and sap view to sap agents
2019-11-14 19:01:23 +01:00
0d3817d64d
dynamic toggle in wizard input printForm
2019-11-14 17:45:45 +01:00
9a17a02d61
Fixed bug with line breaks in alert commands
2019-11-14 12:29:02 +01:00
0199c6312a
Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
...
refactoriced diagnostics pandoraFMS
See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
a8b6f40ca1
change sap view menu position
2019-11-14 10:51:00 +01:00
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
9b1a3a9cd1
Firts_task => first_task
2019-11-13 14:58:53 +01:00
f844c660af
Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
...
add feedback
See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
875d4430a7
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-13 12:21:42 +01:00
b11dbc639f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-13 12:20:29 +01:00
7103317bc2
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
fe45afa662
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
2019-11-13 12:01:36 +01:00
d4c4b3c2d8
Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop'
...
Ent 4664 bug automatically combined graph
See merge request artica/pandorafms!2776
2019-11-13 10:01:19 +01:00
d1fbd36a97
WIP omnishell
2019-11-12 19:31:38 +01:00
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
7b06ceaafc
add sap menu
2019-11-12 10:54:36 +01:00
19d06dc061
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
2019-11-12 10:19:34 +01:00
5ea93011d3
Changed title name or description in items table of reports
2019-11-12 09:53:10 +01:00
53954ec853
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 14:26:23 +01:00
65f5223698
validation alerts
2019-11-11 14:26:04 +01:00
0b610cd8ba
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 13:39:08 +01:00
430af38fa6
minor fixes in flow control
2019-11-11 13:38:27 +01:00
d9d8cbfd35
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-07 19:43:18 +01:00
adc0f24f8e
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
...
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
2019-11-07 15:48:12 +01:00
79d165b164
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-06 20:01:28 +01:00
90d567a064
Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph'
...
Conflicts:
pandora_console/godmode/reporting/graphs.php
2019-11-06 17:48:51 +01:00
e81932cf0d
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
...
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
2019-11-06 16:23:51 +01:00
0647b156a5
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
...
fix bug in user list permission checks
See merge request artica/pandorafms!2865
2019-11-06 16:06:49 +01:00
98237a8d34
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-06 15:36:53 +01:00
a486738920
Fixed visual styles ticket 4809
2019-11-06 10:31:26 +01:00
4b9d6f1ae2
fix bug in user list permission checks
2019-11-05 17:18:38 +01:00
dd86598298
Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop'
...
Fixed visual bug in general report item
See merge request artica/pandorafms!2854
2019-11-05 16:43:52 +01:00
276fc82556
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-05 15:39:18 +01:00
e5f24ca884
Merge develop
2019-11-05 15:27:06 +01:00
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
b1d4bfe149
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
7c73d5f51a
Added confirmation to delete a visual console
2019-11-04 17:56:28 +01:00
cf3bcefddf
Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
...
Fixed planned downtime acl
See merge request artica/pandorafms!2829
2019-11-04 11:25:17 +01:00
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
aa30a12f31
wizard doc minor fix
2019-10-31 21:15:18 +01:00
115c884cd4
Discovery SAP
2019-10-31 21:13:18 +01:00
72b1fb2b16
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
2bb81a839a
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +01:00
c07baa614f
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
2019-10-29 17:00:57 +01:00
613e5741fb
Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
...
# Conflicts:
# pandora_console/include/functions_ui.php
2019-10-29 17:00:39 +01:00
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
0a53c0b915
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
2019-10-29 16:50:46 +01:00
57bfc364ae
add modal confirmation window
2019-10-28 18:57:10 +01:00
6d21f71617
removed trace
2019-10-28 18:38:56 +01:00
7d5b845e1f
minor fixes
2019-10-28 18:37:01 +01:00
e12bcb2ac4
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-28 12:59:02 +01:00
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
fbsanchez
marcos
Tatiana Llorente
Alejandro Fraguas
Daniel Rodriguez
Daniel Barbero Martin
manuel
alejandro-campos
Luis Calvo
Jose Gonzalez
Kike
Daniel Maya