Commits · 01369dc6bb4d62b529328e5bf512951aa642bf46 · thalia / concrexit

05 Dec, 2016 1 commit
- Fix bootstrap override regarding gallery · 01369dc6
  Sébastiaan Versteeg authored Dec 05, 2016
  
  01369dc6
30 Nov, 2016 25 commits
- Merge branch 'fix/logout_path_login_bug' into 'master' · 551fb87c
  Sébastiaan Versteeg authored Nov 30, 2016
```
Fix #191

Closes #191

See merge request !193
```
  551fb87c
- handle .po as binary when merging · 2f4799ec
  Thom Wiggers authored Nov 30, 2016
  
  2f4799ec
- Quick fix · a7113d9c
  Joren Vrancken authored Nov 30, 2016
  
  a7113d9c
- Merge branch 'concrexit-readme-docker' into 'master' · 83deabad
  Thom Wiggers authored Nov 30, 2016
```
README: include Docker instructions

Want docker.

See merge request !192
```
  83deabad
- README: no capital in anchor link to Docker part · 568b057f
  Gerdriaan Mulder authored Nov 30, 2016
  
  568b057f
- Merge branch 'fix/aanmeldingen_aantal_admin_overzicht' into 'master' · dd3e00f8
  Thom Wiggers authored Nov 30, 2016
```
Juist aantal aanmeldingen op admin pagina.

Closes #177

See merge request !191
```
  dd3e00f8
- README: include Docker instructions · 2ea223ae
  Gerdriaan Mulder authored Nov 30, 2016
  
  2ea223ae
- Merge branch '192-ghostscript' into 'master' · df111451
  Thom Wiggers authored Nov 30, 2016
```
Resolve "Ghostscript in Docker"

Closes #192

See merge request !190
```
  df111451
- Fix #177 · 4c42fa17
  Joren Vrancken authored Nov 30, 2016
  
  4c42fa17
- Merge branch 'fix/committee-spacing' into 'master' · df4b888b
  Thom Wiggers authored Nov 30, 2016
```
Fix spacing using 'first-child' class

Closes #163

See merge request !184
```
  df4b888b
- Merge branch 'fix/download-albums' into 'master' · 2d15b677
  Thom Wiggers authored Nov 30, 2016
```
Fix album download button

Closes #187 

See merge request !188
```
  2d15b677
- Merge branch 'fix/gm-migration' into 'master' · cafd1588
  Thom Wiggers authored Nov 30, 2016
```
Fix migrations for 2016 general meetings

Closes #175

See merge request !185
```
  cafd1588
- Fix #192 : include ghostscript · 6ad12432
  Thom Wiggers authored Nov 30, 2016
  
  6ad12432
- Merge branch 'add-doc-events' into 'master' · 75399a18
  Joren Vrancken authored Nov 30, 2016
```
Add comment to is_late_cancellation

See merge request !189
```
  75399a18
- Add documentation to is_late_cancellation · e08b3894
  Sébastiaan Versteeg authored Nov 30, 2016
  
  e08b3894
- Merge branch 'fix/migrate_events_cancel' into 'master' · f3870be6
  Sébastiaan Versteeg authored Nov 30, 2016
```
Fix canceldate not being migrated correctly

Closes #178

See merge request !186
```
  f3870be6
- Merge branch '43-thabloid-viewer' into 'master' · fc682450
  Sébastiaan Versteeg authored Nov 30, 2016
```
Resolve "Display Thabloid pages in a fancy Javascript viewer"

Closes #43

See merge request !187
```
  fc682450
- Fix album download button · 35c0e4b9
  Sébastiaan Versteeg authored Nov 30, 2016
  
  35c0e4b9
- Replaced url by template tag · f088891f
  Gijs Hendriksen authored Nov 30, 2016
  
  f088891f
- Fix build · f2794ce5
  Joren Vrancken authored Nov 30, 2016
  
  f2794ce5
- Fix canceldate not being migrated correctly · b4eb7526
  Joren Vrancken authored Nov 30, 2016
  
  b4eb7526
- Created a Thabloid page viewer using FancyBox · 1ce354ab
  Gijs Hendriksen authored Nov 30, 2016
  
  1ce354ab
- Fix migrations for 2016 general meetings · 7b13d654
  Sébastiaan Versteeg authored Nov 30, 2016
  
  7b13d654
- Fix spacing using 'first-child' class · 4e462187
  Sébastiaan Versteeg authored Nov 30, 2016
  
  4e462187
- Merge branch '157-constraints-nickname' into 'master' · ce78087e
  Sébastiaan Versteeg authored Nov 30, 2016
```
Check if nickname is set before saving preference

See #157

See merge request !183
```
  ce78087e
29 Nov, 2016 2 commits
- Check if nickname is set before saving preference · c7f5ba58
  Thom Wiggers authored Nov 29, 2016
```
See #157
```
  c7f5ba58
- Merge branch 'feature/138-events-for-pizza' into 'master' · 5420e848
  Thom Wiggers authored Nov 29, 2016
```
Limit possible events for pizzas to future or today

Closes #138

See merge request !178
```
  5420e848
24 Nov, 2016 8 commits
- Merge branch 'fix-sponsor-logo' into 'master' · 07d802fd
  Joost Rijneveld authored Nov 24, 2016
```
Rename sponsor-logo to topicus-logo

Closes #162

See merge request !182
```
  07d802fd
- Merge branch 'feature/customisation_icons' into 'master' · bb6689f1
  Joost Rijneveld authored Nov 24, 2016
```
Add icons + change template

Zie issue #154.
Getest op Android.

See merge request !180
```
  bb6689f1
- Rename sponsor-logo to topicus-logo · dc94e8a5
  Sébastiaan Versteeg authored Nov 24, 2016
  
  dc94e8a5
- Merge branch 'i18n/localize_attr_names' into 'master' · d5051d21
  Sébastiaan Versteeg authored Nov 24, 2016
```
Sort committees by localized attr names

See merge request !181
```
  d5051d21
- Make sure the icons are correct · 615af4b1
  Sébastiaan Versteeg authored Nov 24, 2016
  
  615af4b1
- Limit possible events for pizzas to future or today · 7e4c7031
  Sébastiaan Versteeg authored Nov 23, 2016
  
  7e4c7031
- Sort committees by localized attr names · 59773b94
  Joost Rijneveld authored Nov 24, 2016
  
  59773b94
- Merge branch 'olc' into 'master' · d2d7c5c2
  Joost Rijneveld authored Nov 24, 2016
```
Student Participation page

Closes #93

See merge request !179
```
  d2d7c5c2
23 Nov, 2016 4 commits
- Add missing migration changed board Meta · 8b71a1bf
  Joost Rijneveld authored Nov 23, 2016
  
  8b71a1bf
- Fix migrating until · bc63d378
  Thom Wiggers authored Nov 23, 2016
  
  bc63d378
- Student Participation page · 85ce6225
  Nienke authored Nov 23, 2016
  
  85ce6225
- Sort boards according to year · 0dc174b4
  Joost Rijneveld authored Nov 23, 2016
  
  0dc174b4