Commit Graph

10558 Commits

Author SHA1 Message Date
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 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
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
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
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 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
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
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
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
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
artica 8bba24e13a Updated version and build strings.
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
artica 4a699c2b75 Auto-updated build strings.
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +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
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
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
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
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
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 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