16713 Commits
Author SHA1 Message Date
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
Unknown 3fac79cc0a Correcting import 2018-11-08 10:09:11 +01:00
Unknown e05aeca819 Making a minimal switch system on the responsive handle 2018-11-08 10:06:00 +01:00
Unknown 44bc7e9e2f Creating a responsive button (not connected yet) 2018-11-08 09:45:20 +01:00
Julian Molina 5a1dfea031 Legal docs 2018-11-08 09:30:45 +01:00
Unknown 51c539f31e Working unresponsive version 2018-11-08 09:06:47 +01:00
Luis Fernando Molina ca15873568 Merge pull request #15 from nikolabjelo/master
Huge backend modification with a lot of breaking changes
2018-11-08 07:46:12 +01:00
Unknown fc6331a434 Adding node-sass to the dev dependency (required by webpack settings) 2018-11-08 04:52:22 +01:00
Unknown cb6236a3b7 Cleaning up a bit of the backend while we are at it (to stop errors) 2018-11-08 04:26:09 +01:00
Unknown c6b1892187 forcing footer to always be at bottom 2018-11-08 04:06:24 +01:00
Unknown 23e82ab271 rearranging layout files 2018-11-08 03:47:44 +01:00
Barry Low 0b3b24cb83 Merge branch 'master' of https://github.com/AdvancedAlgos/TeamsModule 2018-11-07 14:34:32 -08:00
Barry Low ea9df033d3 Merge branch 'bug/teamBySlug' 2018-11-07 14:32:43 -08:00
Barry Low 566b878a42 Merge pull request #58 from AdvancedAlgos/bug/teamBySlug
Fix teamBySlug query
2018-11-07 14:32:00 -08:00
Barry Low 48b592914b Fix teamBySlug query 2018-11-07 14:28:53 -08:00
Unknown 811f5db14b updating package-lock 2018-11-07 22:41:54 +01:00
Unknown 92df9a378c Made an error while reverting the commit 2018-11-07 22:28:35 +01:00
Unknown 0aa5c0c98b Correcting little mistake on the footer 2018-11-07 22:04:02 +01:00
Unknown eb8ede7a63 exporting layout to a layout file 2018-11-07 21:31:08 +01:00
Unknown 0b5c37a443 Linting the whole project first 2018-11-07 20:43:18 +01:00
Barry Low 315eb2698d Merge pull request #57 from AdvancedAlgos/feature/fix-issues
Feature/fix issues
2018-11-07 09:32:10 -08:00