16713 Commits
Author SHA1 Message Date
Matias c542e33b30 Removing miners 2019-03-19 20:12:27 +01:00
Matias 42e77088d4 Merge remote-tracking branch 'upstream/develop' 2019-03-19 19:53:48 +01:00
benme 323ee24390 Merge pull request #180 from AAVikings/master
Fixing merge
2019-03-19 18:39:42 +01:00
Matias 33424f1193 Fixing merge 2019-03-19 18:38:19 +01:00
benme 254fe9992b Merge pull request #179 from AAVikings/master
Integrating module changes
2019-03-19 17:58:23 +01:00
Matias 649e651a2a Merge remote-tracking branch 'upstream/develop' 2019-03-19 17:58:01 +01:00
Luis Fernando Molina 22460d1e1d Balance being correctly stored in inter execution memory 2019-03-19 17:46:20 +01:00
Luis Fernando Molina e200c42b72 Bug fixed edcase when we start we dont have a previous file 2019-03-19 17:45:49 +01:00
benme 0ec10aabdc Merge pull request #98 from AAVikings/develop
Adding simulator on bot creation
2019-03-19 17:38:08 +01:00
Matias a846fb8b27 Adding simulator on bot creation 2019-03-19 17:37:03 +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
Matias 2db587ea12 Adding MinerModule 2019-03-19 16:21:02 +01:00
Matias abc9e5841b Adding select for processes 2019-03-19 16:18:16 +01:00
Luis Fernando Molina 9cd3126c7a LOG ERROR when file is not in valid JSON format 2019-03-19 15:00:22 +01:00
nikolabjelo 03a9969306 Merge pull request #178 from nikolabjelo/develop
Adding the cockpit to the masterApp
2019-03-19 12:58:49 +01:00
Unknown edcda1a680 Adding the cockpit to the masterApp 2019-03-19 12:57:41 +01:00
Luis Fernando Molina 4f54adf235 Problems to manage inter execution conters solved 2019-03-19 10:30:41 +01:00
Luis Fernando Molina aa6ea90bad Inter Process Memory Implemented 2019-03-18 21:41:27 +01:00
Luis Fernando Molina 0361aff781 Inter Process Memory Implemented 2019-03-18 21:41:08 +01:00
Luis Fernando Molina 9b6a8073bd dynamic start date and end date 2019-03-18 15:44:03 +01:00
Luis Fernando Molina d0a7f15c07 You can define start dates and end dates not dependant on dependencies 2019-03-18 15:43:29 +01:00
nikolabjelo 010b5f8a44 Merge pull request #5 from nikolabjelo/develop
fbSlug went from ID! to String! in the queries
2019-03-18 11:34:24 +01:00
Unknown ad3d0b303f fbSlug went from ID! to String! in the queries 2019-03-18 11:33:35 +01:00
Barry Low 76fbbd049d Fix fbByFBSlug query 2019-03-17 21:49:21 +01:00
Luis Fernando Molina 827c42148d Daily Working 2019-03-17 21:37:28 +01:00
Matias 6596a8429d Merge remote-tracking branch 'upstream/develop' 2019-03-17 21:20:44 +01:00
Barry Low b3d404761c Update fbByFbSlug query 2019-03-17 21:17:48 +01:00
Luis Fernando Molina 3c733dace8 Dates were missing in path 2019-03-17 21:14:17 +01:00
nikolabjelo 60738cbab8 Merge pull request #4 from nikolabjelo/develop
Went from fbId to fbSlug
2019-03-17 20:56:11 +01:00
nikolabjelo df20196b2b Merge pull request #177 from nikolabjelo/develop
Adapted the link fb->strat link to use slug instead of id
2019-03-17 20:56:08 +01:00
Unknown 6826a99872 Adapted the link fb->strat link to use slug instead of id 2019-03-17 20:55:05 +01:00
Unknown a7cb752f1e Went from fbId to fbSlug 2019-03-17 20:53:51 +01:00
Barry Low 146527815c Add fbByFbSlug query 2019-03-17 20:46:30 +01:00
benme dc04e1f349 Merge pull request #46 from AAMasters/develop
Multi Period Market & Multi Period Daily Frameworks
2019-03-17 20:43:41 +01:00
Luis Fernando Molina 4a54b31422 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-17 20:39:11 +01:00
Luis Fernando Molina ecaf0ceb31 Cloning Objects for Nikola 2019-03-17 20:32:45 +01:00
Luis Fernando Molina 1f253d933a Update Conditions.js 2019-03-17 20:29:37 +01:00
nikolabjelo 58c2bf7080 Merge pull request #3 from nikolabjelo/develop
Adding history to strategies, not showing them up yet though
2019-03-17 18:47:18 +01:00
Unknown 4f1802e4ee Adding history to strategies, not showing them up yet though 2019-03-17 18:46:09 +01:00
Luis Fernando Molina 82f5f7ddbb Adaption for Lastes Objects coming in file 2019-03-17 18:38:12 +01:00
Luis Fernando Molina 9b3214c699 5 Last Objects written on file 2019-03-17 18:29:27 +01:00
Luis Fernando Molina 55ed967bd5 Time Period refactored 2019-03-17 15:48:51 +01:00
Luis Fernando Molina 664b688820 TimePeriod corrected 2019-03-17 15:47:08 +01:00
Matias d4b9b8755b Fixing merge issues 2019-03-17 12:32:24 +01:00