Commit Graph
536 Commits
Author SHA1 Message Date
Barry Low e8507d7640 Update Strategizer client 0.0.6 2019-03-20 19:10:20 +01:00
Barry Low 04ca607532 Update Strategizer client 0.0.3 2019-03-20 17:50:03 +01:00
Barry Low ed0fa86853 Merge remote-tracking branch 'upstream/develop' into develop 2019-03-20 17:47:46 +01:00
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
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
Barry Low 2d87419750 Merge remote-tracking branch 'upstream/develop' into feature/strategizer 2019-03-19 21:36:16 +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
Matias 2db587ea12 Adding MinerModule 2019-03-19 16:21:02 +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
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
nikolabjelo ba3df53fdc Merge pull request #176 from nikolabjelo/develop
Develop
2019-03-16 20:17:57 +01:00
Unknown 117cc62757 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-16 20:15:14 +01:00
Unknown 5484f87e69 Mistake corrections 2019-03-16 20:15:00 +01:00
nikolabjelo 8b1464a68d Merge pull request #175 from nikolabjelo/develop
Adding strategizer to masterApp backend
2019-03-16 17:01:44 +01:00
Unknown 2f5eae11e8 Adding strategizer to masterApp backend 2019-03-16 16:38:01 +01:00
Barry Low 4b0891b3b6 add strategizer to nav 2019-03-16 15:02:01 +01:00
benme 2119ad179e Merge pull request #174 from AAVikings/master
Adding support for dots on url
2019-03-05 20:14:19 -03:00
Matias b20bb2cfe4 New version ops 2019-03-05 20:13:56 -03:00
Matias 2a136f4f17 Adding support for dots on url 2019-03-05 20:10:43 -03:00
benme e4a2d626fd Merge pull request #173 from AAVikings/master
Adding logs v1 to client dependencies
2019-03-03 10:56:58 -03:00
Matias ba4b770e88 Adding logs v1 2019-03-03 10:56:03 -03:00
Matias ffdb4318c6 Merge remote-tracking branch 'upstream/develop' 2019-03-03 10:06:34 -03:00
benme 964b5a12b6 Merge pull request #172 from apronotti/develop
LogsModule initial version
2019-03-01 18:03:02 -03:00
apronotti 1f70b2a41b Add LogsModule settings. 2019-03-01 17:58:29 -03:00
apronotti d86bd63b4e Merge pull request #1 from Superalgos/develop
Develop
2019-03-01 17:25:31 -03:00
benme 60a8e42186 Merge pull request #171 from AAVikings/master
New Ops version
2019-02-28 18:44:29 -03:00
Matias 8271bc08a5 New Ops version 2019-02-28 18:43:47 -03:00
Matias 9d751431cb Merge remote-tracking branch 'upstream/develop' 2019-02-28 18:32:21 -03:00
nikolabjelo d4b5de48a5 Merge pull request #170 from nikolabjelo/develop
Updating events module to v 0.0.2
2019-02-28 17:54:38 +01:00
Unknown f67c490104 Updating events module to v 0.0.2 2019-02-28 17:54:09 +01:00
nikolabjelo 38dd8b9e76 Merge pull request #169 from nikolabjelo/develop
Develop
2019-02-28 17:10:24 +01:00
Unknown 0427c24e70 Including operations links and events module 2019-02-28 17:08:57 +01:00
Unknown 522f6face0 Merge remote-tracking branch 'upstream/develop' into develop 2019-02-21 13:04:16 +01:00
benme f0a9da5882 Merge pull request #168 from AAVikings/master
New Ops version
2019-02-19 16:18:04 -03:00
Matias 707975244c New Ops version 2019-02-19 16:17:33 -03:00
Unknown 3b87c9df2b Removing useless logs 2019-02-18 13:44:57 +01:00
Unknown 9265220dcc Extending teams' API 2019-02-18 13:37:11 +01:00
Unknown df113ec99f pulling from main 2019-02-18 12:27:35 +01:00
Unknown c57fad1aaf Links for canParticipateAs and participating as 2019-02-18 12:21:50 +01:00