Commit Graph
201 Commits
Author SHA1 Message Date
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
Julian Molina 8aed470f02 Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp 2018-11-06 12:06:36 +01:00
Julian Molina ffaa023dfe Legal update 2018-11-06 12:06:32 +01:00
Nikola Bjelo 59669f23e7 Setting "cache-and-network" as default fetch policy 2018-11-06 04:15:17 +01:00
Nikola Bjelo f889f6c93c typo on last commit 2018-11-05 18:44:02 +01:00
Nikola Bjelo cd2053f2dd Correcting the userId fetching to avoid possible loops 2018-11-05 16:07:32 +01:00
Julian Molina 5ab5b42743 Updating image 2018-11-04 19:01:16 +01:00
z@tOr a55e2417ca Merge pull request #64 from AAVikings/master
Including aacloud id
2018-11-04 12:02:14 -03:00
mati108@gmail.com 9843376a4b Including aacloud id 2018-11-04 12:01:14 -03:00
z@tOr f4cc44b895 Merge pull request #63 from AAVikings/master
fixing issue with geting user
2018-11-03 16:20:17 -03:00
mati108@gmail.com 4ac01a38b6 fixing issue with geting user 2018-11-03 16:18:25 -03:00
z@tOr c6ce1e19e4 Merge pull request #62 from nikolabjelo/master
HotFix for reload on expired token when you arrive on a queryless page
2018-11-03 14:05:56 -03:00
Nikola Bjelo bfb8e84d84 HotFix for reload on expired token when you arrive on a queryless page 2018-11-03 17:53:20 +01:00
z@tOr b9ab3443b5 Merge pull request #61 from AAVikings/master
Fixing login issue and updating key vaul version
2018-11-03 13:52:13 -03:00
mati108@gmail.com 9f4d8ce135 Fixing login issue and updating key vaul version 2018-11-03 12:46:16 -03:00
Luis Fernando Molina 85d4dec89d New Users Module Version .15 2018-11-03 08:56:42 +01:00
z@tOr 7f37ceaabb Merge pull request #60 from nikolabjelo/master
Adding a preshared key to the gateway as a short term security measure (HOTFIX ONLY)
2018-11-02 20:58:32 -03:00
Nikola Bjelo 910f6a603f Adding a preshared key to the gateway as a short term security measure 2018-11-02 19:50:07 +01:00
z@tOr 13b5b516dc Merge pull request #59 from nikolabjelo/master
Correcting the missing cursor problem in the playground
2018-11-02 08:50:08 -03:00
Nikola Bjelo daf1a5d905 Correcting the missing cursor problem in the playground 2018-11-02 12:45:56 +01:00
Barry Low 038cf91cde Merge pull request #56 from Algoteers/feature/team-client-0.0.24
Feature/team client 0.0.24
2018-11-01 09:17:17 -07:00
Barry Low c5b4470de5 Update to Team Client 0.0.24 2018-11-01 09:10:54 -07:00
Barry Low 0c7b4025c5 Merge conflict fix 2018-11-01 09:09:52 -07:00
Luis Fernando Molina 2e3d094726 Documentation label changed 2018-11-01 13:59:10 +01:00
z@tOr a83caf944c Merge pull request #54 from AAVikings/master
debug level logs
2018-11-01 09:34:00 -03:00
mati108@gmail.com 3f48eb8113 debug level logs 2018-11-01 09:33:34 -03:00
z@tOr 9dd9a0b2b2 Merge pull request #53 from AAVikings/master
roll back resize
2018-11-01 09:19:10 -03:00