Commits · ea0dbe8873903f1888029156e90574a950119c29 · thalia / concrexit

24 Oct, 2016 3 commits
- Merge branch 'fix/events-description' into 'master' · ea0dbe88
  Joost Rijneveld authored Oct 24, 2016
```
Fix feature equivalence regarding HTML in events descriptions



See merge request !134
```
  ea0dbe88
- Merge branch 'feature/newsletter-public-preview' into 'master' · d2cf026b
  Joost Rijneveld authored Oct 24, 2016
```
Make newsletters preview publicly available

Closes #118

See merge request !133
```
  d2cf026b
- Fix feature equivalence regarding HTML in events descriptions · 06aad0b1
  Sébastiaan authored Oct 24, 2016
  
  06aad0b1
23 Oct, 2016 11 commits
- Make newsletters preview publicly available · 9573275a
  Sébastiaan authored Oct 23, 2016
  
  9573275a
- Merge branch '100-data-migration-for-all-thabloids' into 'master' · 220738cb
  Thom Wiggers authored Oct 23, 2016
```
Resolve "Data migration for all Thabloids"

Closes #100 

See merge request !132
```
  220738cb
- Merge branch '43-thabloid-page-viewer' into 100-data-migration-for-all-thabloids · da3cd571
  Joost Rijneveld authored Oct 23, 2016
  
  da3cd571
- Add instructions for importing Thabloids · a20a897b
  Joost Rijneveld authored Oct 22, 2016
  
  a20a897b
- Create migrations for Thabloids · 77075d39
  Joost Rijneveld authored Oct 22, 2016
  
  77075d39
- Fix broken build · 98bf7c3e
  Joost Rijneveld authored Oct 23, 2016
  
  98bf7c3e
- Merge branch 'feature/huisstijlbijbel' · 6db64f0c
  Thom Wiggers authored Oct 23, 2016
  
  6db64f0c
- Merge branch 'isort' into 'master' · 32936aa4
  Thom Wiggers authored Oct 23, 2016
```
Apply isort to entire codebase



See merge request !129
```
  32936aa4
- Merge branch '98-data-migration-for-all-photo-albums-and-photos' into 'master' · efff3729
  Sébastiaan Versteeg authored Oct 23, 2016
```
Add migration script for photos

Closes #98

See merge request !131
```
  efff3729
- Add styleguide page · 35779a76
  Sébastiaan Versteeg authored Oct 23, 2016
  
  35779a76
- Fixed uploading thabloids · efb066de
  Gijs Hendriksen authored Oct 23, 2016
  
  efb066de
22 Oct, 2016 25 commits
- Add migration instructions for photos · 03cce7a9
  Joost Rijneveld authored Oct 22, 2016
  
  03cce7a9
- Add management command for album imports · 2cc13b16
  Joost Rijneveld authored Oct 22, 2016
  
  2cc13b16
- Apply isort to entire codebase · 7e20a36c
  Joost Rijneveld authored Oct 22, 2016
  
  7e20a36c
- Merge branch 'feature/migration-docs-keys' into 'master' · 8aacf7db
  Joost Rijneveld authored Oct 22, 2016
```
Update migration docs and normalize API keys

Documentatie voor migratie toegevoegd, scripts makkelijker gemaakt en de keys allemaal hetzelfde gemaakt.

Zie ook thalia/website!590, die moet eerst

See merge request !128
```
  8aacf7db
- Add migration documentation for education, documents and merchandise, update docs for events · be9e8043
  Sébastiaan Versteeg authored Oct 22, 2016
  
  be9e8043
- Normalise migration API keys · 16879c67
  Sébastiaan Versteeg authored Oct 22, 2016
  
  16879c67
- Merge documents migrations into one command · b4c5d740
  Sébastiaan Versteeg authored Oct 22, 2016
  
  b4c5d740
- Merge branch 'fix/pdb' into 'master' · 77f22fd9
  Thom Wiggers authored Oct 22, 2016
```
Remove pdb



See merge request !127
```
  77f22fd9
- Remove pdb · b0cdf936
  Sébastiaan Versteeg authored Oct 22, 2016
  
  b0cdf936
- Merge branch 'feature/import-events' into 'master' · 9e2d7930
  Thom Wiggers authored Oct 22, 2016
```
Import events



See merge request !126
```
  9e2d7930
- Add migration documentation for events · 23b55148
  Sébastiaan Versteeg authored Oct 22, 2016
  
  23b55148
- Fix frontend events form · 6aa5382c
  Sébastiaan Versteeg authored Oct 21, 2016
  
  6aa5382c
- Fix migrations · 46257732
  Sébastiaan Versteeg authored Oct 22, 2016
  
  46257732
- Fix translation.py error when saving · d31edc44
  Sébastiaan Versteeg authored Oct 21, 2016
  
  d31edc44
- Feedback gebruikt · 2cee5f74
  Joren Vrancken authored Oct 21, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  2cee5f74
- Rename command · a5218e80
  Joren Vrancken authored Oct 20, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  a5218e80
- Fix tox warning · 54ff39cf
  Joren Vrancken authored Oct 19, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  54ff39cf
- Fix tox warning · c256d785
  Joren Vrancken authored Oct 19, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  c256d785
- Finish import events · 490e27d1
  Joren Vrancken authored Oct 19, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  490e27d1
- Some bugs left · 3795398b
  Joren Vrancken authored Oct 16, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  3795398b
- Events and field tables · e46cb7d5
  Joren Vrancken authored Oct 16, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  e46cb7d5
- Fix tox errors · 4f15af57
  Joren Vrancken authored Oct 16, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  4f15af57
- Some bugs left · 604e93df
  Joren Vrancken authored Oct 16, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  604e93df
- Events and field tables · 03fe4cf7
  Joren Vrancken authored Oct 16, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  03fe4cf7
- The humble beginning of the events migrate script · 0d680f09
  Joren Vrancken authored Sep 28, 2016 and Sébastiaan Versteeg committed Oct 22, 2016
  
  0d680f09
21 Oct, 2016 1 commit
- Revert "Merge branch 'import_events' into 'master'" · 6c17201c
  Thom Wiggers authored Oct 21, 2016
```
This reverts merge request !124
```
  6c17201c