fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,713 Commits 4 Branches 35 Tags
develop
Commit Graph
16713 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Fernando Molina a29140515d Unneded files removed 2018-12-29 07:34:03 +01:00
Luis Fernando Molina 1b43d2e771 Merge remote-tracking branch 'upstream/develop' into develop 2018-12-29 07:21:08 +01:00
Luis Fernando Molina 55db40435b Unused files 2018-12-29 07:08:04 +01:00
z@tOr 50243ffe36 Merge pull request #136 from AAVikings/develop 
Reducing image size so the menu can fit the screen
 2018-12-27 11:26:03 -03:00
mati108@gmail.com b4d4108132 Reducing image size so the menu can fit the screen 2018-12-27 11:25:34 -03:00
z@tOr 617b6e10fb Merge pull request #1 from AAVikings/develop 
Filename uppercase
 2018-12-27 10:29:45 -03:00
mati108@gmail.com 0622a85a8f Uppercase filename 2018-12-27 10:29:10 -03:00
mati108@gmail.com e81a67631b Changing file name 2018-12-27 10:28:56 -03:00
z@tOr fac92c71e5 Merge pull request #135 from AAVikings/develop 
Adding operations client
 2018-12-27 09:38:19 -03:00
mati108@gmail.com 26d0dd1d06 Adding operations client 2018-12-27 09:34:44 -03:00
z@tOr 697b55b3d0 Merge pull request #134 from AAVikings/develop 
Removing extra log line
 2018-12-27 09:33:59 -03:00
mati108@gmail.com d068a53a48 Removing extra log line 2018-12-27 09:33:25 -03:00
mati108@gmail.com ac754b697f Adding server folder files 2018-12-26 19:47:02 -03:00
mati108@gmail.com d397c87d68 Adding base version for Operations Module 2018-12-26 19:41:13 -03:00
z@tOr ae08794750 Initial commit 2018-12-26 19:27:24 -03:00
z@tOr e1a035187a Merge pull request #133 from AAVikings/develop 
Adding changes for operations module
 2018-12-26 19:21:00 -03:00
z@tOr 4a8aca6a21 Merge branch 'develop' into develop 2018-12-26 19:20:50 -03:00
mati108@gmail.com 37d8bf1901 Adding changes for operations module 2018-12-26 19:16:51 -03:00
Barry Low e5b1489b0f Merge branch 'develop' of https://github.com/AdvancedAlgos/AAWeb into develop 2018-12-21 08:02:46 -08:00
Luis Fernando Molina a5be63abb8 Merge pull request #6 from GrupoSabra/master 
Added minor validations to AlgoMiner. Created integration tests for "terminate" function in all contracts. Updated the playground to support the "terminate" function for all contracts. Added the "reset" command to the playground. Updated playground docs. Updated playground sample scripts.
 2018-12-21 15:57:03 +01:00
pmmax 35384c913c Merge pull request #9 from pmmax/master 
Added minor validations to AlgoMiner. Created integration tests for "terminate" function in all contracts. Updated the playground to support the "terminate" function for all contracts. Added the "reset" command to the playground. Updated playground docs. Updated playground sample scripts.
 2018-12-21 11:40:05 -03:00
pmmax 6f105e531f Added minor validations to AlgoMiner. Created integration tests for "terminate" function in all contracts. Updated the playground to support the "terminate" function for all contracts. Added the "reset" command to the playground. Updated playground docs. Updated playground sample scripts. 2018-12-21 11:38:27 -03:00
Barry Low ffd16d56e5 Merge pull request #132 from Algoteers/feature/fb-menu 
Shorten Financial Being menu title
 2018-12-18 22:57:19 -08:00
Barry Low 5b93a3e7ae Shorten Financial Being menu title 2018-12-18 18:38:14 -08:00
Barry Low 9796a4f5f3 Merge pull request #131 from algorithms-anonymous/master 
Integrate Financial Beings
 2018-12-18 18:34:32 -08:00
Luis Fernando Molina 9ae2289a3b Merge pull request #5 from GrupoSabra/master 
Added "non-pool-based" miner type and updated business rules. Added referral for miners. Added "referral" pool type and updated business rules. Updated tests and playground. Fixed build scripts. Added "terminate" function to all contracts.
 2018-12-18 18:13:57 +01:00
Barry Low 643a4982b3 Merge pull request #86 from AdvancedAlgos/chore/fix-notifications-imports 
fix imports
 2018-12-17 23:05:07 -08:00
Barry Low 1de2963477 fix imports 2018-12-17 23:04:35 -08:00
Barry Low af50ae5b64 Merge pull request #1 from AdvancedAlgos/bug/fix-contact-email 
Fix static email address
 2018-12-17 22:42:42 -08:00
Barry Low 3650b8b04b Fix static email address 2018-12-17 22:41:33 -08:00
Barry Low 8778508c2c Merge pull request #85 from AdvancedAlgos/feature/notifications-integration 
Feature/notifications integration
 2018-12-17 22:22:19 -08:00
Barry Low 0b533df705 Merge pull request #84 from AdvancedAlgos/feature/notifications-integration 
Feature/notifications integration
 2018-12-17 22:21:22 -08:00
Barry Low 9f142807b6 Convert email resolvers to notifications 2018-12-17 22:20:07 -08:00
Vladimir Jovanovic 814f37d750 Remove unnecessary import 2018-12-17 20:06:58 +01:00
Vladimir Jovanovic b59086326d Merge remote-tracking branch 'origin/master' 2018-12-17 19:49:02 +01:00
Vladimir Jovanovic af9c210f91 Remove constants 2018-12-17 19:47:56 +01:00
V 1feacd6ab1 Merge pull request #4 from algorithms-anonymous/develop 
Integrate Financial Beings
 2018-12-17 19:10:14 +01:00
Vladimir Jovanovic 10303b4f16 Merge master to develop 2018-12-17 19:09:38 +01:00
Vladimir Jovanovic 00b23d21f2 Integrate Financial Beings 2018-12-17 19:04:19 +01:00
V 605448f86d Merge pull request #3 from AdvancedAlgos/develop 
Merge MasterApp develop branch to master branch of our fork
 2018-12-17 18:56:00 +01:00
Barry Low f9ff01fe4e Merge pull request #130 from Algoteers/feature/client-update-notifications 
Feature/client update notifications
 2018-12-17 09:22:56 -08:00
Barry Low cd85716e1a Update Changelog 2018-12-17 08:27:47 -08:00
Barry Low 90f6ed6ab6 Update signup data responses 2018-12-17 08:25:06 -08:00
Barry Low 4411bd296f Merge branch 'develop' of https://github.com/AdvancedAlgos/MasterApp into develop 2018-12-16 19:59:25 -08:00
Barry Low be3ef8093d Merge branch 'bug/update-material-ui' into develop 2018-12-16 19:59:14 -08:00
Barry Low 37f44a4298 Merge pull request #129 from Algoteers/bug/update-material-ui 
Upgrade material-ui + webcomponents
 2018-12-16 19:58:40 -08:00
Barry Low 2656b4da02 Upgrade material-ui + webcomponents 2018-12-16 19:57:38 -08:00
Barry Low d0969da607 Merge branch 'chore/upgrade-deps' into develop 2018-12-16 19:39:05 -08:00
Barry Low 88f039d825 Update webcomponents + material-ui 2018-12-16 19:38:39 -08:00
Barry Low 0660f4721f Merge pull request #128 from Algoteers/feature/client-notifications 
Update email-verification graphql to notifications module
 2018-12-16 19:05:31 -08:00