Commit Graph
615 Commits
Author SHA1 Message Date
Unknown c54b8e7a4e Moving docs into the login dropdown 2019-03-23 13:09:30 +01:00
Unknown b5d7784d73 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-23 13:09:12 +01:00
benme a65a70492b Merge pull request #192 from AAVikings/master
Disabling Miners
2019-03-23 10:44:18 +01:00
Matias a4c291a027 Disabling Miners 2019-03-23 10:43:41 +01:00
Matias b370fc836e Merge remote-tracking branch 'upstream/develop' 2019-03-23 10:43:16 +01:00
nikolabjelo a786c054ae Merge pull request #191 from nikolabjelo/develop
Adding cockpit to the application
2019-03-22 19:58:01 +01:00
Unknown 05e00f897f adding cockpit to the package 2019-03-22 19:56:11 +01:00
Unknown 31909bf8b2 Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-22 19:53:51 +01:00
benme 6beceac2a2 Merge pull request #190 from AAVikings/master
New ops version
2019-03-22 19:34:56 +01:00
Matias 24dbaa9085 Merge remote-tracking branch 'upstream/develop' 2019-03-22 19:34:36 +01:00
Matias 28df1d34ac New ops version 2019-03-22 19:34:23 +01:00
Unknown 75fe31bc7a Adding the cockpit module (not in package.json yet) 2019-03-22 17:55:35 +01:00
benme d17d9ba18b Merge pull request #189 from AAVikings/master
Operations client update
2019-03-22 11:02:59 +01:00
Matias 937e7f3402 Operations client update 2019-03-22 11:02:08 +01:00
Matias 35aa62e199 Merge remote-tracking branch 'upstream/develop' 2019-03-22 10:17:11 +01:00
Matias 14c29ae648 Merge branch 'master' into upstream/develop 2019-03-22 10:17:04 +01:00
Matias fe08e7464b Merge remote-tracking branch 'upstream/develop' 2019-03-22 09:38:13 +01:00
Barry Low 4113af3b9b Merge pull request #188 from Algoteers/feature/strategizer-rnd2
Updated strategizer 0.0.7
2019-03-21 18:33:51 +01:00
Barry Low 360d76efbf Updated strategizer 0.0.7 2019-03-21 18:32:22 +01:00
Barry Low 37491efc81 Merge pull request #187 from Algoteers/develop
Secure Strategizer menu items
2019-03-20 19:19:58 +01:00
Barry Low 9172ab9346 Secure Strategizer menu items 2019-03-20 19:19:06 +01:00
Barry Low e4b244bbbb Merge pull request #186 from Algoteers/develop
Hot Fix: Update Strategizer client 0.0.6
2019-03-20 19:11:43 +01:00
Barry Low e8507d7640 Update Strategizer client 0.0.6 2019-03-20 19:10:20 +01:00
nikolabjelo d5e6d73eb3 Merge pull request #185 from nikolabjelo/develop
Adapting operations link for new cockpit api
2019-03-20 18:51:49 +01:00
Unknown 8f2aae6b2e Merge remote-tracking branch 'Superalgos/develop' into develop 2019-03-20 18:50:04 +01:00
Unknown 1ada4e724f Adapting operation links for new versiion of the cockpit backend 2019-03-20 18:49:43 +01:00
Barry Low 73e88d454b Merge pull request #184 from Algoteers/develop
Develop
2019-03-20 17:50:48 +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