Commits · 284675f9aee23b1bb3384300a7ea57f2f7ab2a6e · thalia / concrexit

20 Jan, 2018 1 commit
- Show cancellation dates in event admin · 284675f9
  Sébastiaan Versteeg authored Jan 16, 2018
  
  284675f9
12 Jan, 2018 2 commits
- Merge branch 'fix/datetime-in-migration' into 'master' · f743ee83
  Thom Wiggers authored Jan 12, 2018
```
Fix migration containing datetime

See merge request !657
```
  f743ee83
- Fix migration containing datetime · f195f7bf
  Sébastiaan Versteeg authored Jan 12, 2018
  
  f195f7bf
11 Jan, 2018 7 commits
- Merge branch 'fix/ci-build-docker' into 'master' · 867f9dfc
  Thom Wiggers authored Jan 11, 2018
```
Change images for django20 tests in CI

See merge request !651
```
  867f9dfc
- Change images for django20 tests in CI · d6c88080
  Sébastiaan Versteeg authored Jan 11, 2018
  
  d6c88080
- Merge branch 'fix-missing-migration' into 'master' · d1e3ed2f
  Sébastiaan Versteeg authored Jan 11, 2018
```
Fix missing migration

See merge request !650
```
  d1e3ed2f
- Fix missing migration · c2997a5e
  Thom Wiggers authored Jan 11, 2018
  
  c2997a5e
- Merge branch 'nameless-volume' into 'master' · fde1665c
  Sébastiaan Versteeg authored Jan 11, 2018
```
Use anonymous volume to cache docs build if not mounted

See merge request !647
```
  fde1665c
- Merge branch 'django-2' into 'master' · 75c50256
  Sébastiaan Versteeg authored Jan 11, 2018
```
Django 2

Closes #521

See merge request !627
```
  75c50256
- Merge branch 'fix/events-services-member-object' into 'master' · 2bfc0071
  Thom Wiggers authored Jan 11, 2018
```
Fix issues with the member object in events services

See merge request !648
```
  2bfc0071
10 Jan, 2018 12 commits
- Merge branch 'keep-docs-up-to-date' into 'master' · 6899a906
  Sébastiaan Versteeg authored Jan 10, 2018
```
Check for docs changes

See merge request !643
```
  6899a906
- Fix issues with the member object in events services · 2aef9874
  Sébastiaan Versteeg authored Jan 10, 2018
  
  2aef9874
- Suppress warning about references · 6d87f1f6
  Thom Wiggers authored Jan 10, 2018
  
  6d87f1f6
- link to python shit · a25ac3b3
  Thom Wiggers authored Jan 10, 2018
  
  a25ac3b3
- Update generated docs with newer sphinx version · ef754e2c
  Thom Wiggers authored Jan 10, 2018
  
  ef754e2c
- Refactor bannerdir to fix import in docs · 4e9b7e32
  Thom Wiggers authored Jan 10, 2018
  
  4e9b7e32
- Fix doctest comment · 29a71089
  Thom Wiggers authored Jan 10, 2018
  
  29a71089
- Use sphinx directly · 5df127a0
  Thom Wiggers authored Jan 03, 2018
  
  5df127a0
- Check for docs changes · 22e9337f
  Thom Wiggers authored Jan 03, 2018
  
  22e9337f
- Use anonymous volume to cache docs build if not mounted · 59a149d0
  Thom Wiggers authored Jan 10, 2018
  
  59a149d0
- Merge branch '549-ctrl-alt-delirium-can-order-inactive-pizza-s' into 'master' · 1ebd5f8a
  Sébastiaan Versteeg authored Jan 10, 2018
```
Only order available products

Closes #549 and #548

See merge request !633
```
  1ebd5f8a
- Merge branch 'update-docs' into 'master' · 1aa2e7b3
  Sébastiaan Versteeg authored Jan 10, 2018
```
Update docs

See merge request !642
```
  1aa2e7b3
09 Jan, 2018 2 commits
- Update docs · 98a795d5
  Thom Wiggers authored Jan 03, 2018
  
  98a795d5
- Merge branch 'fix/docker_compose' into 'master' · 9545dda7
  Thom Wiggers authored Jan 09, 2018
```
Change the volumes docker-compose.yml

See merge request !646
```
  9545dda7
08 Jan, 2018 16 commits
- Change the volumes docker-compose.yml · 14fcac23
  Joren Vrancken authored Jan 08, 2018
  
  14fcac23
- Merge branch 'fix/careers-page' into 'master' · 2d25c29d
  Thom Wiggers authored Jan 08, 2018
```
Fix careers page ui on mobile

Closes #440

See merge request !631
```
  2d25c29d
- Squash pizzas migration · 0c261fd1
  Thom Wiggers authored Jan 08, 2018
  
  0c261fd1
- Merge branch 'faster-build' into 'master' · c564c1f1
  Sébastiaan Versteeg authored Jan 08, 2018
```
Speed up CI

See merge request !641
```
  c564c1f1
- Fix careers page ui on mobile · 25bd7571
  Sébastiaan Versteeg authored Dec 11, 2017 and Joren Vrancken committed Jan 08, 2018
  
  25bd7571
- Merge branch 'docs_sphinx' into 'master' · fff51f83
  Thom Wiggers authored Jan 08, 2018
```
Docs Sphinx Dockerfile

See merge request !635
```
  fff51f83
- Fix migrations for Django 2.0 · 2dca100d
  Thom Wiggers authored Jan 08, 2018
  
  2dca100d
- Add missing migration · 20221b17
  Thom Wiggers authored Jan 08, 2018
  
  20221b17
- also test python 3.6 · fcdb0d90
  Thom Wiggers authored Dec 06, 2017
  
  fcdb0d90
- Test with appropriate versions · 4ab9bf7c
  Thom Wiggers authored Nov 29, 2017
  
  4ab9bf7c
- Fix compatibility issues · 2d71b8a5
  Thom Wiggers authored Nov 29, 2017
  
  2d71b8a5
- Fix missing on_delete · 46306a40
  Thom Wiggers authored Nov 29, 2017
  
  46306a40
- Update requirements · f6cc10c1
  Thom Wiggers authored Nov 29, 2017
  
  f6cc10c1
- At least use 3.7.1 · cfd5e5ea
  Thom Wiggers authored Oct 17, 2017
  
  cfd5e5ea
- Django 2.0 compatibility · 1b30d84e
  Thom Wiggers authored Oct 03, 2017
```
Update to beta 1
```
  1b30d84e
- Merge branch 'reg-tests' into 'master' · bc5388c0
  Sébastiaan Versteeg authored Jan 08, 2018
```
Improve registrations tests

See merge request !645
```
  bc5388c0