Commit Graph

21135 Commits

Author SHA1 Message Date
fbsanchez b853582fb9 Changed preview by \"click here\" message 2019-05-21 08:29:59 +02:00
artica 20e38ead81 Auto-updated build strings. 2019-05-21 00:01:08 +02:00
fbsanchez 77fc1abe89 minor style updates and fixes in safe-output 2019-05-20 18:16:21 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
Alejandro Fraguas 1cf0c1545a Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop'
Informes SLA mensuales de "KeepAlive" no se calculan bien

See merge request artica/pandorafms!2433
2019-05-20 12:08:44 +02:00
alejandro-campos a898fad2c3 lint fixes 2019-05-20 10:35:46 +02:00
artica d82d178a0d Auto-updated build strings. 2019-05-20 00:01:08 +02:00
artica 2dc5fce6a6 Auto-updated build strings. 2019-05-19 00:01:06 +02:00
artica 509c476c33 Auto-updated build strings. 2019-05-18 00:01:08 +02:00
alejandro-campos 0046e209fe lint changes 2019-05-17 14:46:19 +02:00
alejandro-campos 54d3eefa43 lint changes 2019-05-17 14:27:59 +02:00
alejandro-campos e746a49158 lint changes 2019-05-17 14:26:44 +02:00
Alejandro Gallardo Escobar bdcea7ec7d Minor fix 2019-05-17 14:25:17 +02:00
alejandro-campos a0b7164d9f lint changes 2019-05-17 14:20:01 +02:00
Alejandro Gallardo Escobar 2c8dd3b5e5 Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual 2019-05-17 14:16:23 +02:00
Alejandro Gallardo Escobar 34218fa7eb Improved the management of the async requests of the visual console client 2019-05-17 14:09:30 +02:00
marcos.alconada 0c9f8892e0 Changed evaluates permissions 2019-05-17 13:58:34 +02:00
Alejandro Fraguas ea39766d59 Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop'
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop

See merge request artica/pandorafms!2427
2019-05-17 12:11:19 +02:00
Daniel Rodriguez 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
Daniel Rodriguez 9b4d1b3dba Merge branch 'ent-2108-incongruencias-creacion-accion-pandora-fms-event' into 'develop'
Recovered event criticity field from event alert

See merge request artica/pandorafms!2425
2019-05-17 10:49:34 +02:00
artica bf202496da Auto-updated build strings.
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
2019-05-17 00:01:10 +02:00
Luis Calvo b3d2eaaf9e Fixed img url on js
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
2019-05-16 17:25:18 +02:00
Luis Calvo 1bfd91725e Changed <img> to hmtl_print_image
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
Daniel Maya f1705af9f6 Fixed error window in visual console
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
fbsanchez 2b3fc919f1 Merge branch 'ent-1668-update-manager' of brutus.artica.lan:artica/pandorafms into ent-1668-update-manager
Former-commit-id: 792aee88887f8306f302b64ccfb264a148101dc4
2019-05-16 15:38:57 +02:00
fbsanchez c40e0ec702 pandora_console/extras/delete_files/delete_files.txt
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
fbsanchez 0bfd0f2c8b pandora_console/extras/delete_files/delete_files.txt
Former-commit-id: 6a2831c46241b981711dbdcddbf3961c50d98071
2019-05-16 15:38:18 +02:00
Luis Calvo 0f35923073 Recovered event criticity field from event alert
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
2019-05-16 13:23:47 +02:00
fbsanchez ec60a3193a removed all group from communications target
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
2019-05-16 12:52:41 +02:00
fbsanchez 3cdbfd3646 minor fix in php requirements
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
2019-05-16 12:50:16 +02:00
fbsanchez c8c0194183 Minor fix in url
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
2019-05-16 12:33:05 +02:00
fbsanchez 034480bf88 minor fixes
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
2019-05-16 12:28:46 +02:00
Daniel Rodriguez 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
fbsanchez e7dbb55392 Minor fixes
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
alejandro-campos 13b32003b3 save changes ticket 3937
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
Daniel Rodriguez 50ad335794 Merge branch 'ent-3720-7750-anadir-filtros-en-custom-graphs-2' into 'develop'
New branch without thras files

See merge request artica/pandorafms!2423

Former-commit-id: 909ad4d321231e4d610b409c3f5b1224a780150b
2019-05-16 11:37:25 +02:00
Alejandro Gallardo Escobar a25a08f48d Added an async task manager to the visual console client
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
2019-05-16 11:04:03 +02:00
Alejandro Gallardo Escobar 2b2daf2b8b Type improvements
Former-commit-id: eec4df39fc4ce81240974a32a3fe76618bb62d39
2019-05-16 11:03:11 +02:00
artica f5f66fc144 Auto-updated build strings.
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
2019-05-16 00:01:06 +02:00
artica 9c08aa7b57 Auto-updated build strings.
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
2019-05-15 00:01:11 +02:00
fbsanchez 3bf06f0b72 MR minor updates
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
2019-05-15 00:00:21 +02:00
fbsanchez d871b599ef General fixes and UM comm updates
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
marcos.alconada 0e99b750b4 New branch without trash files
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
fbsanchez 8004e096fd MR 28 and minor fixes
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
Alejandro Fraguas 3548070ec1 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
Add new message to News board

See merge request artica/pandorafms!2415

Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
2019-05-14 17:56:43 +02:00
Daniel Rodriguez 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
fbsanchez 920786216b UM notifications MR update
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
2019-05-14 17:17:04 +02:00
fbsanchez 53e9113b7e UM notifications MR update
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
marcos.alconada 35c7ea1f48 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
2019-05-14 17:14:02 +02:00
marcos.alconada bc849c16fb Only one image for welcome new board
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
2019-05-14 17:13:44 +02:00