Commit Graph
643 Commits
Author SHA1 Message Date
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
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
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
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
Luis Fernando Molina 9a671c0c5f add new file to solution 2019-03-27 13:28:45 +01:00
Matias 7b5b0a3cf3 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 13:19:29 +01:00
benme dbea80add1 Merge pull request #5 from AAVikings/develop
Adding data dependencies to the simulator
2019-03-27 13:14:37 +01:00
Matias 064dbfb52f Adding data dependencies to the simulator 2019-03-27 13:13:49 +01:00
Matias c077a8798f Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 11:56:03 +01:00
benme 7c4fc27481 Merge pull request #4 from AAVikings/develop
Changing default daily files data dependency config
2019-03-27 10:38:18 +01:00
Matias 67ad17177c Changing default daily files data dependency config 2019-03-27 10:37:27 +01:00
Matias 2ec9d778d2 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-27 10:23:56 +01:00
benme 3246019721 Merge pull request #3 from AAMasters/develop
Bug Fix, missing /@Year/@Month/@Day on Daily Files path when making c…
2019-03-27 08:41:35 +01:00
Luis Fernando Molina 462780a558 Bug Fix, missing /@Year/@Month/@Day on Daily Files path when making compy from the template 2019-03-27 08:28:17 +01:00
benme dcbfca99ca Merge pull request #2 from AAVikings/develop
Fixing Daily files
2019-03-26 19:54:42 +01:00
Matias de26391096 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-26 19:54:06 +01:00
benme 67283adc33 Merge pull request #1 from AAMasters/develop
Execution of Bots in the Browser Functionality Removed
2019-03-26 19:53:31 +01:00
Matias 522f3e2c48 Fixing Daily files 2019-03-26 19:50:57 +01:00
Luis Fernando Molina 4411b31e58 Execution of Bots in the Browser Functionality Removed 2019-03-26 14:19:19 +01:00
Luis Fernando Molina 862e8f8fee Update README.md 2019-03-25 11:30:13 +01:00
Luis Fernando Molina ace2464c21 Update README.md 2019-03-25 11:16:56 +01:00
Luis Fernando Molina b86c55ec97 Saira Font Added 2019-03-22 17:30:48 +01:00
Luis Fernando Molina 50bfcd1af7 Tab Button 2019-03-20 23:40:08 +01:00
Luis Fernando Molina b603638a59 Logos of AA replaced for logos of SA 2019-03-19 21:39:16 +01:00
benme 5c7db5453f Merge branch 'master' into 'develop'
Fixing integration issues

See merge request advancedalgos/aaweb!6
2019-03-19 16:33:34 +00:00
Matias 24325d3c48 Fixing new simulator name 2019-03-19 17:32:45 +01:00
Matias ff60da9abb Fixing file structure issue 2019-03-19 17:32:25 +01:00
Matias 260be51566 Merge remote-tracking branch 'upstream/develop' 2019-03-19 17:04:10 +01:00
benme 20e7a857da Merge branch 'master' into 'develop'
Adding the copy of the simulator

See merge request advancedalgos/aaweb!5
2019-03-19 15:43:12 +00:00
benme df74ce1b11 Merge branch 'develop' into 'master'
# Conflicts:
#   server.js
2019-03-19 15:42:32 +00:00
Matias ebe5634d25 Adding the copy of the simulator 2019-03-19 16:23:52 +01:00
Luis Fernando Molina aad4f0bbc7 Paula Images 2019-03-04 13:09:02 +01:00
Luis Fernando Molina 5fcc7d58c6 Merge branch 'master' into develop 2019-03-04 12:37:17 +01:00
Unknown 0b5101b387 Events module integration 2019-02-28 14:55:27 +01:00
Luis Fernando Molina 41756ff068 Emojis 2019-02-25 20:39:31 +01:00
Unknown 722ea547b7 Merge remote-tracking branch 'origin/develop' into develop 2019-02-25 12:37:36 +01:00
Luis Fernando Molina 70addda281 New image 2019-02-23 10:15:42 +01:00