Commit Graph

21164 Commits

Author SHA1 Message Date
artica 6de9b4f23e Auto-updated build strings.
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
Alejandro Gallardo Escobar 6feaba0b9d Visual Console: changed the default orientation of the items
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
2019-04-25 18:23:28 +02:00
Daniel Barbero Martin 73c9a0e049 fixed change status WUX
Former-commit-id: 3f557ac0c2d8164bff7c5410b662127d39544f7f
2019-04-25 17:32:43 +02:00
Alejandro Gallardo Escobar f3f5bcecd8 Visual Console Refactor: fixed the module graph element
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
2019-04-25 16:59:24 +02:00
Alejandro Gallardo Escobar af69804708 Improved the background size and the elements order of the Visual Console
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
2019-04-25 16:36:17 +02:00
marcos.alconada da8507c4b4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
2019-04-25 16:05:27 +02:00
Alejandro Gallardo Escobar 08f9a34f23 Visual Console Refactor: bugfix
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
2019-04-25 14:24:19 +02:00
Alejandro Gallardo Escobar 2d9b4908de Visual Console Refactor: the legacy visual console is enabled by default
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar 0bd276bc88 Visual Console Refactor: bugfix
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
2019-04-25 14:02:30 +02:00
Daniel Rodriguez 3b03b6fa10 Merge branch 'visual-console-refactor' into 'develop'
Visual console refactor

See merge request artica/pandorafms!2348

Former-commit-id: 6a257514f7a5487b84a1cb35514899e1ef6f11e8
2019-04-25 11:27:49 +02:00
Alejandro Gallardo Escobar 7d95151a5b Visual Console Refactor: minor fixes
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
2019-04-25 10:57:25 +02:00
Daniel Maya 260a149668 fixed include_once in items
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
2019-04-25 10:37:11 +02:00
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 fbd8937cd3 Merge remote-tracking branch 'origin/develop' into visual-console-phase-2
Former-commit-id: d79ca27527b9f3662617f8cfd641a55a8272b3b8
2019-04-25 10:09:45 +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
marcos.alconada 87ff7b3d4e Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Former-commit-id: 2c3deaf32137b14caa9b714148808922a169f937
2019-04-25 09:37:14 +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 4a9928bb66 Visual Console Refactor: bugfix
Former-commit-id: 244b1182e3b4a3a6b164a7f18deda7747dd81481
2019-04-25 09:13:06 +02:00
artica 7f7a727c21 Auto-updated build strings.
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
Daniel Barbero Martin 596e760454 fixed error secondary groups
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
2019-04-24 17:28:55 +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
Daniel Rodriguez 29503e45b0 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas_3' into 'develop'
Fixed pagination in modal window to create dashboard - #3707

See merge request artica/pandorafms!2382

Former-commit-id: 56e8cda61ce0892fd50a68d53068fb3f25c54ea6
2019-04-24 17:00:14 +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
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
Daniel Barbero Martin ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +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
Ramon Novoa a49eaf90f6 Add support for 'not_normal' alert templates.
Former-commit-id: f9bf95bd64f399badcd5f00b80921255f4642a8c
2019-04-24 12:50:42 +02:00