Commits · 3bb92743ac2b98021d51b412224e7e9d3cae590c · Mauritz, Falk Marius / SWTII Cal

06 Jun, 2019 3 commits
- hotfix · 3bb92743
  Siedschlag, Lennart authored Jun 06, 2019
  
  3bb92743
- Appointment notes + neues migrationfile · 9ff2d237
  Siedschlag, Lennart authored Jun 06, 2019
  
  9ff2d237
- Datenbankanbindung funktioniert komplett · fd065d45
  Siedschlag, Lennart authored Jun 06, 2019
  
  fd065d45
05 Jun, 2019 25 commits
- Merge branch 'AqueductBranch' of... · 81f31289
  Daniel Waage authored Jun 05, 2019
```
Merge branch 'AqueductBranch' of https://git.mylab.th-luebeck.de/marius.mauritz/swtii-cal into AqueductBranch
```
  81f31289
- neue seed und mock login · 23a8002d
  Siedschlag, Lennart authored Jun 05, 2019
  
  23a8002d
- Css fix · d9c938ca
  Daniel Waage authored Jun 05, 2019
  
  d9c938ca
- css fix smol · e457d51b
  Daniel Waage authored Jun 05, 2019
  
  e457d51b
- Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch · 48e001dc
  Mauritz, Falk Marius authored Jun 05, 2019
  
  48e001dc
- sachem · 8ff83e52
  Mauritz, Falk Marius authored Jun 05, 2019
  
  8ff83e52
- neue seed · c2f632b3
  Siedschlag, Lennart authored Jun 05, 2019
  
  c2f632b3
- Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch · 9d5d4196
  Mauritz, Falk Marius authored Jun 05, 2019
  
  9d5d4196
- Zero User · ae315052
  Mauritz, Falk Marius authored Jun 05, 2019
  
  ae315052
- Merge branch 'AqueductBranch' of... · ec84c68a
  Daniel Waage authored Jun 05, 2019
```
Merge branch 'AqueductBranch' of https://git.mylab.th-luebeck.de/marius.mauritz/swtii-cal into AqueductBranch
```
  ec84c68a
- css fix'd · 2d2b4424
  Daniel Waage authored Jun 05, 2019
  
  2d2b4424
- Merge branch 'Tests' into AqueductBranch · 870f59fc
  HellLab authored Jun 05, 2019
  
  870f59fc
- removed 0 for notifications · 98c084bb
  Mauritz, Falk Marius authored Jun 05, 2019
  
  98c084bb
- hallo · 8d79fb93
  HellLab authored Jun 05, 2019
  
  8d79fb93
- Merge remote-tracking branch 'origin/AqueductBranch' into Tests · b3513ab3
  HellLab authored Jun 05, 2019
```
# Conflicts:
#	frontend/lib/src/model/appointment.dart
#	frontend/lib/src/model/person.dart
```
  b3513ab3
- tests · ce2a2697
  HellLab authored Jun 05, 2019
  
  ce2a2697
- user put post · 42b2efa0
  Siedschlag, Lennart authored Jun 05, 2019
  
  42b2efa0
- Merge branch 'AqueductBranch' of... · 8a5d9716
  Siedschlag, Lennart authored Jun 05, 2019
```
Merge branch 'AqueductBranch' of https://git.mylab.th-luebeck.de/marius.mauritz/swtii-cal into AqueductBranch
```
  8a5d9716
- removed prints · ed692e1d
  Mauritz, Falk Marius authored Jun 05, 2019
  
  ed692e1d
- Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch · 92db1e16
  Siedschlag, Lennart authored Jun 05, 2019
```
# Conflicts:
#	middleman/lib/controller/appointment_controller.dart
```
  92db1e16
- neue seed · f33b8d12
  Siedschlag, Lennart authored Jun 05, 2019
  
  f33b8d12
- removed prints · 3a10596d
  Mauritz, Falk Marius authored Jun 05, 2019
  
  3a10596d
- neue seed · 2c509b1a
  Siedschlag, Lennart authored Jun 05, 2019
  
  2c509b1a
- put und post tun wie sie sollen · 7e55f0e0
  Mauritz, Falk Marius authored Jun 05, 2019
  
  7e55f0e0
- update und so · 413545da
  Mauritz, Falk Marius authored Jun 05, 2019
  
  413545da
04 Jun, 2019 12 commits
- Tests für day, month, und appointment · efc05f8d
  Wosiek, Oliver authored Jun 04, 2019
  
  efc05f8d
- Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch · 56de43ec
  Mauritz, Falk Marius authored Jun 04, 2019
  
  56de43ec
- contact get fix · d34ebc68
  Siedschlag, Lennart authored Jun 04, 2019
  
  d34ebc68
- updated for docker compose · 4a308b54
  Mauritz, Falk Marius authored Jun 04, 2019
  
  4a308b54
- contact fix · 31e5b6b6
  Siedschlag, Lennart authored Jun 04, 2019
  
  31e5b6b6
- Merge branch 'AqueductBranch' of... · 3ea189c9
  Siedschlag, Lennart authored Jun 04, 2019
```
Merge branch 'AqueductBranch' of https://git.mylab.th-luebeck.de/marius.mauritz/swtii-cal into AqueductBranch
```
  3ea189c9
- updated for docker compose · 584686f4
  Mauritz, Falk Marius authored Jun 04, 2019
  
  584686f4
- Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch · 43064014
  Siedschlag, Lennart authored Jun 04, 2019
```
# Conflicts:
#	middleman/migrations/00000001_initial.migration.dart
```
  43064014
- neues migrationfile · d52df53e
  Siedschlag, Lennart authored Jun 04, 2019
  
  d52df53e
- updated for docker compose · 579b1e14
  Mauritz, Falk Marius authored Jun 04, 2019
  
  579b1e14
- neues migrationfile · e706bdae
  Siedschlag, Lennart authored Jun 04, 2019
  
  e706bdae
- neues migrationfile · b7544670
  Siedschlag, Lennart authored Jun 04, 2019
  
  b7544670