Commit Graph
16183 Commits
Author SHA1 Message Date
Unknown 14b76fc895 Merge remote-tracking branch 'upstream/master' 2018-11-09 17:45:24 +01:00
Unknown 8450e33bef centering topbar banner 2018-11-09 17:45:15 +01:00
Unknown d5b062a87a updating packages version 2018-11-09 17:45:09 +01:00
Barry Low 5cc6506ebd Merge branch 'feature/update-topbar' 2018-11-09 08:37:22 -08:00
Luis Fernando Molina 82ec847636 BannerTopBar replaces TopBar 2018-11-09 17:37:03 +01:00
Barry Low 45301ca7f5 Update TopBar to BannerTopBar 2018-11-09 08:36:41 -08:00
Luis Fernando Molina 7953f32ae9 Merge pull request #17 from nikolabjelo/master
Updating top bar
2018-11-09 17:30:07 +01:00
Unknown 895a34a18e Merge remote-tracking branch 'upstream/master' 2018-11-09 17:26:29 +01:00
Unknown a1b7bd409a Updating top bar and npm version 2018-11-09 17:26:18 +01:00
Luis Fernando Molina eac9f25c67 Correcto React Dom Version 2018-11-09 17:12:44 +01:00
Luis Fernando Molina 19e3241de3 Merge pull request #72 from nikolabjelo/master
Centralising the styles and adding a home page
2018-11-09 17:11:59 +01:00
Unknown 4c50b65f74 Adding a banner for chart page 2018-11-09 17:04:11 +01:00
Unknown ec3efd68f3 Making a descent home page 2018-11-09 16:52:36 +01:00
Unknown 438d4c34a5 Adding charts link and dropdown arrows 2018-11-09 15:45:36 +01:00
Unknown 6ae96ccb4f Making Banner's font responsive 2018-11-09 15:17:33 +01:00
Unknown 282d1b3085 Moving styles to entry point and adding a homepage(unfinished) 2018-11-09 15:03:33 +01:00
Unknown 5ae0009cd3 Merge remote-tracking branch 'upstream/master' 2018-11-09 13:23:41 +01:00
Barry Low df44ccfad9 Merge pull request #59 from AdvancedAlgos/develop
Update new menu system + layout revamp
2018-11-09 04:11:36 -08:00
Barry Low 5235f6c65e Merge pull request #71 from Algoteers/feature/server-sendgrid
Feature/server sendgrid + Teams 0.0.25
2018-11-09 04:10:20 -08:00
Barry Low ffe11de716 Merge branch 'feature/client-layout-update' into develop 2018-11-09 04:08:46 -08:00
Barry Low 2d732e7caf 0.0.25 2018-11-09 04:08:31 -08:00
Barry Low 92e6d856f3 Update React/ReactDOM for Material UI bug 2018-11-09 04:07:07 -08:00
Barry Low 9c19c9bdf1 Integrate SendGrid Mutations 2018-11-09 04:05:13 -08:00
Barry Low f70d092852 Add Sendgrid Resolvers 2018-11-09 04:05:13 -08:00
Barry Low 94e8646a91 Update schema naming for sendgrid mutations 2018-11-09 04:05:13 -08:00
Barry Low 08384c6d39 Update Team Module 0.0.25 2018-11-09 04:04:22 -08:00
Barry Low 10b997276c Update styles 2018-11-09 03:53:18 -08:00
Barry Low 62de196f5b Fix Upstream Master Rebase conflict 2018-11-09 01:27:29 -08:00
Luis Fernando Molina 235be24d85 Titles Missing 2018-11-09 09:19:33 +01:00
Luis Fernando Molina 43a320cdf0 Users Module Menu 2018-11-09 09:07:10 +01:00
Luis Fernando Molina b80ab5acf3 Upgrade to Nikolas version of Master App header 2018-11-09 09:03:40 +01:00
Luis Fernando Molina fa0614ab64 Merge pull request #16 from nikolabjelo/master
Frontend according to the new nav bar of the master app
2018-11-09 08:15:42 +01:00
Luis Fernando Molina 0c7c378dc1 Merge pull request #1 from GrupoSabra/master
Initial POC for the ERC20 ALGO token implementation (based on openzeppelin-solidity v2.0.0)
2018-11-09 07:00:08 +01:00
pmmax 9026ced4cf Merge pull request #2 from pmmax/master
Added openzeppelin-solidity reference and license
2018-11-08 20:00:10 -03:00
pmmax 6aa8b9268e Added openzeppelin-solidity reference and license 2018-11-08 19:57:56 -03:00
pmmax fa67a23da0 Merge pull request #1 from pmmax/master
Initial POC for the ERC20 ALGO token implementation (based on openzeppelin-solidity v2.0.0)
2018-11-08 19:41:48 -03:00
pmmax 99d694ad78 Initial POC for the ERC20 ALGO token implementation (based on openzeppelin-solidity v2.0.0) 2018-11-08 19:38:34 -03:00
Unknown 877f934d9a Merge remote-tracking branch 'upstream/master' 2018-11-08 18:46:26 +01:00
Unknown e1a646d99f Permitting external links and removing useless "back to corporate" link 2018-11-08 18:46:04 +01:00
Luis Fernando Molina 85fb21faaa Merge conflics resolved 2018-11-08 18:19:56 +01:00
Luis Fernando Molina af84306840 Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp 2018-11-08 18:17:12 +01:00
Luis Fernando Molina b139775787 Adapt to latest changes in CanvasApp 2018-11-08 18:16:30 +01:00
Luis Fernando Molina 6573ab7382 Merge pull request #70 from nikolabjelo/master
A working and beautiful menu using react technologies, and some other correction here and there
2018-11-08 17:19:18 +01:00
Unknown 1575d0b323 updating version of the the events module 2018-11-08 14:36:40 +01:00
Unknown 606deac1fd Changing version in the package file for npm 2018-11-08 14:32:52 +01:00
Unknown e47b4a4b7a Integration of the new topbar 2018-11-08 14:32:17 +01:00
Unknown a53266f050 Removing old topbar 2018-11-08 14:31:48 +01:00
Unknown 62825a2e1b Making a hovering system for big screens 2018-11-08 12:19:45 +01:00
nikolabjelo c907083829 Merge pull request #1 from nikolabjelo/Header
Functioning system
2018-11-08 11:48:09 +01:00
Unknown f6280e53ba Using a toggle instead of a hover (for mobile), and autoclose 2018-11-08 11:43:37 +01:00