Commit Graph
615 Commits
Author SHA1 Message Date
Barry Low b870d0d491 Add key to email-verification text <br /> 2018-11-09 12:17:05 -08:00
Barry Low 55514651b6 Allow BannerTopBar to recieve string or array for title + text 2018-11-09 12:15:29 -08:00
Barry Low a50579ffb6 BannerTopBar as named export 2018-11-09 11:45:07 -08:00
Barry Low 7bea3c511b Refactor BannerTopBar to common > components 2018-11-09 11:43:38 -08:00
Barry Low 661e6637be Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp into feature/client-sendgrid 2018-11-09 11:39:56 -08:00
Barry Low 64d6f536b1 Setup email-verification page 2018-11-09 11:39:46 -08:00
Luis Fernando Molina 0846884fc7 Merge pull request #78 from nikolabjelo/master
removing useless console log i forgot
2018-11-09 19:00:13 +01:00
Luis Fernando Molina 6222617a05 Icons KeyVault Added 2018-11-09 18:59:39 +01:00
Unknown e819d13ca6 removing useless console log i forgot 2018-11-09 18:58:59 +01:00
Barry Low dbefcaf0d4 Merge pull request #77 from nikolabjelo/master
Correcting the authenticated only links logic
2018-11-09 09:45:23 -08:00
Unknown 0dab497b5e Merge remote-tracking branch 'upstream/master' 2018-11-09 18:44:07 +01:00
Unknown 9223971891 Correcting the authenticated only links logic 2018-11-09 18:43:41 +01:00
Barry Low 346fac376d Merge pull request #76 from Algoteers/develop
Update Main Menu Teams icons
2018-11-09 09:40:39 -08:00
Barry Low a42bf39ed9 Update Main Menu Teams icons 2018-11-09 09:39:22 -08:00
Luis Fernando Molina 8bcb098700 Resolving Conflics 2018-11-09 18:34:16 +01:00
Luis Fernando Molina 4a3f335835 Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp 2018-11-09 18:31:38 +01:00
Luis Fernando Molina 173f8819c3 Reports icons 2018-11-09 18:30:20 +01:00
Luis Fernando Molina bb03bc2e61 Merge pull request #75 from nikolabjelo/master
Authentificated only links and adapting heights of text in banner
2018-11-09 18:26:00 +01:00
Luis Fernando Molina dfed678b8d Chart Adjusted 2018-11-09 18:25:30 +01:00
Unknown 09b7da8f19 adapting heights of text in banner 2018-11-09 18:22:28 +01:00
Unknown c4528d67c3 authentificated only links 2018-11-09 18:21:47 +01:00
Luis Fernando Molina 4ea49076a5 Image size at chart 2018-11-09 18:13:37 +01:00
Luis Fernando Molina 3becf08fc2 Merge pull request #74 from nikolabjelo/master
Updating versions of modules, centering the banner
2018-11-09 18:00:28 +01:00
Unknown 3278268c75 Merge remote-tracking branch 'upstream/master' 2018-11-09 17:59:17 +01:00
Unknown 94c1a8bb5a updating modules versions 2018-11-09 17:59:09 +01:00
Barry Low b58729d308 Merge pull request #73 from Algoteers/develop
Add copyright to footer
2018-11-09 08:52:31 -08:00
Barry Low 366cb2bf2e Add copyright to footer 2018-11-09 08:50:50 -08:00
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
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 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 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 62de196f5b Fix Upstream Master Rebase conflict 2018-11-09 01:27:29 -08:00
Luis Fernando Molina 43a320cdf0 Users Module Menu 2018-11-09 09:07:10 +01: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