Commit Graph
16183 Commits
Author SHA1 Message Date
Barry Low eca9615596 Revert "Update Strategizer client 0.0.3"
This reverts commit fee71adbfe.
2019-03-20 17:45:49 +01:00
Barry Low fee71adbfe Update Strategizer client 0.0.3 2019-03-20 17:43:43 +01:00
Barry Low 861bd34fe7 Merge pull request #183 from Algoteers/feature/strategizer
Feature/strategizer
2019-03-20 16:53:53 +01:00
benme d891209b10 Merge pull request #19 from AAMasters/develop
Logos of Superalgos
2019-03-20 16:47:43 +01:00
Barry Low 3fde00999b Merge branch 'develop' of https://github.com/Superalgos/MasterApp into develop 2019-03-20 16:44:06 +01:00
Barry Low f5afb73d01 Add strategizer-client 0.0.2 2019-03-20 16:42:32 +01:00
Luis Fernando Molina 1844cd795b Adjust on speed of animation 2019-03-20 16:20:06 +01:00
Luis Fernando Molina db3535fcae We can hide the Products Panel now. 2019-03-20 16:10:31 +01:00
Matias 039a7cd351 Merge remote-tracking branch 'upstream/develop' 2019-03-20 12:50:54 +01:00
benme 1ea41786ec Merge pull request #47 from AAMasters/develop
Develop last changes
2019-03-20 12:50:18 +01:00
Luis Fernando Molina bc74aef9c7 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-20 12:46:06 +01:00
Luis Fernando Molina d63dd016e2 Retry when it does not have a dependency 2019-03-20 12:45:46 +01:00
Luis Fernando Molina b603638a59 Logos of AA replaced for logos of SA 2019-03-19 21:39:16 +01:00
Luis Fernando Molina a756e8a227 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-19 21:36:21 +01:00
Barry Low 2d87419750 Merge remote-tracking branch 'upstream/develop' into feature/strategizer 2019-03-19 21:36:16 +01:00
Luis Fernando Molina 971e547ab4 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-19 21:34:16 +01:00
Luis Fernando Molina c16ee902cd Better Icons Choosed 2019-03-19 21:33:20 +01:00
Luis Fernando Molina d6718eaa94 Superalgos Logo replace the AA one 2019-03-19 21:32:53 +01:00
Luis Fernando Molina 5ca1812656 undefined at file BUG resolved 2019-03-19 20:38:50 +01:00
benme 7aec1eaa22 Merge pull request #181 from AAVikings/master
Removing miners
2019-03-19 20:13:08 +01:00
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