Commit Graph
227 Commits
Author SHA1 Message Date
Barry Low 366cb2bf2e Add copyright to footer 2018-11-09 08:50:50 -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 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
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 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
Unknown 51c539f31e Working unresponsive version 2018-11-08 09:06:47 +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
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
Nikola Bjelo 368a113a96 Setting a main container with a minHeight (hotfix) 2018-11-07 16:36:45 +01:00
Nikola Bjelo c390ad4b1b Merge branch 'feature/footer-materialui' into Header 2018-11-07 14:30:22 +01:00
Nikola Bjelo 34729b3ed8 exporting styles to a new file 2018-11-07 13:20:34 +01:00
Nikola Bjelo a6564de34a replacing the menu element 2018-11-07 13:11:53 +01:00
Nikola Bjelo b722d4116c Adding key and DRYing up 2018-11-07 13:10:17 +01:00
Nikola Bjelo 1bf69ff1bc Adding a key to submenus 2018-11-07 12:16:19 +01:00
Barry Low f55e4a8e11 Add Responsive mobile menu button 2018-11-06 23:11:53 -08:00
Barry Low 65d2294e30 Add responsive styles to footer 2018-11-06 22:28:30 -08:00
Barry Low fe08faf2b8 Convert Footer to MUI 2018-11-06 15:11:21 -08:00
Nikola Bjelo 9dea8f719d Putting in place a minimal dropdown system (1lvl) 2018-11-06 23:11:37 +01:00
Nikola Bjelo e4a55de951 Merge remote-tracking branch 'origin/master' 2018-11-06 18:47:20 +01:00
Nikola Bjelo e94014c10f Revert "Working Version of Integration with web site style"
This reverts commit f9894bcc2e.
2018-11-06 18:45:42 +01:00
Luis Fernando Molina 9f37169ba0 Revert "Charts Integration"
This reverts commit 34f2c35087.
2018-11-06 18:45:11 +01:00
Luis Fernando Molina 13f176656a Revert "New version Users Module .17"
This reverts commit 8ed5da6129.
2018-11-06 18:45:05 +01:00
Nikola Bjelo 5150ea0040 Merge remote-tracking branch 'origin/master' 2018-11-06 18:28:09 +01:00
Luis Fernando Molina 8ed5da6129 New version Users Module .17 2018-11-06 16:37:20 +01:00
Luis Fernando Molina 34f2c35087 Charts Integration 2018-11-06 16:33:55 +01:00
Luis Fernando Molina 855416a4cb Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp 2018-11-06 13:26:06 +01:00
Luis Fernando Molina f9894bcc2e Working Version of Integration with web site style 2018-11-06 13:23:19 +01:00
Julian Molina 6d558aee24 Legal update 2018-11-06 12:19:11 +01:00