Commit Graph

21136 Commits

Author SHA1 Message Date
marcos.alconada 58d2abbdae restauro api
Former-commit-id: de9d1588e0e8ef53b48b72d52597963b59aee11f
2019-04-23 15:37:54 +02:00
Alejandro Gallardo Escobar daa627441a Removed some linter errors
Former-commit-id: 7dfda1ad66f676059145e7ab34485798dc9c5264
2019-04-23 15:09:57 +02:00
Alejandro Gallardo Escobar 26b3fd23f5 Visual Console Refactor: changed the default size for the items which use icons
Former-commit-id: 689c7e3769ff1554ab2a5c9701d47117a122595a
2019-04-23 15:09:23 +02:00
marcos.alconada 4f25c89a74 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: 489946341bfbf5c985750eac90dd12f7cbea91e5
2019-04-23 14:53:43 +02:00
Tatiana Llorente 1eeba6855e New style for update manager online - #3608
Former-commit-id: 488cdae753c5a7fff6e1c69dce4da9675e4ef425
2019-04-23 13:57:12 +02:00
Alejandro Gallardo Escobar 2f397b16df Visual Console Refactor: minor fix
Former-commit-id: 0cf70df7d8c45285fb612bc09871d52f0dfdcfb7
2019-04-23 13:16:33 +02:00
Alejandro Gallardo Escobar f4ff73bee1 Visual Console Refactor: minor fix
Former-commit-id: cf4201fd61ffb61957b54277d9195bae5935aa3b
2019-04-23 13:00:52 +02:00
Alejandro Fraguas 619d5eaf7d Merge branch 'ent-3667-Bug-informes-metaconsola-en-csv' into 'develop'
minor fix

See merge request artica/pandorafms!2371

Former-commit-id: d68d9354adbf4182a021d39fc174b8b9f54d82c1
2019-04-23 12:54:20 +02:00
fbsanchez 57d66e95ce minor fix
Former-commit-id: 17cf4ce929b52904ea8c6120b3c36f859694211e
2019-04-23 12:20:12 +02:00
Alejandro Gallardo Escobar f124612ba1 Visual Console Refactor: bugfix
Former-commit-id: 698a3aa603ffe93c70edf52517fc5def21da52ba
2019-04-23 11:41:50 +02:00
Tatiana Llorente a79092ded0 New style for update manager online - #3608
Former-commit-id: 43222aa59ceb936bf4c16fc73d08bba04f65abd9
2019-04-23 11:41:45 +02:00
Alejandro Gallardo Escobar c461825a27 Visual Console Refactor: some parameters aren't required anymore
Former-commit-id: 3788b8dc8c055a04a627bf99e12ab30420d54351
2019-04-23 11:40:45 +02:00
Alejandro Gallardo Escobar 3a3c62a855 Visual Console Refactor: added a pair of comment lines
Former-commit-id: dc2237e31753b212ce268d5a6901723ffb5a7528
2019-04-23 11:36:46 +02:00
Tatiana Llorente ecd63667e5 New style for update manager online - #3608
Former-commit-id: 3cb6fb7aae2f73bc60e11cd97e3af0fda1c89354
2019-04-23 11:33:19 +02:00
Daniel Maya 404fb19e35 Fixed status of staticgraph in metaconsole
Former-commit-id: cf0b32c2c7cafaca8f4463d46d67c25c7a81fdc2
2019-04-23 10:54:43 +02:00
Tatiana Llorente 579c9e7083 New style for update manager online - #3608
Former-commit-id: 5c69869fb8c79071589c16d25b5bf314910dc501
2019-04-23 10:12:35 +02:00
Alejandro Gallardo Escobar d6bd44d1c0 Visual Console Refactor: bugfixes
Former-commit-id: 09c2b268fd179f81f3041be774f199abe088b4f3
2019-04-23 09:56:02 +02:00
Alejandro Gallardo Escobar 8fc5951209 Visual Console Refactor: fixed the group link
Former-commit-id: c3982381f65e2b4e805546c218ef7ec5e83c2685
2019-04-23 09:43:44 +02:00
marcos.alconada 8345c1a85f Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: e28ec3130ff14c662953b33490c5525e257b0288
2019-04-23 09:37:41 +02:00
artica 883f3decb4 Auto-updated build strings.
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
2019-04-23 00:01:09 +02:00
alejandro-campos 01d1fb1c11 fixed visual bug
Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
2019-04-22 18:17:39 +02:00
alejandro-campos 0e02d71712 add missing image
Former-commit-id: 0e5c0140a919223403c33a7dde15f64fdde62ed8
2019-04-22 17:47:30 +02:00
alejandro-campos 4f6a81dc5b visual changes to discovery
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
Daniel Maya 58a601b0f1 Fixed id_tagente in metaconsole
Former-commit-id: 72ea89dfe6eff0892adaaa4a077a99ddfa0fa4d4
2019-04-22 17:44:27 +02:00
Daniel Maya 713212a435 Fixed html group
Former-commit-id: a7b9fdccad8d62783ef2a547a72cc86d5ebc7f46
2019-04-22 17:39:57 +02:00
Alejandro Fraguas a6df522df7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas_2' into 'develop'
Fixed header missing in table alert status - #3707

See merge request artica/pandorafms!2365

Former-commit-id: e56a9610bc358898b5dc61a7f47d32561c72e36b
2019-04-22 17:31:49 +02:00
Alejandro Gallardo Escobar d4eca50996 Visual Console Refactor: bundle upgrade
Former-commit-id: 6e54f465ae1ec8b775e4050bfc5ba1abdce1dc39
2019-04-22 17:01:01 +02:00
Alejandro Gallardo Escobar 3d7aa1e97e Visual Console Refactor: changes in the group item
Former-commit-id: 06c93036ced218711c6931da831e19463d23089f
2019-04-22 16:59:43 +02:00
Tatiana Llorente 973ce07811 New style for update manager online - #3608
Former-commit-id: 377766a3a53d111f3531bff9ea7796cc6d02c143
2019-04-22 16:56:31 +02:00
manuel 20058be56a Fixed visual bug in policies operations actions
Former-commit-id: c47606c0c53e74b1ac8610f0be6bd0228e14d42a
2019-04-22 16:37:06 +02:00
fbsanchez cf82ed3ae7 including several extra tokens in config
Former-commit-id: a391371f0c6d9ee034670a65fa7422e4b08e87df
2019-04-22 16:28:07 +02:00
Daniel Rodriguez 3a68e1bb77 Merge branch 'ent-3882-revision-politicas' into 'develop'
Función auxiliar políticas

See merge request artica/pandorafms!2354

Former-commit-id: de065e2ef71e864862a4b2a93419cdf9285f092c
2019-04-22 16:27:51 +02:00
Tatiana Llorente 2ca68daf9a New style for update manager online - #3608
Former-commit-id: ea7a378d1c4092b3b0540fe2a94ae7415e7a200e
2019-04-22 15:45:57 +02:00
Tatiana Llorente 518a9a1eed New style for update manager online - #3608
Former-commit-id: 8fb65c7064238d8f2180db6fedd99058667f804e
2019-04-22 15:41:57 +02:00
Alejandro Gallardo Escobar ac3fac01c0 Visual Console Refactor: rebuilded the bundles
Former-commit-id: 4c06bc90af1bfda72b67f86c2794dd6701f39f1d
2019-04-22 15:10:13 +02:00
Alejandro Gallardo Escobar 480037ec45 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 5b531124879af2ae9af695febae175b32ebd073e
2019-04-22 15:04:48 +02:00
Alejandro Gallardo Escobar 06756d0769 Visual Console Refactor: fixes and improvements
Former-commit-id: 5083315ebb9690aa946b9ea8452def592f2a8ac5
2019-04-22 15:04:34 +02:00
Alejandro Gallardo Escobar 3332e41f41 Added an option to use the metaconsole table when fetching the agents
Former-commit-id: d21627018f662d27f5612bf69bddfd8d298437ca
2019-04-22 15:02:15 +02:00
Daniel Maya 74d91b0814 Changed vc.main js
Former-commit-id: fcc4005f70afaa71b97bfc64edca11244cfd0228
2019-04-22 14:57:14 +02:00
Alejandro Fraguas f2d7584d70 Merge branch 'ent-3674-discovery-fase-3' into 'develop'
Ent 3674 discovery fase 3

See merge request artica/pandorafms!2315

Former-commit-id: d89d32a1432a3e449485eb113b3195dcc101ce80
2019-04-22 14:34:46 +02:00
fbsanchez f06e81dcc4 Discovery: Minor update in description and extra information in log
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
fbsanchez 19ec5a0733 minor fix
Former-commit-id: 34ebb713083bce476e15483e710f23295cf842cb
2019-04-22 13:26:17 +02:00
fbsanchez ca05867e55 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3b243ec4bd93ba4cb494f0ea1a53043cc8e890c6
2019-04-22 13:23:58 +02:00
Alejandro Gallardo Escobar ebaa3506de Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: c47efaabdd51775e11d1672ef2f4100b97baa332
2019-04-22 13:15:30 +02:00
Alejandro Gallardo Escobar 22ce005e5d Visual Console Refactor: improvements and fixes
Former-commit-id: c1a5f1ca26d719c7ed0291ec611e0e14e8f5c7b4
2019-04-22 13:09:34 +02:00
Daniel Maya e79b51e0de Added show statictics in group
Former-commit-id: 2475eff69255412997fd13d0e87d2484156e1046
2019-04-22 12:46:28 +02:00
Alejandro Gallardo Escobar b93a016f50 Visual Console Refactor: bugfix
Former-commit-id: eaef1bbee481e54e96cd55e3b4fef7c5a852e84c
2019-04-22 12:07:48 +02:00
Luis Calvo fa0da4504e Fixed bug connection ok when db connection returns null
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
2019-04-22 12:00:06 +02:00
Alejandro Gallardo Escobar 9a186fcb8f Visual Console Refactor: bugfix
Former-commit-id: 8243195bd4ed0d4247983c510ed81d5b415915e8
2019-04-22 10:58:01 +02:00
fbsanchez b31051f9a1 Merge branch 'fix/wizard_breadcrum' into 'develop'
Breadcrum fix do not rollback...

See merge request artica/pandorafms!2366

Former-commit-id: 473f668f6a6a9be11e551aecbb21317004785314
2019-04-22 10:56:26 +02:00