a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
0ccbb1198a
Auto-updated build strings.
...
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
e0c63e17d7
Merge branch 'ent-3692-No-esta-incluyendo-version-en-wizard-interfaces-para-modulos-satelite' into 'develop'
...
Add module version line to config module configuration data
See merge request artica/pandorafms!2259
Former-commit-id: 5595b821efd2c15e25458cbe8f5d52ab708c533a
2019-03-13 14:05:08 +01:00
ff120b23e2
Merge branch 'ent-3675-Tipo-erroneo-modulos-Ifoperstatus-desde-satelite' into 'develop'
...
Fixed data type to remote_snmp_proc in modules IfOperSttus
See merge request artica/pandorafms!2258
Former-commit-id: 61b2bc62b5605304b2fc278838ed1bf8fc20c395
2019-03-13 13:02:04 +01:00
1276eb3ecf
Add module version line to config module configuration data
...
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
046a126889
Merge branch 'ent-3696-7723-No-inserta-comentario-create_event-API' into 'develop'
...
disable cache for events_comment
See merge request artica/pandorafms!2257
Former-commit-id: 1293d55a9bc009b79e37dd54cd848544ae6c3286
2019-03-13 10:32:56 +01:00
99afea22cb
Auto-updated build strings.
...
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
a8af2f89d1
Fixed data type to remote_snmp_proc in modules IfOperSttus
...
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +01:00
cb1fc5dc67
Merge branch 'ent-3616-Pantalla-de-login' into 'develop'
...
Ent 3616 pantalla de login
See merge request artica/pandorafms!2248
Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
2019-03-12 17:23:04 +01:00
96d6e12546
disable cache for events_comment
...
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
d314062623
Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop'
...
Ent 2674 nueva macro event timestamp
See merge request artica/pandorafms!2244
Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
2019-03-12 13:51:47 +01:00
dbf0229ce0
Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop'
...
fixed warnings php
See merge request artica/pandorafms!2197
Former-commit-id: 486796c729a540e5ce75de80914a94dc3c1170ca
2019-03-12 13:24:48 +01:00
e55d7f0042
Merge branch '3547-7561-al-pinchar-en-un-icono-enlazado-a-un-monitor-no-aparece-en-la-busqueda-por-defecto-hasta-que-no-le-damos-a-buscar' into 'develop'
...
3547 7561 al pinchar en un icono enlazado a un monitor no aparece en la busqueda por defecto hasta que no le damos a buscar
See merge request artica/pandorafms!2192
Former-commit-id: 38c35e89b2af8f4c72b912afcbd77f4d08a3951d
2019-03-12 13:18:10 +01:00
15ca89068d
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
...
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
5227390c87
se elimina linea de autosearch = false
...
Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de
2019-03-12 13:06:27 +01:00
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
60337b0da7
Merge branch 'ent-3559-Poner-evento-en-in-progress-provoca-un-fallo-de-visualizacion' into 'develop'
...
Fixed error in event filters when is only new events
See merge request artica/pandorafms!2252
Former-commit-id: 3dd94c18cf9c3896d7a1f95546c879de63c86fe8
2019-03-12 11:18:51 +01:00
29f00dd1da
New login page
...
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
67080c72d9
Auto-updated build strings.
...
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
5b3dd6121b
Fixed error in event filters when is only new events
...
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +01:00
80fb8679a3
Merge branch 'ent-3578-ACL-visual-consol-not-working-properly' into 'develop'
...
Ent 3578 acl visual consol not working properly
See merge request artica/pandorafms!2250
Former-commit-id: 66f3e799ed124327f73061962a40dd1f63174b21
2019-03-11 17:02:10 +01:00
3b2d72308e
Merge branch 'ent-1800-Cambiar-informacion-de-los-instaladores' into 'develop'
...
Changed Maintainer in pandorafms-agent-unix
See merge request artica/pandorafms!2228
Former-commit-id: 861dfec496f2040810d0962e03cca41b2f180462
2019-03-11 14:23:00 +01:00
9a7bdd76ba
Merge branch 'ent-3681-Recuperar-el-boton-de-lista-de-servidores-con-estado' into 'develop'
...
Added button servers list in header
See merge request artica/pandorafms!2249
Former-commit-id: 21b5bfef18b66b8124fe8d3c26709675ecb14857
2019-03-11 14:12:25 +01:00
f4208a35f2
Changede sec=reporting to sec=network on visual console link to another console
...
Former-commit-id: 5cbbae6f99993a7b250feea354eb197fe6355969
2019-03-11 13:25:28 +01:00
8f9beccf76
Fixed url
...
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
2019-03-11 12:47:27 +01:00
cfa2c08b16
Merge branch 'ent-3668-No-se-puede-subir-ficheros-en-colecciones' into 'develop'
...
fix bug in functions_filemanager
See merge request artica/pandorafms!2243
Former-commit-id: 8a00098cb8917cc309dc5fe3bc327e5c70f9417b
2019-03-11 12:37:23 +01:00
bf0e8633ff
Added button servers list in header
...
Former-commit-id: 96d9f7a49d617b0a9f04df601c41bbce71009e38
2019-03-11 12:36:52 +01:00
ae006026bf
Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
...
fixed error in snmp browser change server
See merge request artica/pandorafms!2236
Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
62c38173eb
Merge branch 'ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup' into 'develop'
...
Changed radio buttons by checkbox switch
See merge request artica/pandorafms!2235
Former-commit-id: 23face1e62093414afb9be18a4353eeab073105f
2019-03-11 11:18:10 +01:00
c6c04fd0c9
Merge remote-tracking branch 'origin/develop' into ent-3616-Pantalla-de-login
...
Former-commit-id: e3261f935989cbc06f503abe6d8b762cef1b78f0
2019-03-11 10:08:44 +01:00
71afb7a741
New login page
...
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
b6bb7b2697
Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
...
Former-commit-id: ebd11459b73a64d43228e4d764fc5fc7585ae056
2019-03-11 09:47:24 +01:00
1acde54a3f
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/install.php
Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9
2019-03-11 09:46:59 +01:00
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +01:00
0210c2381d
Auto-updated build strings.
...
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
b79815bb06
Auto-updated build strings.
...
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
fd68b49710
Auto-updated build strings.
...
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
eb1917eed3
Merge branch 'ent-3605-Informe_de_servicios_casca_con_paradas_planificadas' into 'develop'
...
fixed errors SLA With planned downtime
See merge request artica/pandorafms!2232
Former-commit-id: 6e38f88f9b06e38e5fa1cb8dc770a410a04ba249
2019-03-08 12:14:55 +01:00
5d33d7468e
Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
...
Former-commit-id: 506c3611ff578c95f07753113d1bc46d80069c95
2019-03-08 12:04:57 +01:00
82a239240c
Merge branch 'ent-3677-SLA-Graphics-not-viewing-properly' into 'develop'
...
Restored width in % and forced Agent SNMP view to enter if with widget=true
See merge request artica/pandorafms!2247
Former-commit-id: 8c579cdb697ff55426bee8c6f3d1a94fda99c7fb
2019-03-08 10:53:43 +01:00
b19161ed3c
Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
...
Added custom field combo values in agent custom field
See merge request artica/pandorafms!2246
Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
c76558c66e
Merge branch 'ent-3564-sincronizar-colecciones-desde-meta-con-modo-centralizado-edicion-de-directorios-nodo' into 'develop'
...
Fixed synchronize collections in node
See merge request artica/pandorafms!2226
Former-commit-id: 18310b2aa7ae2275e2c19196118f00738a64daf4
2019-03-08 10:25:08 +01:00
c41c9d10e0
Changed sql files
...
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +01:00
e43d1aa356
Auto-updated build strings.
...
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
2019-03-08 00:01:31 +01:00
98ec2f31e6
Restored width in % and forced Agent SNMP view to enter if with widget=true
...
Former-commit-id: 25ca763789d5d30d298b6bf77bd5f0630aff526f
2019-03-07 18:05:03 +01:00
962e519bc9
Merge branch 'ent-3590-Ampliar_limite_de_caracteres_en_str_warning_y_str_critical_en_consola' into 'develop'
...
fixed minor error lenght str.warning and str.critical 1024 charts
See merge request artica/pandorafms!2233
Former-commit-id: d79f8f1b2b293544dd463387d33bd36669accb4c
2019-03-07 15:50:59 +01:00
cfcb427676
fixed minor error
...
Former-commit-id: 5025e19699e773afee950a31bdceeeb0eb4bc47d
2019-03-07 14:52:31 +01:00
1020ec1bd7
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
Daniel Barbero Martin
artica
Daniel Rodriguez
alejandro-campos
samucarc
Alejandro Fraguas
Daniel Maya
marcos.alconada
Tatiana Llorente
Luis Calvo
manuel