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 |
|
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 |
|
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
|
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 |
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 |
|
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 |
|
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 |