Commits · 91ea9ecc3a2d33855cfc90b248ef68c92a51b2a3 · thalia / concrexit

13 Oct, 2018 2 commits
- Merge branch 'fix/sitemaps' into 'master' · 91ea9ecc
  Luko van der Maas authored Oct 13, 2018
```
Fix activemembers sitemap

See merge request !994
```
  91ea9ecc
- Fix activemembers sitemap · 16d2632d
  Sébastiaan Versteeg authored Oct 12, 2018 and Luko van der Maas committed Oct 13, 2018
  
  16d2632d
12 Oct, 2018 3 commits
- Merge branch 'fix/719' into 'master' · 875e67ee
  Sébastiaan Versteeg authored Oct 12, 2018
```
Do not pin pip version

Closes #719

See merge request !993
```
  875e67ee
- Do not pin pip version · 67f13918
  Joren Vrancken authored Oct 12, 2018
  
  67f13918
- Merge branch 'fix/wiki-login' into 'master' · 89236643
  Thom Wiggers authored Oct 12, 2018
```
Fix wiki login

See merge request !992
```
  89236643
11 Oct, 2018 6 commits
- Fix the wiki login · 20b1d438
  Sébastiaan Versteeg authored Oct 11, 2018
  
  20b1d438
- Add extra tests for wiki login · 8f58ef96
  Sébastiaan Versteeg authored Oct 11, 2018
  
  8f58ef96
- Merge branch 'fix/mailinglists' into 'master' · e577035a
  Thom Wiggers authored Oct 11, 2018
```
Fix committeemembership reference in mailinglists

See merge request !991
```
  e577035a
- Fix committeemembership reference in mailinglists · 7be94d34
  Sébastiaan Versteeg authored Oct 11, 2018
  
  7be94d34
- Merge branch 'fix/dataminimisation-tests' into 'master' · 0e912875
  Sébastiaan Versteeg authored Oct 11, 2018
```
Fix dataminimisation tests

See merge request !990
```
  0e912875
- Fix dataminimisation tests [ci-skip] · 3a6ee4a9
  Sébastiaan Versteeg authored Oct 11, 2018
  
  3a6ee4a9
10 Oct, 2018 14 commits
- Merge branch 'feature/new-template-photos' into 'master' · 34df2854
  Tom van Bussel authored Oct 10, 2018
```
Migrate photos package to new template

See merge request !970
```
  34df2854
- Fix fancybox styling · 585efd28
  Sébastiaan Versteeg authored Oct 10, 2018
  
  585efd28
- Migrate photos package to new template · eedb6b80
  Sébastiaan Versteeg authored Oct 02, 2018
  
  eedb6b80
- Merge branch 'check-translations-with-pep' into 'master' · fb65c313
  Sébastiaan Versteeg authored Oct 10, 2018
```
Check obsolete translations with codestyle and fix codestyle test

See merge request !985
```
  fb65c313
- Format line included by rebase · 9633bdd2
  Thom Wiggers authored Oct 10, 2018
  
  9633bdd2
- Format looots of code · 78a96034
  Thom Wiggers authored Oct 10, 2018
  
  78a96034
- Fix flake8 interpreter · 02055acc
  Thom Wiggers authored Oct 10, 2018
  
  02055acc
- Check obsolete translations with codestyle · 054c8c42
  Thom Wiggers authored Oct 10, 2018
```
Otherwise we delay our pipelines.
```
  054c8c42
- Merge branch... · 7e408ae6
  Sébastiaan Versteeg authored Oct 10, 2018
```
Merge branch '720-event-registration-export-does-not-have-the-correct-date-associated-with-it' into 'master'

Event registration export does not have the correct date associated with it.

Closes #720

See merge request !984
```
  7e408ae6
- fixed the date format of the exported registration date · 71a12125
  Luko van der Maas authored Oct 10, 2018 and Sébastiaan Versteeg committed Oct 10, 2018
  
  71a12125
- Merge branch 'fix/map-location' into 'master' · 576ad42f
  Luko van der Maas authored Oct 10, 2018
```
Fix map location in event view

See merge request !986
```
  576ad42f
- Fix map location in event view [ci-skip] · 9881dd72
  Sébastiaan Versteeg authored Oct 10, 2018
  
  9881dd72
- Merge branch 'feature/new-template-registration' into 'master' · e6cfd04b
  Thom Wiggers authored Oct 10, 2018
```
Migrate registration to new template

See merge request !969
```
  e6cfd04b
- Migrate registration to new template · 80c6d138
  Sébastiaan Versteeg authored Oct 10, 2018 and Thom Wiggers committed Oct 10, 2018
  
  80c6d138
09 Oct, 2018 3 commits
- Merge branch 'feature/new-template-merchandise' into 'master' · b89f7160
  Thom Wiggers authored Oct 09, 2018
```
Migrate merchandise to new template

Closes #713

See merge request !971
```
  b89f7160
- Migrate merchandise to new template · cc572623
  Sébastiaan Versteeg authored Oct 02, 2018 and Thom Wiggers committed Oct 09, 2018
  
  cc572623
- Merge branch 'new-template-changes' into 'master' · 6ddc3c3f
  Thom Wiggers authored Oct 09, 2018
```
Create constants for thumbnail sizes and make navbar sticky

See merge request !979
```
  6ddc3c3f
05 Oct, 2018 9 commits
- Fix events external registration · 2c55ef0c
  Sébastiaan Versteeg authored Oct 05, 2018
  
  2c55ef0c
- Create constants for thumbnail sizes and make navbar sticky · d750e8c7
  Sébastiaan Versteeg authored Oct 04, 2018
  
  d750e8c7
- Merge branch 'celery_state' into 'master' · 3fcf53fd
  Sébastiaan Versteeg authored Oct 05, 2018
```
Add state database to celery

See merge request !980
```
  3fcf53fd
- Add state database to celery · c1534e4e
  Joren Vrancken authored Oct 04, 2018 and Sébastiaan Versteeg committed Oct 05, 2018
  
  c1534e4e
- Merge branch 'obsolete_translations_thaliawebsite' into 'master' · 67857ec2
  Sébastiaan Versteeg authored Oct 05, 2018
```
Remove obsolete translations

See merge request !981
```
  67857ec2
- Add obsolete translations check to CI · 18dc0355
  Joren Vrancken authored Oct 05, 2018
  
  18dc0355
- Merge branch 'patch-1' into 'master' · 84a17101
  Joren Vrancken authored Oct 05, 2018
```
Force pip install 18.0 in tox.ini

See merge request !982
```
  84a17101
- Remove obsolete translations · f9bd2262
  Joren Vrancken authored Oct 05, 2018
  
  f9bd2262
- Force pip install 18.0 in tox.ini · ee7cc4e3
  Sébastiaan Versteeg authored Oct 05, 2018
  
  ee7cc4e3
04 Oct, 2018 3 commits
- Merge branch 'make_snumber_unique' into 'master' · 333f9055
  Sébastiaan Versteeg authored Oct 04, 2018
```
Make student number unique

See merge request !977
```
  333f9055
- Repair fixtures · f09ccba4
  Thom Wiggers authored Oct 04, 2018 and Sébastiaan Versteeg committed Oct 04, 2018
  
  f09ccba4
- Make s-numbers unique · f23b986f
  Thom Wiggers authored Oct 03, 2018 and Sébastiaan Versteeg committed Oct 04, 2018
  
  f23b986f