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
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
a1dbf7b780
Added macro
...
Former-commit-id: 08c46875bb09eafde6ebc2f4b526fe4c7bbf944e
2019-04-24 13:40:37 +02:00
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
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
8aa1737d23
New style for update manager online Open Version - #3608
...
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
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
e7995b988e
Se arregla nombre de la funcion insert
...
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
2019-04-24 12:37:21 +02:00
7433d52130
change way to print discovery simple multiple inputs
...
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
062a68fdaf
Ultimas modificaciones
...
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
dcdb8c3aa9
Fixed default size in EventHistory
...
Former-commit-id: 287ab0803651b6a417e6e28a948b55b0afe8a352
2019-04-24 11:15:11 +02:00
a5e80f5070
Fixed filemanager uploading on meta
...
Former-commit-id: e3c4b6150e70c589763a50a7e3bac6175997dd17
2019-04-24 11:12:26 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
8bba24e13a
Updated version and build strings.
...
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
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
4a699c2b75
Auto-updated build strings.
...
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +02:00
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
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
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
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
c910c94c7f
Fixed height and width in icon, group and staticgraph
...
Former-commit-id: 03a8147ba5a8897acf91aa9265fb62e7fab7e517
2019-04-23 16:53:18 +02:00
92da84c47f
fix bug in discovery progress popups
...
Former-commit-id: 756f4b002db192794a09d0b15f5b6e3a2daf8731
2019-04-23 16:40:08 +02:00
cb6b8531df
Visual Console Refactor: minor fix
...
Former-commit-id: c055042c1cf3b4181a146857f159d656b9c5ed3f
2019-04-23 16:23:32 +02:00
569c84ad05
Show contact in events information
...
Former-commit-id: 5fd33a7b3abbcef12d8d26ff5d2e6ea14f17a44e
2019-04-23 16:10:51 +02:00
5e3f3500c4
Added status group in metaconsole
...
Former-commit-id: cb1dcf221012f25c72ebcc0238475f5db1241835
2019-04-23 15:40:54 +02:00
8987a60755
restauro functions api
...
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
58d2abbdae
restauro api
...
Former-commit-id: de9d1588e0e8ef53b48b72d52597963b59aee11f
2019-04-23 15:37:54 +02:00
daa627441a
Removed some linter errors
...
Former-commit-id: 7dfda1ad66f676059145e7ab34485798dc9c5264
2019-04-23 15:09:57 +02:00
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
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
2f397b16df
Visual Console Refactor: minor fix
...
Former-commit-id: 0cf70df7d8c45285fb612bc09871d52f0dfdcfb7
2019-04-23 13:16:33 +02:00
f4ff73bee1
Visual Console Refactor: minor fix
...
Former-commit-id: cf4201fd61ffb61957b54277d9195bae5935aa3b
2019-04-23 13:00:52 +02:00
57d66e95ce
minor fix
...
Former-commit-id: 17cf4ce929b52904ea8c6120b3c36f859694211e
2019-04-23 12:20:12 +02:00
f124612ba1
Visual Console Refactor: bugfix
...
Former-commit-id: 698a3aa603ffe93c70edf52517fc5def21da52ba
2019-04-23 11:41:50 +02:00
c461825a27
Visual Console Refactor: some parameters aren't required anymore
...
Former-commit-id: 3788b8dc8c055a04a627bf99e12ab30420d54351
2019-04-23 11:40:45 +02:00
3a3c62a855
Visual Console Refactor: added a pair of comment lines
...
Former-commit-id: dc2237e31753b212ce268d5a6901723ffb5a7528
2019-04-23 11:36:46 +02:00
404fb19e35
Fixed status of staticgraph in metaconsole
...
Former-commit-id: cf0b32c2c7cafaca8f4463d46d67c25c7a81fdc2
2019-04-23 10:54:43 +02:00
d6bd44d1c0
Visual Console Refactor: bugfixes
...
Former-commit-id: 09c2b268fd179f81f3041be774f199abe088b4f3
2019-04-23 09:56:02 +02:00
8fc5951209
Visual Console Refactor: fixed the group link
...
Former-commit-id: c3982381f65e2b4e805546c218ef7ec5e83c2685
2019-04-23 09:43:44 +02:00
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
883f3decb4
Auto-updated build strings.
...
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
2019-04-23 00:01:09 +02:00
01d1fb1c11
fixed visual bug
...
Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
2019-04-22 18:17:39 +02:00
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
58a601b0f1
Fixed id_tagente in metaconsole
...
Former-commit-id: 72ea89dfe6eff0892adaaa4a077a99ddfa0fa4d4
2019-04-22 17:44:27 +02:00
713212a435
Fixed html group
...
Former-commit-id: a7b9fdccad8d62783ef2a547a72cc86d5ebc7f46
2019-04-22 17:39:57 +02:00
d4eca50996
Visual Console Refactor: bundle upgrade
...
Former-commit-id: 6e54f465ae1ec8b775e4050bfc5ba1abdce1dc39
2019-04-22 17:01:01 +02:00
ac3fac01c0
Visual Console Refactor: rebuilded the bundles
...
Former-commit-id: 4c06bc90af1bfda72b67f86c2794dd6701f39f1d
2019-04-22 15:10:13 +02:00
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
06756d0769
Visual Console Refactor: fixes and improvements
...
Former-commit-id: 5083315ebb9690aa946b9ea8452def592f2a8ac5
2019-04-22 15:04:34 +02:00
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
74d91b0814
Changed vc.main js
...
Former-commit-id: fcc4005f70afaa71b97bfc64edca11244cfd0228
2019-04-22 14:57:14 +02:00
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
22ce005e5d
Visual Console Refactor: improvements and fixes
...
Former-commit-id: c1a5f1ca26d719c7ed0291ec611e0e14e8f5c7b4
2019-04-22 13:09:34 +02:00
e79b51e0de
Added show statictics in group
...
Former-commit-id: 2475eff69255412997fd13d0e87d2484156e1046
2019-04-22 12:46:28 +02:00
b93a016f50
Visual Console Refactor: bugfix
...
Former-commit-id: eaef1bbee481e54e96cd55e3b4fef7c5a852e84c
2019-04-22 12:07:48 +02:00
9a186fcb8f
Visual Console Refactor: bugfix
...
Former-commit-id: 8243195bd4ed0d4247983c510ed81d5b415915e8
2019-04-22 10:58:01 +02:00
014aaffc0d
Se normaliza codigo
...
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
37c562f210
Visual Console Refactor: fixed some items
...
Former-commit-id: dbe93abb76ffb1e6e82492b8f2be380bc422bb3d
2019-04-22 10:05:54 +02:00
a03245a277
Visual Console Refactor: fixed the visual console background on the meta
...
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
2019-04-22 09:40:08 +02:00
8978b49a8b
minor fix while setting node_radius by default
...
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
2019-04-22 09:33:51 +02:00
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
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
ea7a8b2b90
Auto-updated build strings.
...
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
2019-04-21 00:01:29 +02:00
1dfda59ce6
Auto-updated build strings.
...
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
2019-04-20 00:01:24 +02:00
7283d87a17
Auto-updated build strings.
...
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
2019-04-19 00:01:25 +02:00
9d8e2abd98
Auto-updated build strings.
...
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
2019-04-18 00:01:27 +02:00
732b3e83d4
Se añaden las modificaciones
...
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
6f709cbae3
Retoque en api php
...
Former-commit-id: 46f5c90f6715083afb22c757e1e45a00c0f4381a
2019-04-17 17:28:48 +02:00
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
7608eb86c7
Visual Console Refactor: added all the percentile types
...
Former-commit-id: 0779585b488a1be47aeef6d5628693a930ab9aa4
2019-04-17 17:09:11 +02:00
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
c9076aa85e
Visual Console Refactor: bugfixes
...
Former-commit-id: d5f194be2d9e201cdcc3c7cafbd64b6a1149ae7d
2019-04-17 15:58:07 +02:00
806310d8d1
Fixed StaticGraph
...
Former-commit-id: 512635353ed672969ca4d13859ce073370115a7b
2019-04-17 15:39:55 +02:00
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
51541c8d2c
Atucalizacion de rama
...
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
161bf4c079
Visual Console Refactor: fixed the clock date
...
Former-commit-id: 6864b784b4353b63e152d709627f0ab2c0d0205b
2019-04-17 14:17:26 +02:00
0911a00fe9
Visual Console Refactor: fixes
...
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
2019-04-17 13:50:53 +02:00
d2d8a3b0ba
solucion problema merge
...
Former-commit-id: 0ddc396a3f8168b5cea65484502f00ff6178c6df
2019-04-17 12:53:50 +02:00
513fcaf107
Visual Console Refactor: bugfix
...
Former-commit-id: a46113397b3eb94e09fefd3a94da8a75c8b47574
2019-04-17 12:52:29 +02:00
1a705c169b
Visual Console Refactor: minor fix
...
Former-commit-id: 4e9045dd4f00b78bc63eb3d24731c1758b317c9f
2019-04-17 12:49:42 +02:00
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
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
985726d5a2
modificaciones en api.php
...
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
2019-04-17 12:44:23 +02:00
fb53e94250
Visual Console Refactor: minor fix
...
Former-commit-id: f4754dcf62169e3a65d0b39f99c50fb3181bc812
2019-04-17 12:44:16 +02:00
cbf921ba25
Visual Console Refactor: bugfixes
...
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
2019-04-17 12:32:08 +02:00
683dcf3469
Visual Console Refactor: bugfixes
...
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
2019-04-17 12:29:38 +02:00
68b3fc0cf0
Added dir visual-console-client
...
Former-commit-id: 79baadfe00e58394a6ec3213750c61a9145ec0ba
2019-04-17 11:19:01 +02:00
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
ed3155c053
New View Create/Update Agent - #3611
...
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
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
8e4ef972d8
Fixed acl item
...
Former-commit-id: 7e5a7d448524a808fc25fa08bfb17b08e65c77cd
2019-04-17 10:05:01 +02:00
83cda70e0a
Fixed styles of tables within tables with new class - #3707
...
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
cfff9c065d
New View Create/Update Agent - #3611
...
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
ff5a33ba2c
Auto-updated build strings.
...
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
a8dfe1acaf
Visual Console Refactor: minor fix
...
Former-commit-id: 67f29813f66ae21e8e1ae2e49a8b8669b355df2d
2019-04-16 19:38:09 +02:00
f663bd8389
Visual Console Refactor: minor fixes
...
Former-commit-id: 028f466f9429488f399551e2d3201439b73ce34e
2019-04-16 18:37:43 +02:00
293b025c7f
Se elimina error de sintaxis
...
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
985fc952e1
actualizacion
...
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
2019-04-16 16:10:25 +02:00
5c2ebf0976
Camprobaciones en local para functiones
...
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
2952af7f6b
VIsual Console Refactor: bugfix
...
Former-commit-id: f0603f3512dbb224f11d628600857a4b9dbb9f9b
2019-04-16 16:06:56 +02:00
31aa5b6d67
Comprobaciones en local
...
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06:17 +02:00
7acee06a00
Visual Console Refactor: bug fix
...
Former-commit-id: a2a05a2129873fdb6b2325211c490ad8f9263b16
2019-04-16 15:04:54 +02:00
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
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
9be6029e1a
Fixed Line class
...
Former-commit-id: 639649f4d65340ff25ecc1e956298705f5d13a05
2019-04-16 12:18:53 +02:00
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
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
5f4bc3a7e4
fixed union line parent with child when type image
...
Former-commit-id: ae80e3067fe8600c7e65eac0b35c7a3c16d03be5
2019-04-16 09:41:17 +02:00
83934100ef
change api
...
Former-commit-id: 064e8e8cdc1fae50424ca6a1796b27490970c084
2019-04-16 09:24:11 +02:00
8bf92720ee
Auto-updated build strings.
...
Former-commit-id: 544097161030608395112a142ed341e26700a678
2019-04-16 00:01:30 +02:00
2aa746694a
Fixed bug in monitor detail view
...
Former-commit-id: f862f5d59966d1ef7e7aa5d2a7bb2ebc5bdf93a9
2019-04-15 17:55:25 +02:00
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
bda67d56c4
Update functions_api.php
...
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
2019-04-15 17:49:10 +02:00
86ff1accbd
Sintax problems resolved on Api.php
...
Former-commit-id: e42cbd99938e57abad1ea4e9c76ddeedb9e0cc01
2019-04-15 17:18:16 +02:00
28eae48a9e
Changed sintaxis
...
Former-commit-id: 4011dbcba98ad59e7a152e2e3e87c6ae8d646a85
2019-04-15 15:51:01 +02:00
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
a930d15d44
New style for modal window Show More - #3613
...
Former-commit-id: 3855d8463e3ba6709ec111c867d0534c704db1a7
2019-04-15 13:15:11 +02:00
0b352860cf
New style for modal window Show More - #3613
...
Former-commit-id: 61cb4c99ef4f586cfdf07df5262c789cdee75915
2019-04-15 13:11:58 +02:00
c8af83b112
Update with validations and type return data functions_api.php
...
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
2019-04-15 12:30:42 +02:00
994424fe52
Functions changed
...
Former-commit-id: 7eb0fb25ec863df6c60ed88bf84a6f5db5c90979
2019-04-15 12:19:35 +02:00
68258661b1
Auto-updated build strings.
...
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00
d0f6726d00
Auto-updated build strings.
...
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
2019-04-14 00:01:23 +02:00
ef0f7cded8
Auto-updated build strings.
...
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
2019-04-13 00:01:31 +02:00
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
2bd88e858d
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
2019-04-12 14:28:20 +02:00
3ae6423fc9
Add ACL for item vc
...
Former-commit-id: 7356f08a79378ada1df07ead930fcc01b84ba79c
2019-04-12 13:59:19 +02:00
3dafe2d66d
changed querys and refactor methods
...
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
2019-04-12 13:20:59 +02:00
dc4396622d
Visual Console Refactor: acl improvements
...
Former-commit-id: f2cd4e7dd12a02eb4cee34f5947566ae37c35e9d
2019-04-12 13:12:12 +02:00
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
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
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
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
f7d856f064
Visual Console Refactor: moved the client resources loading to a function
...
Former-commit-id: 78af6fc129b9e44f3807127df9c05ad284624a7e
2019-04-12 12:43:23 +02:00
7ddc4a70f1
Added last value in StaticGraph
...
Former-commit-id: 1cdf967b8bb05eff14b22684e8960c60d5b1d397
2019-04-12 12:34:25 +02:00
ddfd3339ff
add api
...
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
1e7fb2f375
concatenation
...
Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78
2019-04-12 11:37:12 +02:00
ba713713a7
Visual Console Refactor: fixed the service mode load
...
Former-commit-id: 01eeb8db96555d5cb7ab1f821787b203d2ab843c
2019-04-12 11:24:08 +02:00
2ec72c4d78
Changed query
...
Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0
2019-04-12 11:10:42 +02:00
f45818ac86
Visual Console Refactor: improved the background updates interval
...
Former-commit-id: 85acb18e01da36f2d9b15dec46dbc7b83b74156f
2019-04-12 10:32:31 +02:00
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
5d154eee04
Visual Console Refactor: minor fixes
...
Former-commit-id: 9959423e5556abe8f3fa2cbcd289a7ca1b5367bd
2019-04-12 10:06:53 +02:00
61552bc201
Fixed ldap login
...
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
2019-04-12 10:03:18 +02:00
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
179702979a
Visual Console Refactor: added a new way to expose model data
...
Former-commit-id: 935960e7e21c2a655e9eb38afa04cbf96362aef7
2019-04-12 09:50:39 +02:00
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
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
cbd2b2a50a
Visual Console Refactor: fixed the visual console background url
...
Former-commit-id: b211220f599e14c3e1cb24e7a2840a14f134e395
2019-04-12 09:15:04 +02:00
b2a333e499
Fixed icon
...
Former-commit-id: be69bd82397a03899f7941d86c95fc9dfb41ef95
2019-04-12 08:44:16 +02:00
f5088299f3
Auto-updated build strings.
...
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
2019-04-12 00:01:24 +02:00
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
Alejandro Fraguas
Daniel Maya
marcos.alconada
Tatiana Llorente
Alejandro Gallardo Escobar
alejandro-campos
Luis Calvo
manuel
artica
artica
fbsanchez
Daniel Barbero Martin
Daniel Rodriguez