tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,822 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

16196 Commits

Author SHA1 Message Date
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
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
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
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
Daniel Maya 404fb19e35 Fixed status of staticgraph in metaconsole 
Former-commit-id: cf0b32c2c7cafaca8f4463d46d67c25c7a81fdc2
 2019-04-23 10:54:43 +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 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
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
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
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