Commits · v1.12.4 · thalia / concrexit

01 Feb, 2018 3 commits
- Merge branch 'hotfixes' into 'release/1.12' · 16f7c234
  Thom Wiggers authored Feb 01, 2018
```
Hotfixes

See merge request !702
```
  16f7c234
- Use Django security release · 7239845f
  Thom Wiggers authored Feb 01, 2018
  
  7239845f
- Fix #565 hopefully · 78d200a5
  Thom Wiggers authored Feb 01, 2018
  
  78d200a5
23 Jan, 2018 2 commits
- Merge branch 'cherry-pick-0e5c4580' into 'release/1.12' · 8d366f93
  Sébastiaan Versteeg authored Jan 23, 2018
```
Merge branch 'new-location-board-room' into 'master'

See merge request !684
```
  8d366f93
- Merge branch 'new-location-board-room' into 'master' · 3d49e55d
  Thom Wiggers authored Jan 23, 2018 and Sébastiaan Versteeg committed Jan 23, 2018
```
Update texts to new location board room

Closes #563

See merge request !683

(cherry picked from commit 0e5c4580)

c5046801 Update texts to new location board room
```
  3d49e55d
22 Jan, 2018 6 commits

Merge branch 'cherry-pick-0805173b' into 'release/1.12' · 4128f80c
Sébastiaan Versteeg authored Jan 22, 2018
```
Merge branch 'fix/562-newsletter-old-is_active' into 'master'

See merge request !682
```
4128f80c

Merge branch 'fix/562-newsletter-old-is_active' into 'master' · c6e37f7f

Sébastiaan Versteeg authored Jan 22, 2018

Removed usage of old is_active method in newsletters app

Closes #562

See merge request !681

(cherry picked from commit 0805173b)

e75d8283 Removed usage of old is_active method

c6e37f7f

Merge branch 'cherry-pick-da7c5aa1' into 'release/1.12' · e3d9392c
Thom Wiggers authored Jan 22, 2018
```
Hotfix 'fix_from_email' to release/1.12

See merge request !680
```
e3d9392c
Merge branch 'cherry-pick-b09c91a4' into 'release/1.12' · a347b9e3
Sébastiaan Versteeg authored Jan 22, 2018
```
Merge branch 'update-book-list' into 'master'

See merge request !679
```
a347b9e3

Merge branch 'fix_from_email' into 'master' · 7848cec2

Sébastiaan Versteeg authored Jan 19, 2018

Send website emails not from info@thalia.nu

See merge request !676

(cherry picked from commit da7c5aa1)

c1837eb8 Send website emails not from info@thalia.nu

7848cec2

Merge branch 'update-book-list' into 'master' · 86cb8d1b

Sébastiaan Versteeg authored Jan 20, 2018

Updated book list for the second semester

See merge request !677

(cherry picked from commit b09c91a4)

6d602abb Updated book list for the second semester

86cb8d1b

18 Jan, 2018 2 commits
- Merge branch 'cherry-pick-84ce8916' into 'release/1.12' · c8252b33
  Thom Wiggers authored Jan 18, 2018
```
Merge branch 'fix/wikilogin' into 'master'

See merge request !674
```
  c8252b33
- Merge branch 'fix/wikilogin' into 'master' · 89b676ac
  Thom Wiggers authored Jan 18, 2018 and Sébastiaan Versteeg committed Jan 18, 2018
```
Fix wikilogin

See merge request !673

(cherry picked from commit 84ce8916)

b3e0b00f Fix wikilogin
```
  89b676ac
17 Jan, 2018 8 commits

Merge branch 'cherry-pick-a146452e' into 'release/1.12' · e7da84a6
Sébastiaan Versteeg authored Jan 17, 2018
```
Merge branch 'fix/mailinglists-user-member' into 'master'

See merge request !668
```
e7da84a6
Merge branch 'cherry-pick-5e7f90cf' into 'release/1.12' · e22999ec
Tom van Bussel authored Jan 17, 2018
```
Merge branch 'fix/events-anonymous-user' into 'master'

See merge request !669
```
e22999ec

Merge branch 'fix/events-anonymous-user' into 'master' · 84b0b5b7

Sébastiaan Versteeg authored Jan 17, 2018

Fix event pages when user is not logged in

See merge request !666

(cherry picked from commit 5e7f90cf)

19664f2c Fix event pages when user is not logged in

84b0b5b7

Merge branch 'cherry-pick-f59ca0b5' into 'release/1.12' · d7bc5af8
Sébastiaan Versteeg authored Jan 17, 2018
```
Merge branch 'fix/photo-pagination-str' into 'master'

See merge request !667
```
d7bc5af8

Merge branch 'fix/mailinglists-user-member' into 'master' · 32d952b0

Sébastiaan Versteeg authored Jan 17, 2018

Remove old prefetches from the mailinglists

See merge request !664

(cherry picked from commit a146452e)

87aad163 Remove old prefetches from the mailinglists

32d952b0

Merge branch 'fix/photo-pagination-str' into 'master' · c00f790a

Sébastiaan Versteeg authored Jan 17, 2018

Really fix photos pagination this time

See merge request !663

(cherry picked from commit f59ca0b5)

2bb77b67 Really fix photos pagination this time

c00f790a

Merge branch 'cherry-pick-e7401afa' into 'release/1.12' · 9f1b4941
Sébastiaan Versteeg authored Jan 17, 2018
```
Merge branch 'fix/photos-more-than-7-pages' into 'master'

See merge request !662
```
9f1b4941

Merge branch 'fix/photos-more-than-7-pages' into 'master' · 23242a53

Sébastiaan Versteeg authored Jan 17, 2018

Fix photos index view if more than 7 pages exist

See merge request !661

(cherry picked from commit e7401afa)

de72703f Fix photos index view if more than 7 pages exist

23242a53

11 Jan, 2018 2 commits

Merge branch 'cherry-pick-2bfc0071' into 'release/1.12' · 189243ba
Sébastiaan Versteeg authored Jan 11, 2018
```
Hotfix issue with the member object in events service

See merge request !649
```
189243ba

Merge branch 'fix/events-services-member-object' into 'master' · a8b5d919

Thom Wiggers authored Jan 11, 2018

Fix issues with the member object in events services

See merge request !648

(cherry picked from commit 2bfc0071)

2aef9874 Fix issues with the member object in events services

a8b5d919

10 Jan, 2018 2 commits
- 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 13 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
- Merge branch 'reg-tests' into 'master' · bc5388c0
  Sébastiaan Versteeg authored Jan 08, 2018
```
Improve registrations tests

See merge request !645
```
  bc5388c0
- Update Dockerfile to support sphinx · 112093bc
  Joren Vrancken authored Dec 17, 2017
  
  112093bc
- Update mailinglist docs · 666e643f
  Joren Vrancken authored Dec 17, 2017
  
  666e643f
- Harden time-based tests · 88842697
  Thom Wiggers authored Jan 08, 2018
```
Hard-code dates set with freezegun to make the tests easier to read
and more explicit.
```
  88842697
- Add help text and translations · ce3df5fc
  Thom Wiggers authored Jan 02, 2018
  
  ce3df5fc
- Restrict pizzas in API · 5cf4f2b6
  Thom Wiggers authored Jan 02, 2018
  
  5cf4f2b6
- Implement restricting pizzas to special people · 653943eb
  Thom Wiggers authored Dec 13, 2017
```
Implements #548
```
  653943eb