Commit Graph
16183 Commits
Author SHA1 Message Date
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
Barry Low 01e5f06b88 Update email-verification graphql to notifications module 2018-12-16 19:04:30 -08:00
Barry Low f84cefa84f Merge pull request #127 from Algoteers/feature/notifications-module
Feature/notifications module
2018-12-16 18:34:46 -08:00
pmmax 50b66d647a Merge pull request #8 from pmmax/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.
2018-12-16 23:13:48 -03:00
pmmax 58a5a356ea 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. 2018-12-16 23:11:58 -03:00
Barry Low 11165dcad7 Reactivate playground 2018-12-14 22:55:28 -08:00
Barry Low 4b8ac7bbbb Update npm start script 2018-12-14 22:42:54 -08:00
Barry Low ce9d12d2f2 Remove Sendgrid Mutations 2018-12-14 22:20:47 -08:00
Barry Low 6307cb3e64 Add Changelog 2018-12-14 22:17:00 -08:00
Barry Low 27a3daa257 Cleanup 2018-12-14 22:07:36 -08:00
Barry Low 1e46138af9 Update resolvers 2018-12-14 22:04:48 -08:00
Barry Low 610cdef115 Add notifications module 2018-12-14 19:42:57 -08:00
Barry Low 353aee8b0a Update .env.sample 2018-12-13 12:50:57 -08:00
mati108@gmail.com f58a9f76a5 Adding env variables and fixing issues 2018-12-13 09:12:25 -03:00
pmmax 14d1d34aee Merge pull request #7 from pmmax/master
Added minor changes, fixed build scripts, added "terminate" function to all contracts
2018-12-12 20:12:10 -03:00
pmmax 69b389ddc4 Added minor changes, fixed build scripts, added "terminate" function to all contracts 2018-12-12 20:11:22 -03:00
Luis Fernando Molina c6d8236aca Merge pull request #4 from GrupoSabra/master
Created AlgoFees contract, tests and playground commands. Added some fixes for AlgoPool and AlgoMiner.
2018-12-12 12:21:55 +01:00
Barry Low 3c0addf28b Sendgrid resolvers 2018-12-11 23:17:42 -08:00
pmmax 81a9ca7544 Merge pull request #6 from pmmax/master
Created AlgoFees contract, tests and playground commands. Added some fixes for AlgoPool and AlgoMiner.
2018-12-11 20:35:38 -03:00
pmmax 57918b6e2b Created AlgoFees contract, tests and playground commands. Added some fixes for AlgoPool and AlgoMiner. 2018-12-11 20:34:42 -03:00
Barry Low beeccd7e3d Base setup 2018-12-07 19:14:14 -08:00
Barry Low 7a5123ea72 Merge pull request #126 from Algoteers/bug/footer-links
Fixed footer links
2018-12-06 22:47:46 -08:00
Barry Low c974c31ea2 Fixed footer links 2018-12-06 22:46:36 -08:00
Barry Low 607b4bc2c2 Merge pull request #125 from Algoteers/feature/team-web-components-updates
Teams 0.0.32 + WebComponent 0.0.17
2018-12-06 22:34:54 -08:00
Barry Low 26ff478ddc Teams 0.0.32 + WebComponent 0.0.17 2018-12-06 22:32:08 -08:00
Barry Low 8adf81890e 0.0.32 2018-12-06 22:00:44 -08:00
Barry Low 0710c81c93 Merge branch 'develop' of https://github.com/AdvancedAlgos/TeamsModule into develop 2018-12-06 21:22:00 -08:00
Barry Low 10540cc267 Merge branch 'feature/update-web-components' into develop 2018-12-06 21:21:46 -08:00
Barry Low 9fed2e275e Merge pull request #83 from AdvancedAlgos/feature/update-web-components
Update WebComponents for security update
2018-12-06 21:17:58 -08:00
Barry Low 28e4701939 Update WebComponents for security update 2018-12-06 21:16:48 -08:00
z@tOr 84198ce267 Merge pull request #2 from julian-molina/patch-2
Update LICENSE
2018-12-05 10:31:51 -03:00