Commits · d9c5a1e58629cd91993c8472de3f88e3185fdf53 · thalia / concrexit

31 May, 2018 1 commit
- Fix settings import to the right module · d9c5a1e5
  Sébastiaan Versteeg authored May 31, 2018
  
  d9c5a1e5
23 May, 2018 6 commits
- Merge branch 'remove-regenerate' into 'master' · dc43cab9
  Sébastiaan Versteeg authored May 23, 2018
```
Remove thabloid regeneration migration

See merge request !803
```
  dc43cab9
- Remove thabloid regeneration migration · 734d7738
  Sébastiaan Versteeg authored May 23, 2018
  
  734d7738
- Merge branch 'feature/presence-events' into 'master' · 97b40767
  Sébastiaan Versteeg authored May 23, 2018
```
Added presence and payment status to registration details page

Closes #628

See merge request !793
```
  97b40767
- Merge branch 'fix-deploy-build' into 'master' · 7e6d9922
  Sébastiaan Versteeg authored May 23, 2018
```
fix deploy by renaming image

See merge request !800
```
  7e6d9922
- fix deploy by renaming image · f852d8fe
  Thom Wiggers authored May 23, 2018
  
  f852d8fe
- Add presence and payment status to event details · c0ba8bb6
  Tom van Bussel authored May 09, 2018
  
  c0ba8bb6
22 May, 2018 4 commits

Thom Wiggers authored May 22, 2018

Merge branch '629-generate-statistics-about-downloads-and-uploads-for-the-summaries-and-tests' into 'master'

Resolve "generate statistics about downloads and uploads for the summaries and tests"

Closes #629

See merge request !794

5a92a8a5

Merge branch 'feature/event-terms' into 'master' · bd173277
Thom Wiggers authored May 22, 2018
```
Added terms and conditions to event registrations

Closes #601

See merge request !797
```
bd173277
Merge branch 'feature/documentation-registrations' into 'master' · 7ce868f3
Thom Wiggers authored May 22, 2018
```
Add documentation for the registrations module

See merge request !798
```
7ce868f3
Merge branch 'feature/documentation-payments' into 'master' · 7e96219f
Thom Wiggers authored May 22, 2018
```
Add documentation for the payments module

See merge request !799
```
7e96219f

21 May, 2018 2 commits
- Add documentation for the registrations module · 49ff02ed
  Sébastiaan Versteeg authored May 21, 2018
  
  49ff02ed
- Add documentation for the payments module · 1120f1fe
  Sébastiaan Versteeg authored May 21, 2018
  
  1120f1fe
16 May, 2018 12 commits
- Added terms and conditions to event registrations · 6e8f74a0
  Tom van Bussel authored May 16, 2018
  
  6e8f74a0
- create tracking of downloads and reporting in admin · 5ec79bc1
  Luko van der Maas authored May 16, 2018
  
  5ec79bc1
- Merge branch 'feature/photos-api-filters' into 'master' · cc428fbf
  Thom Wiggers authored May 16, 2018
```
Add search filter to photos api

See merge request !795
```
  cc428fbf
- Merge branch 'fix/photos-api-cover' into 'master' · 2c452863
  Thom Wiggers authored May 16, 2018
```
Allow the album cover to return None when the album has no images

See merge request !796
```
  2c452863
- Add filters to the photo API · a218b28e
  Sébastiaan Versteeg authored May 16, 2018
  
  a218b28e
- Merge branch '58-improve-statistics-pizza' into 'master' · b527cccd
  Sébastiaan Versteeg authored May 16, 2018
```
Resolve "Improve statistics"

See merge request !789
```
  b527cccd
- Allow the album cover to return None when the album has no images · e241fb3c
  Sébastiaan Versteeg authored May 16, 2018
  
  e241fb3c
- added translation of messages in js · 726d7236
  Luko van der Maas authored May 16, 2018
  
  726d7236
- generated docs for the changes in pizzas · bd2d6184
  Luko van der Maas authored May 16, 2018
  
  bd2d6184
- added statistics for current and all pizza orders · 4dabdf60
  Luko van der Maas authored Apr 10, 2018
  
  4dabdf60
- Merge branch 'tc/add-text-renewing' into 'master' · 735514e6
  Thom Wiggers authored May 16, 2018
```
Improve usability by adding explanation about existing accounts

Closes #608

See merge request !787
```
  735514e6
- Merge branch 'fix/cancel-with-fine' into 'master' · 6ce9ffcf
  Thom Wiggers authored May 16, 2018
```
Allow event cancellations when member has a fine

Closes #627

See merge request !792
```
  6ce9ffcf
09 May, 2018 3 commits
- Improve usability by adding explanation about existing accounts · 00846c3d
  Sébastiaan Versteeg authored Apr 13, 2018
  
  00846c3d
- Allow event cancellations when member has a fine · 7ad56b86
  Tom van Bussel authored May 09, 2018
  
  7ad56b86
- Merge branch 'sderksen/concrexit-patch-1' · 39f389ff
  Thom Wiggers authored May 09, 2018
```
Signed-off-by: Thom Wiggers <thom@thomwiggers.nl>
```
  39f389ff
08 May, 2018 6 commits
- Merge branch 'safety' into 'master' · 7ae3957c
  Sébastiaan Versteeg authored May 08, 2018
```
Disable pipconflictchecker and include a check if the requirements are up to date into CI.

See merge request !790
```
  7ae3957c
- Added non-breaking space between the €-sign and price to prevent it from breaking to a newline · f58f3387
  Stan Derksen authored May 08, 2018
  
  f58f3387
- Merge branch 'fix/renewal-page-no-membership' into 'master' · 578a4140
  Thom Wiggers authored May 08, 2018
```
Fix membership renewal page when user has no previous memberships

Closes #622

See merge request !785
```
  578a4140
- Merge branch 'feature/member-committee-roles' into 'master' · ee80ef0d
  Thom Wiggers authored May 08, 2018
```
Add committee roles to overview page

Closes #604

See merge request !788
```
  ee80ef0d
- Implement safety check to check if our dependencies are somewhat up-to-date · a2a470ce
  Thom Wiggers authored May 08, 2018
  
  a2a470ce
- Disable pipconflictchecker (#631 ) · c24dfde4
  Thom Wiggers authored May 08, 2018
  
  c24dfde4
13 Apr, 2018 4 commits
- Add committee roles to overview page · 81bcc26c
  Sébastiaan Versteeg authored Apr 13, 2018
  
  81bcc26c
- Fix membership renewal page when use has no previous memberships · cf6c26c1
  Sébastiaan Versteeg authored Apr 13, 2018
  
  cf6c26c1
- Merge branch 'fix/renewal-typo' into 'master' · fcc1deff
  Thom Wiggers authored Apr 13, 2018
```
Fix typo on renewal page

Closes #623

See merge request !786
```
  fcc1deff
- Fix typo on renewal page · 816cd6cd
  Sébastiaan Versteeg authored Apr 13, 2018
  
  816cd6cd
05 Apr, 2018 2 commits
- Merge branch 'build-docker' into 'master' · 4499865f
  Sébastiaan Versteeg authored Apr 05, 2018
```
Build and test container in CI

Closes #613

See merge request !781
```
  4499865f
- Merge branch 'feature/thabloid-better-image-quality' into 'master' · 26303ade
  Thom Wiggers authored Apr 05, 2018
```
Improve Thabloid image quality

See merge request !749
```
  26303ade