Commit Graph
676 Commits
Author SHA1 Message Date
Matias 7a8757bbda Merge remote-tracking branch 'origin/develop' into develop 2019-04-15 10:07:06 -03:00
benme 43c1248220 Merge pull request #20 from AAMasters/develop
Logo bug
2019-04-11 23:40:27 +02:00
Luis Fernando Molina 0cc643739d Logo Name Capitalized 2019-04-11 23:15:51 +02:00
Luis Fernando Molina 9a0bcfec0d Logo name renamed 2019-04-11 23:15:28 +02:00
benme c4f34a340d Merge pull request #19 from AAMasters/develop
Canvas App ImprovementsDevelop
2019-04-11 21:37:58 +02:00
Luis Fernando Molina 06abedc87c Merge remote-tracking branch 'upstream/develop' into develop 2019-04-11 21:32:24 +02:00
Luis Fernando Molina 503d48b924 Script Removed 2019-04-11 14:18:57 +02:00
benme ae1236e06d Merge pull request #18 from AAMasters/develop
New Version Canvas App with x Scaling
2019-04-11 10:23:24 +02:00
Luis Fernando Molina 796d0291a5 Merge remote-tracking branch 'upstream/develop' into develop 2019-04-11 03:10:04 +02:00
Luis Fernando Molina 0479e7bcad TIme Scale added 2019-04-11 02:09:20 +02:00
benme 365b6122e5 Merge pull request #17 from AAVikings/develop
Fixing simulator copy
2019-04-10 14:59:48 +02:00
Matias 619f49c50f Fixing simulator copy 2019-04-10 14:59:21 +02:00
Matias b7a30dc476 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-04-10 11:06:06 +02:00
benme bba247e342 Merge pull request #16 from AAVikings/develop
Fixing create and delete teams
2019-04-10 10:03:34 +02:00
Matias 3bef93ed45 Fixing create and delete teams 2019-04-10 10:02:57 +02:00
Matias 34fe118ecc Merge remote-tracking branch 'Superalgos/develop' into develop 2019-04-10 00:51:06 +02:00
benme 3151f9d231 Merge pull request #15 from AAVikings/develop
Fixing minio integration
2019-04-10 00:50:52 +02:00
Matias 0368c94700 Fixing minio integration 2019-04-10 00:50:29 +02:00
benme 4d0d38df32 Merge pull request #14 from AAVikings/develop
Removing async azure lib
2019-04-10 00:15:26 +02:00
Matias 513b2a8ed2 Removing async azure lib 2019-04-10 00:14:16 +02:00
benme e7d2bac4b2 Merge pull request #13 from AAMasters/develop
Bug corrected, charts not loading
2019-04-09 16:07:29 +02:00
Luis Fernando Molina a0c2f40d47 Merge remote-tracking branch 'upstream/develop' into develop 2019-04-09 15:59:30 +02:00
Luis Fernando Molina a44115bad3 new FileStorage script 2019-04-09 15:59:09 +02:00
Matias 64572cf98b Merge remote-tracking branch 'origin/develop' into develop 2019-04-09 14:00:45 +02:00
Matias b551bc4922 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-04-09 14:00:06 +02:00
benme c5dbccca5e Merge pull request #12 from AAMasters/develop
Minio Implemented
2019-04-09 11:33:39 +02:00
Luis Fernando Molina f66086a35a Merge remote-tracking branch 'upstream/develop' into develop 2019-04-09 08:53:12 +02:00
Luis Fernando Molina d125a81950 Cleaning Code 2019-04-08 09:18:07 +02:00
Luis Fernando Molina ed7bcb291f Update README.md 2019-04-07 19:00:27 +02:00
Luis Fernando Molina 2a4a9c13fe Final Stage for Minio File Server integration. Tested with the Teams module to create and delete teams. 2019-04-07 14:46:15 +02:00
Luis Fernando Molina a92ccff265 Working with Minio & Azure (missing Team management) 2019-04-06 21:24:06 +02:00
Luis Fernando Molina 32d4444782 First Batch of changes to support Minio together with Azure as File Providers 2019-04-06 16:28:01 +02:00
Matias 01752c368a Merge remote-tracking branch 'Superalgos/develop' into develop 2019-04-06 11:06:30 +02:00
benme 7270a52590 Merge pull request #11 from AAMasters/develop
MQService library updated
2019-04-04 16:48:13 +02:00
Luis Fernando Molina 519e4d8ae7 MQService library updated 2019-04-04 16:46:34 +02:00
Matias 3bc99e181f Merge remote-tracking branch 'origin/develop' into develop 2019-04-04 16:39:00 +02:00
benme 1f0b6b0302 Merge pull request #10 from AAMasters/develop
Minio disabled
2019-04-04 16:27:31 +02:00
Luis Fernando Molina a4274ccf82 Minio disabled 2019-04-04 16:25:54 +02:00
benme 2ff2c7fb22 Merge pull request #9 from AAMasters/develop
Coss
2019-04-04 15:28:09 +02:00
Luis Fernando Molina 0c23ecda34 Merge remote-tracking branch 'upstream/develop' into Minio 2019-04-02 23:35:58 +02:00
Luis Fernando Molina 71306f5c09 Coss Logo 2019-04-02 23:35:00 +02:00
Matias f2186a3139 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 14:24:31 +01:00
benme b82413bc14 Merge pull request #8 from AAVikings/develop
Fixing data dependency type
2019-03-27 14:24:25 +01:00
Matias 8f799dc4cb Fixing data dependency type 2019-03-27 14:23:43 +01:00
Matias a7c5c6dcac Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 14:23:28 +01:00
benme 65bd6a3366 Merge pull request #7 from AAVikings/develop
Fixing bot name
2019-03-27 13:37:16 +01:00
Matias bb0e37ac6e Fixing bot name 2019-03-27 13:36:46 +01:00
Matias 602bede039 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 13:36:23 +01:00
benme 3cff2a9a5e Merge pull request #6 from AAVikings/develop
Fixing dependencies copy
2019-03-27 13:33:22 +01:00
Matias d32ddce03b Fixing dependencies copy 2019-03-27 13:32:46 +01:00