Commit Graph

16496 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 5f986e2390 Visual Console Refactor: bugfix
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
2019-04-29 11:53:21 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar e5c17f660b Visual Console Refactor: fixed the label position
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
2019-04-29 10:56:06 +02:00
Alejandro Gallardo Escobar c09fbf4ddb Visual Console Refactor: fixed the links
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
2019-04-29 10:45:12 +02:00
marcos.alconada 24e8d81b43 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: c15ebac07056c99c3c79ae57fa1396ea66d00c04
2019-04-29 09:26:48 +02:00
artica 5d6bd31786 Auto-updated build strings.
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings.
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
2019-04-28 00:01:06 +02:00
artica 29b7ddeb6d Auto-updated build strings.
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
2019-04-27 00:01:09 +02:00
Daniel Maya 504457f9a6 Fixed decimal in percentil
Former-commit-id: ad964b4e4e2fa59eae959d5107b63d3c6f96766c
2019-04-26 14:37:35 +02:00
Daniel Barbero e54112641d add links counters cfv
Former-commit-id: 5a1bdfc376db32f94d06330c2e498c473361e710
2019-04-26 14:25:51 +02:00
Tatiana Llorente 77941953a2 New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613
Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
2019-04-26 11:57:41 +02:00
Daniel Maya 4b73518804 Fixed node name in netflow map
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
2019-04-26 09:54:38 +02:00
marcos.alconada cffb469334 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: 2883dbe057d3c6063a1d1784c64c85dc49c0713b
2019-04-26 09:44:54 +02:00
artica 6de9b4f23e Auto-updated build strings.
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
Alejandro Gallardo Escobar 6feaba0b9d Visual Console: changed the default orientation of the items
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
2019-04-25 18:23:28 +02:00
Alejandro Gallardo Escobar f3f5bcecd8 Visual Console Refactor: fixed the module graph element
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
2019-04-25 16:59:24 +02:00
Alejandro Gallardo Escobar af69804708 Improved the background size and the elements order of the Visual Console
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
2019-04-25 16:36:17 +02:00
marcos.alconada da8507c4b4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
2019-04-25 16:05:27 +02:00
Alejandro Gallardo Escobar 08f9a34f23 Visual Console Refactor: bugfix
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
2019-04-25 14:24:19 +02:00
Alejandro Gallardo Escobar 2d9b4908de Visual Console Refactor: the legacy visual console is enabled by default
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar 0bd276bc88 Visual Console Refactor: bugfix
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
2019-04-25 14:02:30 +02:00
Daniel Rodriguez 3b03b6fa10 Merge branch 'visual-console-refactor' into 'develop'
Visual console refactor

See merge request artica/pandorafms!2348

Former-commit-id: 6a257514f7a5487b84a1cb35514899e1ef6f11e8
2019-04-25 11:27:49 +02:00
Alejandro Gallardo Escobar 7d95151a5b Visual Console Refactor: minor fixes
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
2019-04-25 10:57:25 +02:00
Daniel Maya 260a149668 fixed include_once in items
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
2019-04-25 10:37:11 +02:00
Alejandro Gallardo Escobar 35d54a7e79 Visual Console Refactor: added missing libs
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
2019-04-25 10:30:24 +02:00
Alejandro Gallardo Escobar fbd8937cd3 Merge remote-tracking branch 'origin/develop' into visual-console-phase-2
Former-commit-id: d79ca27527b9f3662617f8cfd641a55a8272b3b8
2019-04-25 10:09:45 +02:00
Alejandro Gallardo Escobar 6a378f664e Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 0c2ffa8d51737644ae99eebdaae842af26ba52b8
2019-04-25 10:02:38 +02:00
Alejandro Gallardo Escobar 8ae521b2c4 Visual Console Refactor: added missing libraries
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
2019-04-25 10:02:35 +02:00
marcos.alconada 87ff7b3d4e Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Former-commit-id: 2c3deaf32137b14caa9b714148808922a169f937
2019-04-25 09:37:14 +02:00
Daniel Maya 3d2bcb3495 Fixed include_once in DonutGraph
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
2019-04-25 09:25:19 +02:00
Alejandro Gallardo Escobar b6d6b05ddb Visual Console Refactor: upgraded the bundles
Former-commit-id: af79177070cbae3c3ff61282332564f8426a544d
2019-04-25 09:13:34 +02:00
artica 7f7a727c21 Auto-updated build strings.
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
Daniel Barbero Martin 596e760454 fixed error secondary groups
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
2019-04-24 17:28:55 +02:00
Alejandro Gallardo Escobar 48917c565f Visual Console Refactor: renamed the bundles
Former-commit-id: 0f63859b3e2eeeb890ad35779d2119137855fb8a
2019-04-24 17:25:57 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
Alejandro Gallardo Escobar dab4024f24 Visual Console Refactor: fixed the module graph's height
Former-commit-id: 9e9bed04904c136450d0831e542bf7bcd6abab14
2019-04-24 16:57:52 +02:00
Tatiana Llorente ab6658a450 Fixed pagination in modal windows - #3707
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
2019-04-24 16:26:50 +02:00
marcos.alconada e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
Alejandro Gallardo Escobar 1cb15c9404 Visual Console Refactor: fixed the donut graph
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
2019-04-24 16:07:46 +02:00
Alejandro Gallardo Escobar 3c2e65a8a5 Visual Console Refactor: added the missing macros to the label
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
2019-04-24 15:58:33 +02:00
Daniel Maya d541eab986 Fixed size in module graph
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
2019-04-24 15:40:07 +02:00
Tatiana Llorente 313ff93c8c Fixed pagination in modal window to create dashboard - #3707
Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6
2019-04-24 15:38:46 +02:00
Daniel Barbero Martin 62b30c6e91 Merge remote-tracking branch 'origin/develop' into ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado
Former-commit-id: e51d5accb228485a309abae06d2a68352ae18a9b
2019-04-24 15:25:06 +02:00
Daniel Rodriguez 50e994e065 Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
change way to print discovery simple multiple inputs

See merge request artica/pandorafms!2378

Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
Daniel Barbero Martin ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
Alejandro Fraguas 759a533180 Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
Commit para revisar progreso

See merge request artica/pandorafms!2289

Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
2019-04-24 13:47:15 +02:00
Daniel Maya 56fef21bc6 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 50ffdbe852fe3dc88ba1705ce769f8ec70bc7506
2019-04-24 13:40:46 +02:00
Daniel Maya a1dbf7b780 Added macro
Former-commit-id: 08c46875bb09eafde6ebc2f4b526fe4c7bbf944e
2019-04-24 13:40:37 +02:00
marcos.alconada 8ce3aa0b93 Se añade el valor a assigned by con el usuario de configuracion global
Former-commit-id: f7dd22b99d8518210abc6455888c2c98270ad6e4
2019-04-24 13:31:43 +02:00
fbsanchez fc40518e65 minor fix in task description (Discovery.cloud.aws.rds)
Former-commit-id: 1c32a684edddc17eef5a4bb5260a148632767efb
2019-04-24 13:29:18 +02:00
Tatiana Llorente 5f729ef314 Changed success icon - #3608
Former-commit-id: 8e472206f96c7ea78184c330c57f4f79dc2556b6
2019-04-24 13:01:29 +02:00
Alejandro Fraguas cec4bb49ff Merge branch 'ent-3705-borrado-completo-de-la-carpeta-colecciones-nodo-metaconsola' into 'develop'
Fixed filemanager uploading on meta

See merge request artica/pandorafms!2377

Former-commit-id: 847cb1daefac473ab92d3e326257428e8cd9880a
2019-04-24 12:58:17 +02:00
Tatiana Llorente 8aa1737d23 New style for update manager online Open Version - #3608
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
Alejandro Gallardo Escobar 177b4c7246 VIsual Console Refactor: now the items use the legacy style for the labels
Former-commit-id: b8adbb11c6b51924413c346d9fe2c93ea9842340
2019-04-24 12:43:37 +02:00
marcos.alconada e7995b988e Se arregla nombre de la funcion insert
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
2019-04-24 12:37:21 +02:00
alejandro-campos 7433d52130 change way to print discovery simple multiple inputs
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
marcos.alconada 062a68fdaf Ultimas modificaciones
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
manuel 9e0748e718 Added changes in pandoradb.sql
Former-commit-id: 30f4d7bdc303c6ddd2ac6933872faa5f05de58b5
2019-04-24 11:19:27 +02:00
Daniel Maya dcdb8c3aa9 Fixed default size in EventHistory
Former-commit-id: 287ab0803651b6a417e6e28a948b55b0afe8a352
2019-04-24 11:15:11 +02:00
Luis Calvo a5e80f5070 Fixed filemanager uploading on meta
Former-commit-id: e3c4b6150e70c589763a50a7e3bac6175997dd17
2019-04-24 11:12:26 +02:00
manuel c075d5caad Added condition type not normal in alert templates
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
fbsanchez 273a475238 Merge branch 'fix/discovery' into 'develop'
Updated discovery task selector

See merge request artica/pandorafms!2375

Former-commit-id: b9a2a048179cb9d98664136b4b2d4974718426ec
2019-04-24 10:15:28 +02:00
artica 8bba24e13a Updated version and build strings.
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
fbsanchez f116bfc3fd Updated discovery task selector
Former-commit-id: dc692cd11f2bd81dcb7d4dea57954d77562ef561
2019-04-24 10:10:08 +02:00
marcos.alconada f960e9037d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: 9b7c696afb0860fb738d52e18668c80e634efbf5
2019-04-24 09:28:04 +02:00
artica 4a699c2b75 Auto-updated build strings.
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +02:00
marcos.alconada 6ef28a9b27 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: ca272bd529c0bc2182bbcc476f82bcfcf42175ed
2019-04-23 17:56:22 +02:00
Alejandro Fraguas 194f4400f7 Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
Ent 3647 revision estilos discovery con la nueva linea de estilos

See merge request artica/pandorafms!2370

Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
Alejandro Gallardo Escobar 0a70e49792 Visual Console Refactor: finished the default sizing for the elements which use icons
Former-commit-id: b8504d22eecdaeee8ac64a2d008ff847c07aa4d2
2019-04-23 17:44:18 +02:00
marcos.alconada 2bafba0764 Se añade el contenido del fichero borrado
Former-commit-id: 9d2e8a9d873bd70549bf4bb1a6a9f7318dc4f36a
2019-04-23 17:40:49 +02:00
Alejandro Gallardo Escobar c0b324b25a Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 7a79252ca00ae8b9c695b4799a365c440b63d574
2019-04-23 17:29:59 +02:00
Daniel Maya c910c94c7f Fixed height and width in icon, group and staticgraph
Former-commit-id: 03a8147ba5a8897acf91aa9265fb62e7fab7e517
2019-04-23 16:53:18 +02:00
alejandro-campos 92da84c47f fix bug in discovery progress popups
Former-commit-id: 756f4b002db192794a09d0b15f5b6e3a2daf8731
2019-04-23 16:40:08 +02:00
fbsanchez 74234e30a9 Merge branch 'fix/discovery3-oracle' into 'develop'
minor update

See merge request artica/pandorafms!2374

Former-commit-id: 97e6bb47208ccce8eb66fb4ca0c7e3be35b41b95
2019-04-23 16:36:13 +02:00
fbsanchez bbedf36235 minor update
Former-commit-id: da7ef108bd3b71ece515407fb932e6b9bef761fd
2019-04-23 16:28:22 +02:00
Alejandro Gallardo Escobar cb6b8531df Visual Console Refactor: minor fix
Former-commit-id: c055042c1cf3b4181a146857f159d656b9c5ed3f
2019-04-23 16:23:32 +02:00
manuel 569c84ad05 Show contact in events information
Former-commit-id: 5fd33a7b3abbcef12d8d26ff5d2e6ea14f17a44e
2019-04-23 16:10:51 +02:00
Daniel Maya 5e3f3500c4 Added status group in metaconsole
Former-commit-id: cb1dcf221012f25c72ebcc0238475f5db1241835
2019-04-23 15:40:54 +02:00
marcos.alconada 8987a60755 restauro functions api
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
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
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
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
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
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 e9af2b6a1e Breadcrum fix do not rollback...
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
2019-04-22 10:45:07 +02:00
marcos.alconada 014aaffc0d Se normaliza codigo
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
Alejandro Gallardo Escobar 37c562f210 Visual Console Refactor: fixed some items
Former-commit-id: dbe93abb76ffb1e6e82492b8f2be380bc422bb3d
2019-04-22 10:05:54 +02:00
Alejandro Gallardo Escobar a03245a277 Visual Console Refactor: fixed the visual console background on the meta
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
2019-04-22 09:40:08 +02:00
fbsanchez 8978b49a8b minor fix while setting node_radius by default
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
2019-04-22 09:33:51 +02:00
marcos.alconada dc086463ee Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: 079b5bccc12df71ccc2bb8642e6edf34c17724ca
2019-04-22 09:20:31 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
artica ea7a8b2b90 Auto-updated build strings.
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
2019-04-21 00:01:29 +02:00
artica 1dfda59ce6 Auto-updated build strings.
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
2019-04-20 00:01:24 +02:00
artica 7283d87a17 Auto-updated build strings.
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
2019-04-19 00:01:25 +02:00
artica 9d8e2abd98 Auto-updated build strings.
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
2019-04-18 00:01:27 +02:00
marcos.alconada 732b3e83d4 Se añaden las modificaciones
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
marcos.alconada 6f709cbae3 Retoque en api php
Former-commit-id: 46f5c90f6715083afb22c757e1e45a00c0f4381a
2019-04-17 17:28:48 +02:00
marcos.alconada ad4dfc7624 Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
Alejandro Gallardo Escobar 7608eb86c7 Visual Console Refactor: added all the percentile types
Former-commit-id: 0779585b488a1be47aeef6d5628693a930ab9aa4
2019-04-17 17:09:11 +02:00
Alejandro Gallardo Escobar 30f5c97610 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 358c210cdc36b162f7337258d87f9609be39ef5a
2019-04-17 15:58:19 +02:00
Alejandro Gallardo Escobar c9076aa85e Visual Console Refactor: bugfixes
Former-commit-id: d5f194be2d9e201cdcc3c7cafbd64b6a1149ae7d
2019-04-17 15:58:07 +02:00
Daniel Maya 806310d8d1 Fixed StaticGraph
Former-commit-id: 512635353ed672969ca4d13859ce073370115a7b
2019-04-17 15:39:55 +02:00
marcos.alconada fb87b97cd4 Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
marcos.alconada 51541c8d2c Atucalizacion de rama
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
Alejandro Gallardo Escobar 161bf4c079 Visual Console Refactor: fixed the clock date
Former-commit-id: 6864b784b4353b63e152d709627f0ab2c0d0205b
2019-04-17 14:17:26 +02:00
Alejandro Gallardo Escobar 0911a00fe9 Visual Console Refactor: fixes
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
2019-04-17 13:50:53 +02:00
Tatiana Llorente aa34cf17be Fixed header missing in table alert status - #3707
Former-commit-id: 900b4023316d9e4946a8f81871e19f7f897a7a8f
2019-04-17 12:57:45 +02:00
marcos.alconada d2d8a3b0ba solucion problema merge
Former-commit-id: 0ddc396a3f8168b5cea65484502f00ff6178c6df
2019-04-17 12:53:50 +02:00
Alejandro Gallardo Escobar 513fcaf107 Visual Console Refactor: bugfix
Former-commit-id: a46113397b3eb94e09fefd3a94da8a75c8b47574
2019-04-17 12:52:29 +02:00
Alejandro Gallardo Escobar 1a705c169b Visual Console Refactor: minor fix
Former-commit-id: 4e9045dd4f00b78bc63eb3d24731c1758b317c9f
2019-04-17 12:49:42 +02:00
marcos.alconada bb7c9d0405 Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into develop
Former-commit-id: 68a549dddd224c96ce4a85607d51a5e32e729b15
2019-04-17 12:49:39 +02:00
marcos.alconada 5de38e204f Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
marcos.alconada 985726d5a2 modificaciones en api.php
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
2019-04-17 12:44:23 +02:00
Alejandro Gallardo Escobar fb53e94250 Visual Console Refactor: minor fix
Former-commit-id: f4754dcf62169e3a65d0b39f99c50fb3181bc812
2019-04-17 12:44:16 +02:00
Alejandro Gallardo Escobar cbf921ba25 Visual Console Refactor: bugfixes
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
2019-04-17 12:32:08 +02:00
Alejandro Gallardo Escobar 683dcf3469 Visual Console Refactor: bugfixes
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
2019-04-17 12:29:38 +02:00
Tatiana Llorente 05261e7924 Changed styles from table database interface - #3904
Former-commit-id: addb71fdbe4a584047230b4aa61c58e0acf25cd4
2019-04-17 11:49:49 +02:00
Daniel Maya 68b3fc0cf0 Added dir visual-console-client
Former-commit-id: 79baadfe00e58394a6ec3213750c61a9145ec0ba
2019-04-17 11:19:01 +02:00
Tatiana Llorente 274c78f647 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
Tatiana Llorente ed3155c053 New View Create/Update Agent - #3611
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
Alejandro Fraguas 6594095de7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
Ent 3707 nuevo diseño para las tablas

See merge request artica/pandorafms!2352

Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
Daniel Maya 8e4ef972d8 Fixed acl item
Former-commit-id: 7e5a7d448524a808fc25fa08bfb17b08e65c77cd
2019-04-17 10:05:01 +02:00
Tatiana Llorente 83cda70e0a Fixed styles of tables within tables with new class - #3707
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
Tatiana Llorente cfff9c065d New View Create/Update Agent - #3611
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
artica ff5a33ba2c Auto-updated build strings.
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
Alejandro Gallardo Escobar a8dfe1acaf Visual Console Refactor: minor fix
Former-commit-id: 67f29813f66ae21e8e1ae2e49a8b8669b355df2d
2019-04-16 19:38:09 +02:00
Alejandro Gallardo Escobar f663bd8389 Visual Console Refactor: minor fixes
Former-commit-id: 028f466f9429488f399551e2d3201439b73ce34e
2019-04-16 18:37:43 +02:00
marcos.alconada 293b025c7f Se elimina error de sintaxis
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
Alejandro Gallardo Escobar d5b83b867b Visual Console Refactor: bugfix
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
marcos.alconada 985fc952e1 actualizacion
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
2019-04-16 16:10:25 +02:00
marcos.alconada 5c2ebf0976 Camprobaciones en local para functiones
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
Alejandro Gallardo Escobar 2952af7f6b VIsual Console Refactor: bugfix
Former-commit-id: f0603f3512dbb224f11d628600857a4b9dbb9f9b
2019-04-16 16:06:56 +02:00
marcos.alconada 31aa5b6d67 Comprobaciones en local
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06:17 +02:00
Alejandro Gallardo Escobar 7acee06a00 Visual Console Refactor: bug fix
Former-commit-id: a2a05a2129873fdb6b2325211c490ad8f9263b16
2019-04-16 15:04:54 +02:00
Alejandro Gallardo Escobar a44d67a733 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 18d39f1b4ffbd3e56a3b1a879abf8bdf4ec6dead
2019-04-16 12:24:56 +02:00
Alejandro Gallardo Escobar 998a66f654 Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
2019-04-16 12:23:03 +02:00
Daniel Maya 9be6029e1a Fixed Line class
Former-commit-id: 639649f4d65340ff25ecc1e956298705f5d13a05
2019-04-16 12:18:53 +02:00
Alejandro Gallardo Escobar fa1bf821e2 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 7331c64930125848041ead739feb72c0f67afbb2
2019-04-16 09:49:55 +02:00
Alejandro Gallardo Escobar 8f48deca14 Visual Console Refactor: removed the html entities from the main model data output
Former-commit-id: c8dfcdd77c7138a6644a3e785f652619bd4b852c
2019-04-16 09:49:50 +02:00
Daniel Barbero Martin 5f4bc3a7e4 fixed union line parent with child when type image
Former-commit-id: ae80e3067fe8600c7e65eac0b35c7a3c16d03be5
2019-04-16 09:41:17 +02:00
marcos.alconada 83934100ef change api
Former-commit-id: 064e8e8cdc1fae50424ca6a1796b27490970c084
2019-04-16 09:24:11 +02:00
artica 8bf92720ee Auto-updated build strings.
Former-commit-id: 544097161030608395112a142ed341e26700a678
2019-04-16 00:01:30 +02:00
Daniel Rodriguez 7c8b1fcf27 Merge branch 'ent-3625-Aviso-No-acceso-a-página' into 'develop'
Ent 3625 aviso no acceso a página

See merge request artica/pandorafms!2357

Former-commit-id: 7e4824a223e85f73b02bf6b85c37a83dc137979b
2019-04-15 18:32:54 +02:00
manuel 2aa746694a Fixed bug in monitor detail view
Former-commit-id: f862f5d59966d1ef7e7aa5d2a7bb2ebc5bdf93a9
2019-04-15 17:55:25 +02:00
marcos.alconada e9fee71078 Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: e12c3e1ad1b695745a506375ab62033ababc5800
2019-04-15 17:53:31 +02:00
Marcos Alconada bda67d56c4 Update functions_api.php
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
2019-04-15 17:49:10 +02:00
marcos.alconada 86ff1accbd Sintax problems resolved on Api.php
Former-commit-id: e42cbd99938e57abad1ea4e9c76ddeedb9e0cc01
2019-04-15 17:18:16 +02:00
marcos.alconada 28eae48a9e Changed sintaxis
Former-commit-id: 4011dbcba98ad59e7a152e2e3e87c6ae8d646a85
2019-04-15 15:51:01 +02:00
Marcos Alconada 8c27411be6 Delete plugin.php
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
2019-04-15 15:18:22 +02:00
Daniel Barbero Martin 55def97d66 Add ACL for all item and item groups, fixed minor error show elements type item groups in VC
Former-commit-id: 04e1d5736dbfd0da47df7d3948969621b2c8faf1
2019-04-15 15:10:58 +02:00
marcos.alconada a3787c687c prueba
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
2019-04-15 15:10:43 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
2019-04-15 14:42:58 +02:00
Tatiana Llorente a930d15d44 New style for modal window Show More - #3613
Former-commit-id: 3855d8463e3ba6709ec111c867d0534c704db1a7
2019-04-15 13:15:11 +02:00
Tatiana Llorente 0b352860cf New style for modal window Show More - #3613
Former-commit-id: 61cb4c99ef4f586cfdf07df5262c789cdee75915
2019-04-15 13:11:58 +02:00
fbsanchez 072fec3dd1 removed map link from mysql/oracle/RDS discovery tasks
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
2019-04-15 13:03:11 +02:00
fbsanchez 6648e0268a removed reconview link from menu
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
2019-04-15 12:54:22 +02:00
Marcos Alconada c8af83b112 Update with validations and type return data functions_api.php
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
2019-04-15 12:30:42 +02:00
marcos.alconada 994424fe52 Functions changed
Former-commit-id: 7eb0fb25ec863df6c60ed88bf84a6f5db5c90979
2019-04-15 12:19:35 +02:00
vgilc f3590e1d54 Merge branch 'ent-3792_spec_console_enterprise_for_rhel7' into 'develop'
fixed minor bug in the open spec

See merge request artica/pandorafms!2356

Former-commit-id: e5a73f169ba8044a94b25b27d99cf384785221e5
2019-04-15 11:33:42 +02:00
Daniel Rodriguez 3e15b77095 Merge branch 'ent-3790-sobra-una-columna-de-tnetflow_filter' into 'develop'
Ent 3790 sobra una columna de tnetflow filter

See merge request artica/pandorafms!2313

Former-commit-id: 31e8399658450e3f0ac4bd591f7eee631b3ba937
2019-04-15 11:22:28 +02:00
Rafael Ameijeiras eca7f6e53a fixed minor bug in the open spec
Former-commit-id: 0d8aacf0d4e7ae6199d103e62b6a6a8891c3a0f2
2019-04-15 11:20:57 +02:00
Marcos Alconada d3d5312f40 Update 27.sql
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
2019-04-15 11:14:41 +02:00
artica 68258661b1 Auto-updated build strings.
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00
artica d0f6726d00 Auto-updated build strings.
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
2019-04-14 00:01:23 +02:00
artica ef0f7cded8 Auto-updated build strings.
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
2019-04-13 00:01:31 +02:00
fbsanchez 45c9f6d51c Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
2019-04-12 19:24:27 +02:00
fbsanchez fa6529b652 Merge remote-tracking branch 'origin/develop' into ent-3792-spec_console_enterprise_for_rhel7
Former-commit-id: 8c7e1f5f4aad250e01931a420f8da8819817152f
2019-04-12 19:18:15 +02:00
Alejandro Gallardo Escobar 2bd88e858d Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
2019-04-12 14:28:20 +02:00
Alejandro Gallardo Escobar 2bf49e43cc Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: c409495771d58549575f68c52da38d2510f4f653
2019-04-12 14:24:49 +02:00
Alejandro Gallardo Escobar a82143d72b Visual Console Refactor: improved the refresh management
Former-commit-id: d69eccbb2e06dfe70823d1bb1485f349a23089fe
2019-04-12 14:23:33 +02:00
Daniel Barbero Martin 3ae6423fc9 Add ACL for item vc
Former-commit-id: 7356f08a79378ada1df07ead930fcc01b84ba79c
2019-04-12 13:59:19 +02:00
Tatiana Llorente 6a9c972ed6 Changed popup no access - #3625
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
2019-04-12 13:54:48 +02:00
Alejandro Gallardo Escobar e6741067ff Visual Console Refactor: fixed the tab links from the main view
Former-commit-id: e3993cedba972d4c163f2eec7228f8748a137cec
2019-04-12 13:23:38 +02:00
marcos.alconada 3dafe2d66d changed querys and refactor methods
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
2019-04-12 13:20:59 +02:00
Alejandro Gallardo Escobar 0fe9c57e51 Visual Console Refactor: now the public view is updated on VC update
Former-commit-id: 9382876893e56f893d92636742905e171766b060
2019-04-12 13:17:33 +02:00
Alejandro Gallardo Escobar dc4396622d Visual Console Refactor: acl improvements
Former-commit-id: f2cd4e7dd12a02eb4cee34f5947566ae37c35e9d
2019-04-12 13:12:12 +02:00
Daniel Rodriguez 9da83faade Merge branch 'ent-3806-Nuevo_mapa_Edicion_usuario' into 'develop'
add map user edit

See merge request artica/pandorafms!2349

Former-commit-id: 921eb0faff704e17f26024ab2add32f53e151df7
2019-04-12 13:11:27 +02:00
Alejandro Gallardo Escobar 75d0e11dac Visual Console Refactor: fixed some image urls to load them from the public view
Former-commit-id: 833a5529304b343ac22a0d054ced47d48667c306
2019-04-12 13:03:10 +02:00
Daniel Rodriguez a792128906 Merge branch 'ent-3522-Conservar-perfiles-de-usuarios-standard-en-caso-de-cambio-LDAP/AD' into 'develop'
Added token save profile user

See merge request artica/pandorafms!2343

Former-commit-id: f6558be197626904837589df0a7559df60b2ef3e
2019-04-12 12:53:20 +02:00
Alejandro Gallardo Escobar 3cda4523b4 Visual Console Refactor: now the rest of the view changes when the VC is udpated
Former-commit-id: c2972fa2b6a9177e6ce46efd36e122033fb109c4
2019-04-12 12:44:45 +02:00
Alejandro Gallardo Escobar 89200572b5 Visual Console Refactor: removed the html entities from the VC container data
Former-commit-id: 84698dfa749dcdd9725b5ea944a1562deba8b5e3
2019-04-12 12:43:52 +02:00
Alejandro Gallardo Escobar f7d856f064 Visual Console Refactor: moved the client resources loading to a function
Former-commit-id: 78af6fc129b9e44f3807127df9c05ad284624a7e
2019-04-12 12:43:23 +02:00
Daniel Maya 7ddc4a70f1 Added last value in StaticGraph
Former-commit-id: 1cdf967b8bb05eff14b22684e8960c60d5b1d397
2019-04-12 12:34:25 +02:00
marcos.alconada ddfd3339ff add api
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
marcos.alconada 1e7fb2f375 concatenation
Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78
2019-04-12 11:37:12 +02:00
Alejandro Gallardo Escobar ba713713a7 Visual Console Refactor: fixed the service mode load
Former-commit-id: 01eeb8db96555d5cb7ab1f821787b203d2ab843c
2019-04-12 11:24:08 +02:00
marcos.alconada 2ec72c4d78 Changed query
Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0
2019-04-12 11:10:42 +02:00
Tatiana Llorente b50ed1c810 New arrow and timestamp images - #3707
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
2019-04-12 10:41:55 +02:00
Alejandro Gallardo Escobar f45818ac86 Visual Console Refactor: improved the background updates interval
Former-commit-id: 85acb18e01da36f2d9b15dec46dbc7b83b74156f
2019-04-12 10:32:31 +02:00
marcos.alconada 1b5786aedb Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
2019-04-12 10:32:07 +02:00
Daniel Barbero Martin 26d5060232 fixed errors css
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
Alejandro Gallardo Escobar 5d154eee04 Visual Console Refactor: minor fixes
Former-commit-id: 9959423e5556abe8f3fa2cbcd289a7ca1b5367bd
2019-04-12 10:06:53 +02:00
manuel 61552bc201 Fixed ldap login
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
2019-04-12 10:03:18 +02:00
Alejandro Gallardo Escobar 08ffb3cd2f Visual Console Refactor: fixes
Former-commit-id: 69203c99cd2890830f13fe135a44872f3b19faab
2019-04-12 09:51:53 +02:00
Alejandro Gallardo Escobar a71134fa2d Visual Console Refator: now the background image scales to the VC size
Former-commit-id: aba14a6b903e12239e7b619b22676c6d4b2a5a53
2019-04-12 09:51:26 +02:00
Alejandro Gallardo Escobar 179702979a Visual Console Refactor: added a new way to expose model data
Former-commit-id: 935960e7e21c2a655e9eb38afa04cbf96362aef7
2019-04-12 09:50:39 +02:00
Tatiana Llorente 59c2734b5a Deleted old files. Centered the map. Fixed broken image in meta. - #3806
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
Alejandro Gallardo Escobar 344e46bc4d Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: b7c3bae5c508985e8d4dec830eb8d203bbde5710
2019-04-12 09:15:14 +02:00
Alejandro Gallardo Escobar cbd2b2a50a Visual Console Refactor: fixed the visual console background url
Former-commit-id: b211220f599e14c3e1cb24e7a2840a14f134e395
2019-04-12 09:15:04 +02:00
Daniel Maya b2a333e499 Fixed icon
Former-commit-id: be69bd82397a03899f7941d86c95fc9dfb41ef95
2019-04-12 08:44:16 +02:00
artica f5088299f3 Auto-updated build strings.
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
2019-04-12 00:01:24 +02:00
fermin831 153ba4279e Added secondary groups in global search
Former-commit-id: a569f78754d1f683b1585c235f1f568425c83fad
2019-04-11 16:57:43 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
2019-04-11 15:12:46 +02:00
fbsanchez e998c8dd70 Discovery RDS
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
2019-04-11 15:05:03 +02:00
Rafael Ameijeiras c91893c948 spec console open and build_rpm for rhel7
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
2019-04-11 13:45:57 +02:00
Tatiana Llorente c33a2cfaf6 Change arrow images to sort the table in custom reports - #3707
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00
marcos.alconada 0afc699b2b Add concatenation to user variable in filter user group function
Former-commit-id: 3e1cef1d560309cbfad9670e8e020ca352ac3619
2019-04-11 10:15:00 +02:00
Alejandro Gallardo Escobar 3928a5a523 Visual Console Refactor: added the initial version of the background updates
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
2019-04-11 10:05:28 +02:00
Tatiana Llorente 187bdb1701 New design for the tables - #3707
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
artica 29e1fc828c Auto-updated build strings.
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
2019-04-11 00:01:30 +02:00
fbsanchez 834d5d6c50 WIP:Discovery RDS
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
2019-04-10 20:40:03 +02:00
manuel 0f78d87504 Fixed bug in save profile users
Former-commit-id: 8f79e2c3de0e7cedb581d90e53f39ef176afe040
2019-04-10 16:12:22 +02:00
Daniel Maya 52007832d8 removed refr in view and public_view
Former-commit-id: fbefbf31bcdb0686890077a85dc1e3a032c84b4d
2019-04-10 15:02:37 +02:00
Alejandro Gallardo Escobar 00dbb83cfe Visual Console Refactor: minor fixes
Former-commit-id: e1562bc91ab07db21ae41c4eed6bb8bea0990d62
2019-04-10 11:54:01 +02:00
Daniel Rodriguez 4ab7f2c56f Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' into 'develop'
Ent 3791 7780 cron en modulos no funcionan bien

See merge request artica/pandorafms!2337

Former-commit-id: 2d7e13817fee6c23d271405d48198ab069357e2b
2019-04-10 10:20:35 +02:00
Tatiana Llorente fd7cbf14cd Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
Tatiana Llorente 30c5f2b243 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' of brutus.artica.lan:artica/pandorafms into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 77343765f8b254939406fc320fc64dce86672b6f
2019-04-10 10:09:21 +02:00
Tatiana Llorente 2a37224653 New design for the tables - #3707
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
Alejandro Gallardo Escobar d9271bb249 Visual Console Refactor: minor fix
Former-commit-id: 7a74de908a120dde4176154385a247753f0b4e58
2019-04-10 09:08:22 +02:00
artica 765ca945a0 Auto-updated build strings.
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
2019-04-10 00:01:25 +02:00
fbsanchez e59ce5412c WIP Discovery RDS
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00
Daniel Barbero Martin 0769c61b19 add map user edit
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
2019-04-09 18:18:10 +02:00
Daniel Maya aa01789b19 Added public_view
Former-commit-id: 15e3f67b28771eb56cd61bff56d1f09a4b3eec78
2019-04-09 17:45:21 +02:00
Alejandro Gallardo Escobar a916704fc2 Visual Console Refactor: added access limits to the metaconsole node links
Former-commit-id: a975eb9391ba81f63ede2d3437d0d9d9f6629565
2019-04-09 16:49:41 +02:00
Alejandro Gallardo Escobar 0e74c8f894 Visual Console Refactor: simplified code
Former-commit-id: 5b2f2e91733b99f8c5f18a8e34b7cec18101c242
2019-04-09 16:36:31 +02:00
Alejandro Gallardo Escobar 54c9ac82fd Visual Console Refactor: catching Throwable instead of Exception
Former-commit-id: 34afe6384ebeb54a6384416f8b8116a222dc9069
2019-04-09 16:35:58 +02:00
Alejandro Gallardo Escobar ed0857efad Visual Console Refactor: error fixes
Former-commit-id: ff383a266f4bfd4c5c97ee8a7e067e35d0779d96
2019-04-09 16:06:59 +02:00
Daniel Maya c57b2b7611 Fixed item position and changed visual_console_view name
Former-commit-id: 985ca0cf474667284d60a025ffe1e4c0aa2e7d5a
2019-04-09 15:53:22 +02:00
Alejandro Gallardo Escobar ee8407a73b Visual Console Refactor: added the link generation to the models
Former-commit-id: dc7bb681c9115d8c43ea5fabb7d773ebc358871b
2019-04-09 15:30:08 +02:00
Alejandro Gallardo Escobar e93f24fb13 Visual Console Refactor: minor changes
Former-commit-id: b38ac43330828eee7eed5f2a402234dc6f899e9d
2019-04-09 15:28:58 +02:00
manuel 1efedd26ce Fixed bug in LDAP authentication
Former-commit-id: 4e0b2d46d5bcd71ea63e9d09e7c0d8865735227f
2019-04-09 13:39:30 +02:00
Daniel Rodriguez 5494a6129f Merge branch 'ent-3855-Problemas_grupos_secundarios_en_input_auto_completado_de_modulos' into 'develop'
fixed error autocomplete input module

See merge request artica/pandorafms!2345

Former-commit-id: 76a7c4aa1d611a21b307d0d6367a1f15dc40b323
2019-04-09 13:14:38 +02:00
Daniel Maya e8740b1966 Default value changes in BarsGraph and DonutGraph
Former-commit-id: 57ace29b4cdcd075ddceb146b1344d3e61b2b1dd
2019-04-09 12:41:14 +02:00
Alejandro Gallardo Escobar eabe8ef00a Visual Console Refactor: minor changes
Former-commit-id: 43125220be6ea9cc76ea5b5261fd13c3fcd36d29
2019-04-09 12:24:53 +02:00
Alejandro Gallardo Escobar cb75ec02f9 Visual Console Refactor: minor changes
Former-commit-id: 60dba09bdb9a99e38abd3a4301d9f24db73adc6a
2019-04-09 12:23:46 +02:00
Daniel Maya 4d45ddbf59 Added BarsGraph
Former-commit-id: 5733eb9a27a9da12f9a858dccd0509be3b762328
2019-04-09 12:14:38 +02:00
Daniel Rodriguez c313629080 Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop'
flip flop keep counters

See merge request artica/pandorafms!2308

Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
2019-04-09 12:04:54 +02:00
Alejandro Fraguas 351b7218ee Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop'
Removed unnecesary io_safe_inpunt on   from functions_api.php

See merge request artica/pandorafms!2256

Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
2019-04-09 11:19:10 +02:00
manuel 021fc1dbfd Fixed bug in unlinked modules
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
2019-04-09 10:46:37 +02:00
Luis Calvo bc00a1b3b9 Fixed select bug not selectig value
Former-commit-id: 8c53c1cfd294326123d5efb65af1095ddf35c34c
2019-04-09 10:39:07 +02:00
Daniel Barbero Martin 6585a4736b fixed minor error local companent with keep counters
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
2019-04-09 10:19:51 +02:00
Daniel Barbero Martin 8404450458 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
2019-04-09 09:53:31 +02:00
Daniel Barbero Martin 3e4a7bfdbf fixed error autocomplete input module
Former-commit-id: c9fca2ba51b3b0872d39e658f18c5d3c5e917dbd
2019-04-09 09:51:03 +02:00
artica 0d05d5c842 Auto-updated build strings.
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
2019-04-09 00:01:31 +02:00
Daniel Barbero Martin d5b1ac5565 fixed map IPAM
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
2019-04-08 18:28:27 +02:00
Alejandro Gallardo Escobar 48e9c1466b Visual Console Refactor: fixed some linter errors
Former-commit-id: 728223630dc81243e37057657428646b7f03dc78
2019-04-08 17:16:05 +02:00
Alejandro Gallardo Escobar 86c5ead4e9 Visual Console Refactor: refactored the donut graph model
Former-commit-id: a0dd9abb1473c2f74956509b21e879aea44ce1e2
2019-04-08 17:02:51 +02:00
fbsanchez 79bd37ee5b Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
2019-04-08 16:28:26 +02:00
Daniel Maya cb2be4cd6f Added DonutGraph
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
2019-04-08 16:21:26 +02:00
Alejandro Gallardo Escobar a9c2bb9a31 Visual Console Refactor: added the service model
Former-commit-id: 10b5b99b280a997bdc194a9130b4d53cbf4572dc
2019-04-08 12:37:25 +02:00
Alejandro Gallardo Escobar 986db7e7c2 Visual Console Refactor: added autoload for enterprise models
Former-commit-id: e9f54ebef239348dcb4f96939cd3f1d8269b172c
2019-04-08 12:35:37 +02:00
manuel db13ecbb39 Added token save profile user
Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a
2019-04-08 11:55:58 +02:00
Tatiana Llorente 41ea1a4c66 Fixed minor visual bug - #3707
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
2019-04-08 11:31:27 +02:00
Alejandro Gallardo Escobar f3a848a9b3 Visual Console Refactor: WIP precentile tests
Former-commit-id: 9b2f6a35516084228a2b5d535147bb8157fd6177
2019-04-08 10:31:21 +02:00
Alejandro Gallardo Escobar 4c8736c3a1 Visual Console Refactor: refactored the visual console view
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
2019-04-08 10:31:04 +02:00
Alejandro Gallardo Escobar 6e9aad0634 Visual Console Refactor: refactored the code which fetch the items
Former-commit-id: 509310021f5a2e9f660e06f98aeba426f7e81b56
2019-04-08 10:30:45 +02:00
Alejandro Gallardo Escobar 112f7ab7ed Visual Console Refactor: the group item now passes the tests
Former-commit-id: 2a967ef0a23c02fdb89352df65e8d5380cdd31f7
2019-04-08 10:29:30 +02:00
artica 9fd5d3bf5a Auto-updated build strings.
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
2019-04-08 00:01:23 +02:00
artica d35e9dbaae Auto-updated build strings.
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
2019-04-07 00:01:25 +02:00
artica 1ddb5ebff4 Auto-updated build strings.
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
2019-04-06 00:01:32 +02:00
Daniel Barbero 49d925d96a Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Conflicts:
	pandora_console/extras/mr/27.sql


Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00