Commits · aec373ba4c90b96d477242e0300a6e22e05eb659 · thalia / concrexit

09 Jul, 2018 1 commit
- Get CELERY_BROKER_URL from env vars as a whole · aec373ba
  Joren Vrancken authored Jul 08, 2018
  
  aec373ba
06 Jul, 2018 2 commits
- Merge branch 'docker_compose_update' into 'master' · 8d87aca3
  Sébastiaan Versteeg authored Jul 06, 2018
```
Docker compose update

See merge request !850
```
  8d87aca3
- Merge branch 'validate_docker_compose' into 'master' · 43b6d238
  Sébastiaan Versteeg authored Jul 06, 2018
```
Validate docker-compose.yml

See merge request !851
```
  43b6d238
05 Jul, 2018 5 commits
- Validate docker-compose.yml · c994e558
  Joren Vrancken authored Jul 05, 2018
  
  c994e558
- Run celery as nobody instead of root · 42ab49e9
  Joren Vrancken authored Jul 05, 2018
  
  42ab49e9
- Change dependency from celery to redis · cd8a1134
  Joren Vrancken authored Jul 05, 2018
  
  cd8a1134
- Use newer version of docker-compose · 1ad84609
  Joren Vrancken authored Jul 05, 2018
  
  1ad84609
- Merge branch 'fix/presence-payment' into 'master' · 700a5baf
  Sébastiaan Versteeg authored Jul 05, 2018
```
Fix conditions for showing presence and payment on the event page

See merge request !845
```
  700a5baf
04 Jul, 2018 2 commits
- Fix conditions for showing presence and payment · 2e6f1ce5
  Tom van Bussel authored Jul 04, 2018
```
on the event page
```
  2e6f1ce5
- Merge branch 'fix-admin-documents' into 'master' · 2092340a
  Sébastiaan Versteeg authored Jul 04, 2018
```
Allow accessing documents from admin pages

Closes #642

See merge request !841
```
  2092340a
28 Jun, 2018 1 commit
- Merge branch 'postgres_password' into 'master' · 7b259d67
  Thom Wiggers authored Jun 28, 2018
```
Postgres password

See merge request !843
```
  7b259d67
27 Jun, 2018 2 commits
- Add PASSWORD to postgres config · 103035bc
  Joren Vrancken authored Jun 27, 2018
  
  103035bc
- Merge branch 'fix/email-change-confirm' into 'master' · 5a7773ce
  Thom Wiggers authored Jun 27, 2018
```
Fix 'to' email address in email change confirmation email

See merge request !842
```
  5a7773ce
21 Jun, 2018 2 commits
- Fix 'to' email address in email change confirmation email · 54838059
  Sébastiaan Versteeg authored Jun 21, 2018
  
  54838059
- Allow accessing documents from admin pages · e9b80e2e
  Thom Wiggers authored Jun 20, 2018
```
Closes #642
```
  e9b80e2e
20 Jun, 2018 1 commit
- Merge branch 'fix/merge-migrations-events' into 'master' · ad3a6735
  Tom van Bussel authored Jun 20, 2018
```
Merge events migrations

See merge request !840
```
  ad3a6735
18 Jun, 2018 1 commit
- Merge events migrations · 07dc8012
  Sébastiaan Versteeg authored Jun 18, 2018
  
  07dc8012
14 Jun, 2018 1 commit
- Merge branch 'feature/scheduled-notifications' into 'master' · 2bdec9b3
  Luko van der Maas authored Jun 14, 2018
```
Scheduled notifications for events

See merge request !831
```
  2bdec9b3
13 Jun, 2018 22 commits
- Merge branch 'fix/documents-unavailable' into 'master' · 8bc4bcbd
  Joren Vrancken authored Jun 13, 2018
```
Fix LectureYearFilter if no documents yet

See merge request !839
```
  8bc4bcbd
- Fix LectureYearFilter if no documents yet · 0135e3b4
  Sébastiaan Versteeg authored Jun 13, 2018
  
  0135e3b4
- Merge branch '641-lecture-year' into 'master' · c3ce8af6
  Sébastiaan Versteeg authored Jun 13, 2018
```
Resolve "It is unclear if the year field on documents in the backend refers to the first or last year of the academic year."

Closes #641

See merge request !838
```
  c3ce8af6
- Merge branch 'feature/personal-ical-feed' into 'master' · 0629c95c
  Sébastiaan Versteeg authored Jun 13, 2018
```
Added token-based personal iCal feed

Closes #646

See merge request !836
```
  0629c95c
- Clarify lecture years in documents admin · a8e901a0
  Tom van Bussel authored Jun 13, 2018
  
  a8e901a0
- Merge branch 'fix/event-cancel-after-start' into 'master' · 83c58cdf
  Tom van Bussel authored Jun 13, 2018
```
Disallow cancellation after event start

See merge request !837
```
  83c58cdf
- Disallow cancellation after event start · 25fecda3
  Sébastiaan Versteeg authored Jun 13, 2018
  
  25fecda3
- Added token-based personal iCal feed · f76ddc0a
  Gijs Hendriksen authored Jun 13, 2018
  
  f76ddc0a
- Merge branch 'fix/remove-onion-service-link' into 'master' · f5d3aa7a
  Tom van Bussel authored Jun 13, 2018
```
Remove .onion service link in footer

See merge request !835
```
  f5d3aa7a
- Merge branch 'feature/force-general-category' into 'master' · e2d2daa2
  Tom van Bussel authored Jun 13, 2018
```
Force general category

See merge request !833
```
  e2d2daa2
- Remove .onion service link in footer · f135e920
  Sébastiaan Versteeg authored Jun 13, 2018
  
  f135e920
- Add reminder notifications for events · 70b089d7
  Sébastiaan Versteeg authored Jun 09, 2018
  
  70b089d7
- Merge branch 'feature/email-change' into 'master' · b5a52413
  Tom van Bussel authored Jun 13, 2018
```
Add email change feature to members

Closes #544

See merge request !827
```
  b5a52413
- Merge branch '640-new-filter' into 'master' · 30aaf9c5
  Sébastiaan Versteeg authored Jun 13, 2018
```
Add filter to committee membership admin for active memberships

Closes #640

See merge request !834
```
  30aaf9c5
- Add a new filter for active committee memberships · c4c927e6
  Tom van Bussel authored Jun 13, 2018
  
  c4c927e6
- Add email change feature to members · 3be5cfc5
  Sébastiaan Versteeg authored Jun 07, 2018
  
  3be5cfc5
- Merge branch 'fix/pushnotification-registration' into 'master' · 998cd827
  Tom van Bussel authored Jun 13, 2018
```
Fix push notification registration request

Closes ThaliApp#63

See merge request !832
```
  998cd827
- Merge branch 'fix/education-membership-required' into 'master' · ce196335
  Tom van Bussel authored Jun 13, 2018
```
Add membership decorator and require an active membership to download exams/summaries

See merge request !814
```
  ce196335
- Merge branch 'feature/events-documentation' into 'master' · d100b118
  Tom van Bussel authored Jun 13, 2018
```
Add docs to events package

Closes #575

See merge request !813
```
  d100b118
- Add docs to events package · c78e77db
  Sébastiaan Versteeg authored May 27, 2018
  
  c78e77db
- Merge branch 'feature/documents-documentation' into 'master' · 0d0affd0
  Tom van Bussel authored Jun 13, 2018
```
Add documentation to the documents package

Closes #573

See merge request !811
```
  0d0affd0
- Merge branch 'fix/html-entities-organiser-email' into 'master' · a724a226
  Tom van Bussel authored Jun 13, 2018
```
Fix HTML entities in the event organiser email

Closes #625

See merge request !821
```
  a724a226