8dc2644368
Deleted default insert on tevent_response
...
Former-commit-id: 33fb686679fa89afbf0834e1e434739d11bfc4dd
2019-04-29 12:36:37 +02:00
c5c84d7421
Deleted row Integria IMS incident from event on tevent_responoses
...
Former-commit-id: 76e41297003d537f8b0ea74394dd433e71ca2976
2019-04-29 12:32:06 +02:00
24e8d81b43
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: c15ebac07056c99c3c79ae57fa1396ea66d00c04
2019-04-29 09:26:48 +02:00
5d6bd31786
Auto-updated build strings.
...
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
2019-04-29 00:01:06 +02:00
141a042ee2
Auto-updated build strings.
...
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
2019-04-28 00:01:06 +02:00
29b7ddeb6d
Auto-updated build strings.
...
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
2019-04-27 00:01:09 +02:00
cffb469334
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 2883dbe057d3c6063a1d1784c64c85dc49c0713b
2019-04-26 09:44:54 +02:00
6de9b4f23e
Auto-updated build strings.
...
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
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
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
7d95151a5b
Visual Console Refactor: minor fixes
...
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
2019-04-25 10:57:25 +02:00
260a149668
fixed include_once in items
...
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
2019-04-25 10:37:11 +02:00
35d54a7e79
Visual Console Refactor: added missing libs
...
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
2019-04-25 10:30:24 +02:00
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
8ae521b2c4
Visual Console Refactor: added missing libraries
...
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
2019-04-25 10:02:35 +02:00
87ff7b3d4e
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
...
Former-commit-id: 2c3deaf32137b14caa9b714148808922a169f937
2019-04-25 09:37:14 +02:00
3d2bcb3495
Fixed include_once in DonutGraph
...
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
2019-04-25 09:25:19 +02:00
b6d6b05ddb
Visual Console Refactor: upgraded the bundles
...
Former-commit-id: af79177070cbae3c3ff61282332564f8426a544d
2019-04-25 09:13:34 +02:00
4a9928bb66
Visual Console Refactor: bugfix
...
Former-commit-id: 244b1182e3b4a3a6b164a7f18deda7747dd81481
2019-04-25 09:13:06 +02:00
7f7a727c21
Auto-updated build strings.
...
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
48917c565f
Visual Console Refactor: renamed the bundles
...
Former-commit-id: 0f63859b3e2eeeb890ad35779d2119137855fb8a
2019-04-24 17:25:57 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
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
dab4024f24
Visual Console Refactor: fixed the module graph's height
...
Former-commit-id: 9e9bed04904c136450d0831e542bf7bcd6abab14
2019-04-24 16:57:52 +02:00
1624af9af7
Visual Console Refactor: minor fix
...
Former-commit-id: 307e332c77254c5109ebc20cef3cfd18193daf87
2019-04-24 16:57:20 +02:00
ab6658a450
Fixed pagination in modal windows - #3707
...
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
2019-04-24 16:26:50 +02:00
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
1cb15c9404
Visual Console Refactor: fixed the donut graph
...
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
2019-04-24 16:07:46 +02:00
3c2e65a8a5
Visual Console Refactor: added the missing macros to the label
...
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
2019-04-24 15:58:33 +02:00
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
d541eab986
Fixed size in module graph
...
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
2019-04-24 15:40:07 +02:00
313ff93c8c
Fixed pagination in modal window to create dashboard - #3707
...
Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6
2019-04-24 15:38:46 +02:00
8548b82bb4
Visual Studio Refactor: label improvement
...
Former-commit-id: 9fdc162ea454bc09bf08beb3d1ecf5deb775c99c
2019-04-24 14:36:59 +02:00
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
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
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
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
fc40518e65
minor fix in task description (Discovery.cloud.aws.rds)
...
Former-commit-id: 1c32a684edddc17eef5a4bb5260a148632767efb
2019-04-24 13:29:18 +02:00
029445d90b
Visual Console Refactor: added localization to the humanDate function
...
Former-commit-id: 35ebb12a87ad3c39e0883c1eeb00ad03a91905dd
2019-04-24 13:28:14 +02:00
46d7d68585
Visual Console Refactor: changed a function name
...
Former-commit-id: 3adfb5fbdebe495fbd88d53d7ce93bbdf5ce0876
2019-04-24 13:07:51 +02:00
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
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
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
f24a435fac
Visual Console Refactor: changed the ability to select items
...
Former-commit-id: 557102fb8b9b4f3a756572705478f12234b512e2
2019-04-24 12:42:32 +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
marcos.alconada
artica
Daniel Rodriguez
Alejandro Gallardo Escobar
Daniel Maya
Tatiana Llorente
Alejandro Fraguas
fbsanchez
alejandro-campos