Commits · 03a15c2ba5401c408c242567ecb9b4941eb8f831 · thalia / concrexit

07 Dec, 2016 5 commits
- Use advanced TinyMCE to make sure you can add hyperlinks · 03a15c2b
  Sébastiaan Versteeg authored Dec 07, 2016
  
  03a15c2b
- Merge branch 'release/1.0.0' · 47128457
  Thom Wiggers authored Dec 07, 2016
  
  47128457
- Merge branch 'wiki_namespace' into 'master' · c0e1e9bc
  Sébastiaan Versteeg authored Dec 07, 2016
```
Add wiki namespace to admin

Need to be able to edit this of course.

See merge request !220
```
  c0e1e9bc
- Also allow editing of contact email · 6232ba50
  Thom Wiggers authored Dec 07, 2016
  
  6232ba50
- Add wiki namespace to admin · f6e4fe1d
  Thom Wiggers authored Dec 07, 2016
  
  f6e4fe1d
06 Dec, 2016 30 commits
- Merge branch 'fix/require-login-styleguide' into 'release/1.0.0' · 96acee11
  Luuk Scholten authored Dec 06, 2016
```
Require login for the styleguide

Hij valt onder het kopje 'voor leden', dus dan is dit in principe ook gewenst

Relevant voor #155 maar heeft meer werk nodig om echt goed te zijn. Dus dit is voor nu beter.

See merge request !219
```
  96acee11
- Prevent dying on album_date_something_something · 99f77697
  Thom Wiggers authored Dec 06, 2016
  
  99f77697
- Require login for the styleguide · 50d2c0ae
  Sébastiaan Versteeg authored Dec 06, 2016
  
  50d2c0ae
- Merge branch 'fix/missing-titles' into 'release/1.0.0' · baa89361
  Luuk Scholten authored Dec 06, 2016
```
Add missing titles to templates

See merge request !218
```
  baa89361
- Merge branch 'fix/partner-text-menu' into 'release/1.0.0' · 0c1848cb
  Luuk Scholten authored Dec 06, 2016
```
Change 'sponsoren' to 'partners' for consistency

See merge request !217
```
  0c1848cb
- Add missing titles to templates · 3c42c4a7
  Sébastiaan Versteeg authored Dec 06, 2016
  
  3c42c4a7
- Merge branch 'fix/use-thumbnail-in-events' into 'release/1.0.0' · de927fb6
  Luuk Scholten authored Dec 06, 2016
```
Use thumbnail for user image in event overview pages

See merge request !216
```
  de927fb6
- Change 'sponsoren' to 'partners' for consistency · bd2749c3
  Sébastiaan Versteeg authored Dec 06, 2016
  
  bd2749c3
- Merge branch 'fix/events-data-registration-overview-styling' into 'release/1.0.0' · 50a89dcb
  Luuk Scholten authored Dec 06, 2016
```
Fix bootstrap override for member-directory

See merge request !215
```
  50a89dcb
- Use thumbnail for user image in event overview pages · 2ab61575
  Sébastiaan Versteeg authored Dec 06, 2016
  
  2ab61575
- Fix bootstrap override for member-directory · 200805f3
  Sébastiaan Versteeg authored Dec 06, 2016
  
  200805f3
- Merge branch 'fix/change-len-to-count' into 'release/1.0.0' · 78c3fe34
  Luuk Scholten authored Dec 06, 2016
```
Change len() to .count() for check

Minder SQL uitvoerdinges

See merge request !208
```
  78c3fe34
- Change len() to .count() for check · 38b4e16e
  Sébastiaan Versteeg authored Dec 06, 2016
  
  38b4e16e
- Merge branch 'fix/board-save' into 'release/1.0.0' · 35dfed07
  Luuk Scholten authored Dec 06, 2016
```
Remove description from board admin

See merge request !214
```
  35dfed07
- Remove description from board admin · 6e794df5
  Sébastiaan Versteeg authored Dec 06, 2016
  
  6e794df5
- Merge branch 'fix/committee-boolean-thing' into 'release/1.0.0' · 19470781
  Luuk Scholten authored Dec 06, 2016
```
:fire:fix

See merge request !213
```
  19470781
- :fire:fix · ecbae821
  Wietse Kuipers authored Dec 06, 2016
  
  ecbae821
- Merge branch 'bug/unknown-commitee-join-date' into 'release/1.0.0' · 1afc98fc
  Luuk Scholten authored Dec 06, 2016
```
Fix displaying when join date is unknown

See merge request !211
```
  1afc98fc
- Merge branch 'fix/remove-avatar-js' into 'release/1.0.0' · 93f1aefa
  Luuk Scholten authored Dec 06, 2016
```
Remove weird avatar error replacement JS

See merge request !206
```
  93f1aefa
- Merge branch 'fix/use-thumbnail-member-directory' into 'release/1.0.0' · f6ea2827
  Luuk Scholten authored Dec 06, 2016
```
Use a thumbnail in the member directory

See merge request !207
```
  f6ea2827
- Merge branch '167-migratieproblemen-members' into 'release/1.0.0' · 9aad23c9
  Thom Wiggers authored Dec 06, 2016
```
Do not display nickname or initials as none

Closes #167. Eigenlijk moeten hier unit tests voor komen (#200)

See merge request !212
```
  9aad23c9
- Do not display nickname or initials as none · f7238fbc
  Joost Rijneveld authored Dec 06, 2016
  
  f7238fbc
- Fix displaying when join date is unknown · ba72e87c
  Joost Rijneveld authored Dec 06, 2016
  
  ba72e87c
- Merge branch 'master' into release/1.0.0 · 47042428
  Thom Wiggers authored Dec 06, 2016
  
  47042428
- Set default from email for server messages · 85a6f424
  Thom Wiggers authored Dec 06, 2016
  
  85a6f424
- Crash test dummy · d7061007
  Thom Wiggers authored Dec 06, 2016
  
  d7061007
- Merge branch 'feature/englishify-readme' into 'master' · 3964929a
  Joost Rijneveld authored Dec 06, 2016
```
Translate Dutch parts of the README

See merge request !209
```
  3964929a
- Translate Dutch parts of the README · 414cde01
  Sébastiaan Versteeg authored Dec 06, 2016
  
  414cde01
- Use a thumbnail in the member directory · edab5e6b
  Sébastiaan Versteeg authored Dec 06, 2016
  
  edab5e6b
- Remove weird avatar error replacement JS · 7207872c
  Sébastiaan Versteeg authored Dec 06, 2016
  
  7207872c
05 Dec, 2016 5 commits
- During member migration, check if basename of images contains query string · b6b8b612
  Luuk Scholten authored Dec 05, 2016
  
  b6b8b612
- Make committees active by default during migration · f0cbd8b2
  Luuk Scholten authored Dec 05, 2016
  
  f0cbd8b2
- Fix querybuilder for 'older' members · 9b32c30b
  Luuk Scholten authored Dec 05, 2016
  
  9b32c30b
- Fix migration length for student numbers · 2ce7c2d5
  Luuk Scholten authored Dec 05, 2016
  
  2ce7c2d5
- Merge branch 'fix-event-cancel-500' into 'release/1.0.0' · 254fbd79
  Luuk Scholten authored Dec 05, 2016
```
Fixes 500 for any cancellation

See merge request !205
```
  254fbd79