Commit Graph

20925 Commits

Author SHA1 Message Date
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
Alejandro Gallardo Escobar 1624af9af7 Visual Console Refactor: minor fix
Former-commit-id: 307e332c77254c5109ebc20cef3cfd18193daf87
2019-04-24 16:57:20 +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
Alejandro Gallardo Escobar 9112b1b685 Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 533fa39e930bbeb2b1510671808503684049cd1c
2019-04-24 15:46:37 +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
Alejandro Gallardo Escobar 8548b82bb4 Visual Studio Refactor: label improvement
Former-commit-id: 9fdc162ea454bc09bf08beb3d1ecf5deb775c99c
2019-04-24 14:36:59 +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
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
fbsanchez ad4fc07492 Merge branch 'fix/discovery' into 'develop'
minor fix in task description (Discovery.cloud.aws.rds)

See merge request artica/pandorafms!2380

Former-commit-id: 129790601ed4f5b8ac70851d4da8aa2b4f29dc78
2019-04-24 13:35:24 +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
Alejandro Gallardo Escobar 029445d90b Visual Console Refactor: added localization to the humanDate function
Former-commit-id: 35ebb12a87ad3c39e0883c1eeb00ad03a91905dd
2019-04-24 13:28:14 +02:00
Alejandro Gallardo Escobar 46d7d68585 Visual Console Refactor: changed a function name
Former-commit-id: 3adfb5fbdebe495fbd88d53d7ce93bbdf5ce0876
2019-04-24 13:07:51 +02:00
Alejandro Gallardo Escobar 4eff6f0cc3 Visual Console Refactor: moved the functions to represent the date and time to the lib
Former-commit-id: 1109e24d0aa03422ba6b3c8c5df5fcedaacdc1ce
2019-04-24 13:06:36 +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
Alejandro Gallardo Escobar f24a435fac Visual Console Refactor: changed the ability to select items
Former-commit-id: 557102fb8b9b4f3a756572705478f12234b512e2
2019-04-24 12:42:32 +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
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
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