Commits · master · Saar Hackathon / 2019 / Plasticalypse

13 Jan, 2019 40 commits
- Merge branch 'master' of 192.168.188.7:KDK/plastic-free · bb87c8f5
  David Würfel authored Jan 13, 2019
  
  bb87c8f5
- fix · 5231d354
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  5231d354
- minor stylings · d71055fe
  David Würfel authored Jan 13, 2019
  
  d71055fe
- fix nach Aline · c656d33b
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  c656d33b
- revert mock service · 4c93d8ce
  David Würfel authored Jan 13, 2019
  
  4c93d8ce
- align buttons on profile · 106245a7
  David Würfel authored Jan 13, 2019
  
  106245a7
- Merge branch 'master' of plastic-free:KDK/plastic-free · 37a088a5
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  37a088a5
- fixes · 138a1921
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  138a1921
- Merge branch 'backend_django' of KDK/plastic-free into master · c732b73d
  Frederik Möllers authored Jan 13, 2019
  
  c732b73d
- Complete Backend and Python Cleanup · 5fce4d70
  Frederik Möllers authored Jan 13, 2019
```
Complete backend functionality for first prototype
Clean up compiled python files
```
  5fce4d70
- remove mock · 27f03f48
  David Würfel authored Jan 13, 2019
  
  27f03f48
- Merge branch 'master' of 192.168.188.7:KDK/plastic-free · a92f4075
  David Würfel authored Jan 13, 2019
  
  a92f4075
- add loslegen button styling · 72356955
  David Würfel authored Jan 13, 2019
  
  72356955
- Merge branch 'master' of plastic-free:KDK/plastic-free · 367c46a1
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  367c46a1
- foo · aface842
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  aface842
- show hamburger menu only if logged in · 132d9af0
  David Würfel authored Jan 13, 2019
  
  132d9af0
- enable scrolling (quiz, profile) · 924cd954
  David Würfel authored Jan 13, 2019
  
  924cd954
- Merge branch 'master' of 192.168.188.7:KDK/plastic-free · 23241f38
  David Würfel authored Jan 13, 2019
  
  23241f38
- fix ts lint error · 5c1f27e2
  David Würfel authored Jan 13, 2019
  
  5c1f27e2
- styling expander and profile · 9936c240
  David Würfel authored Jan 13, 2019
  
  9936c240
- add background to profile · 3ccbf1c2
  David Würfel authored Jan 13, 2019
  
  3ccbf1c2
- fixes · f29a27e9
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  f29a27e9
- Merge branch 'master' of plastic-free:KDK/plastic-free · e90e23c6
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  e90e23c6
- fixes · dea0e652
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  dea0e652
- fix burger menu button style · 803ef213
  David Würfel authored Jan 13, 2019
  
  803ef213
- fix inc and dec buttons in quiz · 0199350a
  David Würfel authored Jan 13, 2019
  
  0199350a
- navigate to evaluation · 69c5d2cb
  David Würfel authored Jan 13, 2019
  
  69c5d2cb
- add go button · f9f289f2
  David Würfel authored Jan 13, 2019
  
  f9f289f2
- basic navigation · 4f7b4e98
  David Würfel authored Jan 13, 2019
  
  4f7b4e98
- fix service type error · e3f67322
  David Würfel authored Jan 13, 2019
  
  e3f67322
- Merge branch 'master' of plastic-free:KDK/plastic-free · 01bfe6ce
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  01bfe6ce
- Merge branch 'feature/evaluation' of KDK/plastic-free into master · 9103c986
  centigrade-kdk authored Jan 13, 2019
  
  9103c986
- Merge branch 'master' of plastic-free:KDK/plastic-free · d5b8cd7c
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  d5b8cd7c
- foo · 57a61582
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  57a61582
- fix generic · 06611663
  alke authored Jan 13, 2019
  
  06611663
- update package.lock · db31478e
  alke authored Jan 13, 2019
  
  db31478e
- Merge branch 'master' into feature/frontend-profile · f89505f4
  alke authored Jan 13, 2019
  
  f89505f4
- load user data from server · c99cb4ab
  alke authored Jan 13, 2019
  
  c99cb4ab
- Merge branch 'master' of plastic-free:KDK/plastic-free · 6d19cd00
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  6d19cd00
- add grocery api · 92ef5d89
  Kai-Dominik Kuhn authored Jan 13, 2019
  
  92ef5d89