e5eb91e62a
Merge branch '3154-Agent-name-en-vistas-de-alertas-de-consola-movil' into 'develop'
...
agent named replaced by agent alias in mobile console's alerts view
See merge request artica/pandorafms!2066
Former-commit-id: 527b887ac9e21faafc27e111a189e3e40056b3a3
2019-02-18 13:42:03 +01:00
59cd0a43ea
Merge branch '2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta' into 'develop'
...
ent-2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
See merge request artica/pandorafms!2111
Former-commit-id: b9770bc97e741d6e6d7b0ab111c195ac3fe440df
2019-02-18 12:16:55 +01:00
01b8649812
Merge branch '1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica' into 'develop'
...
Added option in setup for unique main IP in agents - #1744
Closes pandora_enterprise#1744
See merge request artica/pandorafms!2114
Former-commit-id: 77e1bbae9a1a60bc51739d98948ca8af5d183f78
2019-02-18 12:16:20 +01:00
c897d65f10
Merge branch 'ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows' into 'develop'
...
Fixed error with slashes - #3426
See merge request artica/pandorafms!2143
Former-commit-id: 6e78bc1fdb4de94c31c06ff98b9f2f27f2788646
2019-02-18 10:43:16 +01:00
4017539728
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/install.php
Former-commit-id: 25f781cc2a2be2258e2ad601353afd9f80561a7c
2019-02-18 09:27:40 +01:00
582b8a70da
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
2019-02-18 09:22:48 +01:00
0ef118f401
Auto-updated build strings.
...
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00
1fafda8502
Auto-updated build strings.
...
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
2019-02-17 00:01:24 +01:00
0d93ccc094
Auto-updated build strings.
...
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
2019-02-16 00:01:31 +01:00
46de260573
Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
...
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
2019-02-15 15:55:31 +01:00
41c4ad8d90
Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil
...
Former-commit-id: aa3d44b06df07f90092f6bab50b2c6ef63660fc5
2019-02-15 15:30:36 +01:00
28472ddc7d
Merge branch '3373-Añadir-opcion-a-mas-parametros-en-api_get_groups' into 'develop'
...
ent-3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
See merge request artica/pandorafms!2127
Former-commit-id: a614183a0f077c8fb88c5b3eb5e52aa3c31e8e23
2019-02-15 14:38:27 +01:00
196de9ae3d
Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
...
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
2019-02-15 13:54:28 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
a20d7b9ce1
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: ef2b7fb631fab61bcb5e21b0632f02a3af451045
2019-02-15 12:10:49 +01:00
cd83f324a1
Auto-updated build strings.
...
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
2019-02-15 00:01:26 +01:00
52c4b3dab1
Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop'
...
add params setup historic database
See merge request artica/pandorafms!2154
Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed
2019-02-14 17:00:56 +01:00
624d804168
Fixed minor error
...
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
2019-02-14 16:53:01 +01:00
f849c2b0f0
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: d74f5cb5c6ff0cc05542e63d1f8537f289eebfc8
2019-02-14 16:41:17 +01:00
d9ba3af358
Fixed errors in setup performances
...
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
2019-02-14 16:31:19 +01:00
4c94956b91
Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop'
...
Fixed slow query in template item
See merge request artica/pandorafms!2151
Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
2019-02-14 16:15:01 +01:00
04e8962cec
Merge branch 'ent-2967-6662-Error-504-en-vista-de-eventos' into 'develop'
...
Ent 2967 6662 error 504 en vista de eventos
See merge request artica/pandorafms!2167
Former-commit-id: 4096c814248a75bbe5e75858b31ee040379d6486
2019-02-14 14:55:33 +01:00
0fb61444f6
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
2019-02-14 08:01:23 +01:00
f0338cd08e
Auto-updated build strings.
...
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
2019-02-14 00:01:26 +01:00
c0dd81cab5
Merge branch 'ent-3277-Error_al_guardar_password_en_chequeos_wmi' into 'develop'
...
Fixed WMI passwords when encrypted
See merge request artica/pandorafms!2164
Former-commit-id: 7c2aeffb2849a3539569b2706b4ca613e1c632a8
2019-02-13 18:33:11 +01:00
812382a47f
Update manage_network_components_form.php
...
Former-commit-id: 17e3faf98a33bb6f7e21e805085f366944e51ea4
2019-02-13 16:51:22 +01:00
8abb1b90dc
Merge branch 'ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI' into 'develop'
...
Changed popup windows by tooltips
See merge request artica/pandorafms!2106
Former-commit-id: 5682d4f7088be60279aaf33a9756b306a23ea4d8
2019-02-13 16:08:01 +01:00
f7134b6d81
Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop'
...
Ent 3377 bug manager update online de la version open source
See merge request artica/pandorafms!2171
Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
2019-02-13 15:56:19 +01:00
4c809ba8d2
event query optimization
...
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
2019-02-13 15:41:34 +01:00
40419ea587
Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI
...
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_wmi.php
Former-commit-id: ec88c5b6ff36318db9a1f9ca98651bb49aa6eb9d
2019-02-13 14:55:21 +01:00
6a9e69adb1
Added changes
...
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +01:00
80407881dc
Merge branch 'ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte' into 'develop'
...
Changed radio buttons by toogle switch checkbox
See merge request artica/pandorafms!2130
Former-commit-id: ab3aa0dbe0266fccba771fb3aa36ca3fb7d489ac
2019-02-13 12:14:13 +01:00
b11d1a6687
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
2019-02-13 12:03:46 +01:00
20d7598abb
Merge branch '3145-Fallback_to_local_and_save_password' into 'develop'
...
Save password option disabled if Fallback is enabled
See merge request artica/pandorafms!2137
Former-commit-id: 48390e003cad5f9393282907587d51ce9a92dfd8
2019-02-13 10:07:58 +01:00
0e39e3fef7
Auto-updated build strings.
...
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
2019-02-13 00:01:37 +01:00
f00266bc86
Merge branch 'develop' into 3145-Fallback_to_local_and_save_password
...
Former-commit-id: d3a7766ee87b4e1484d55b14abd69d7fe2ee709e
2019-02-12 18:55:48 +01:00
28a932148e
Fixed tooltip
...
Former-commit-id: 565813260edd865433afba59e8ecad824d549c77
2019-02-12 18:55:36 +01:00
bcaccf31bc
fixed encryptation in network componet modules
...
Former-commit-id: b4d64e4562add1b9853bfa888556a4495c4177ed
2019-02-12 17:55:58 +01:00
4f158ed61b
Merge branch 'ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente' into 'develop'
...
Validate alerts at the time agents/modules are modified.
Closes pandora_enterprise#3305
See merge request artica/pandorafms!2155
Former-commit-id: 6dead1fed27249ea1913e70530571d33b76cf3ff
2019-02-12 16:38:01 +01:00
3f3c527c3b
Merge branch 'ent-3121-Report-tipo-general-salida-de-datos-booleanos' into 'develop'
...
Visual change in the data of general type reports
Closes pandora_enterprise#3121
See merge request artica/pandorafms!2113
Former-commit-id: f12dc3ad2cf11d1b48db42b4de8288073011f635
2019-02-12 16:35:55 +01:00
fa7f519d34
Merged from develop.
...
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
2019-02-12 14:52:18 +01:00
0b26faad87
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/install.php
Former-commit-id: 5f24ae2f22b85f461ee69c97b61f2ea3fd3c42f5
2019-02-12 13:54:52 +01:00
6e236c404b
Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
2019-02-12 13:47:44 +01:00
bbd3cb79ce
Auto-updated build strings.
...
Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04
2019-02-12 00:01:37 +01:00
8beba4569a
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/install.php
Former-commit-id: b910529699b6e6afaeea286ac43c89779b11a26e
2019-02-11 16:26:58 +01:00
7150b8b758
restore install.php
...
Former-commit-id: 917f3d5d07b1bce92fa06836c5b2872dc06390d2
2019-02-11 16:08:36 +01:00
2ebbaf83c5
Merge branch '3241-Etiqueta_en_el_Menu_de_la_metaconsola' into 'develop'
...
Fixed Label in the Console Menu
See merge request artica/pandorafms!2123
Former-commit-id: ec997b149c6c480f74cb4fd71b7bc600cec40c19
2019-02-11 14:58:05 +01:00
e51864ac6f
Merge branch 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual' into 'develop'
...
Fixed agent status in visual map
See merge request artica/pandorafms!2148
Former-commit-id: d2dd7165a3dac9228948b8a1b8878b9fb3e2b491
2019-02-11 14:49:59 +01:00
b9a09cef45
fixed bug in functions_reporting_html
...
Former-commit-id: 53fd11f9b6ff51c55c0009b1e1448834ed7f0161
2019-02-11 12:11:23 +01:00
99c0da3a06
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
2019-02-11 11:11:56 +01:00
Daniel Rodriguez
Alejandro Fraguas
Tatiana Llorente
artica
alejandro-campos
Daniel Barbero
Samuel Carcases
Daniel Maya
manuel
samucarc
Ramon Novoa