Commits · 2836e11e4d68cc791788f7052dd1b302c7fdcd16 · castellum / castellum

Apr 25, 2018
- Merge branch '2018-04-tb-readme' into 'master' · 2836e11e
  Bunde authored Apr 25, 2018
```
basic README

See merge request !12
```
  2836e11e
- basic README TG-278 · 49ddf055
  Bengfort authored Apr 25, 2018
  
  49ddf055
- Merge branch '2018-04-tg-django-npm' into 'master' · 742e19db
  Bunde authored Apr 25, 2018
```
Add django-npm to manage node packages

See merge request !11
```
  742e19db
- move django-npm in setup.py · 1cf752bb
  Timo authored Apr 25, 2018
  
  1cf752bb
- Add django-npm package TG-290 · 0fd8a374
  Timo authored Apr 25, 2018
  
  0fd8a374
Apr 13, 2018
- Merge branch '2018-04-tg-landing-page' into 'master' · 3a2f32a4
  Bunde authored Apr 13, 2018
```
258 284: Add basic index/landing page

See merge request !9
```
  3a2f32a4
- Add basic index/landing page TG-284 · 443bd73a
  Timo authored Apr 13, 2018
  
  443bd73a
Apr 12, 2018
- Merge branch '2018-04-tg-create-base-structure-gitlab-ci' into 'master' · 9ac9ceb5
  Bunde authored Apr 12, 2018
```
262 273: gitlab-ci base structure

See merge request !5
```
  9ac9ceb5
- Merge branch '2018-04-tb-auth-views' into 'master' · 28389228
  Timo authored Apr 12, 2018
```
258: auth views

See merge request !7
```
  28389228
- TG-258 TG-282 move login.html one level upward and set template_name in loginView · 7051f913
  Stefan Bunde authored Apr 12, 2018
  
  7051f913
Apr 11, 2018
- automatically copy bootstrap css to /static/ · 87e94df7
  Bengfort authored Apr 11, 2018
  
  87e94df7
- Merge branch 'master' into 2018-04-tb-auth-views · 3ef09665
  Bengfort authored Apr 11, 2018
  
  3ef09665
- Fixup 4e524d34 : Fix BASE_DIR · 61eb6429
  Bengfort authored Apr 11, 2018
  
  61eb6429
- Merge branch '2018-04-tb-split-settings' into 'master' · bb77e37b
  Bengfort authored Apr 11, 2018
```
251 279: split settings

See merge request !4
```
  bb77e37b
- TG-251 TG-279 rename setting files · 2f42a9ec
  Stefan Bunde authored Apr 11, 2018
  
  2f42a9ec
- mv database settings to dev.py · 70f081d6
  Bengfort authored Apr 11, 2018
  
  70f081d6
- 251 279: split settings · 4e524d34
  Bengfort authored Apr 09, 2018
```
to select the settings that should be used, set DJANGO_SETTINGS_MODULE

https://docs.djangoproject.com/en/2.0/topics/settings/#designating-the-settings
```
  4e524d34
- Merge branch '2018-04-tb-swap-user-model' into 'master' · d6310da8
  Timo authored Apr 11, 2018
```
258 283: swap user model

See merge request !6
```
  d6310da8
- TG-258 TG-283 fix import in makefile · 0c19ee01
  Stefan Bunde authored Apr 11, 2018
```
the user model switched to a custom user model. Therefore the import path of user has changed
```
  0c19ee01
- TG-258 TG-283 rename app from users to castellum_auth · ec1c3f4f
  Stefan Bunde authored Apr 11, 2018
  
  ec1c3f4f
- 258 283: swap user model · e3428d1d
  Bengfort authored Apr 09, 2018
```
highly recommended according to
https://docs.djangoproject.com/en/2.0/topics/auth/customizing/#using-a-custom-user-model-when-starting-a-project
```
  e3428d1d
Apr 10, 2018
- Merge branch 'create-makefile' into 'master' · d8cf9c70
  Bengfort authored Apr 10, 2018
```
#276 add makefile for django project

See merge request !3
```
  d8cf9c70
- #276: don't create superuser if already exists · 9438cd87
  Stefan Bunde authored Apr 10, 2018
  
  9438cd87
- #276: make makefile targets phony · 3b81c744
  Stefan Bunde authored Apr 10, 2018
  
  3b81c744
- #276: add bootstrap rule · e436c4d7
  Stefan Bunde authored Apr 10, 2018
  
  e436c4d7
- #276: remove makemigration dependency from migrate rule · a4aaa1f1
  Stefan Bunde authored Apr 10, 2018
  
  a4aaa1f1
- #276: rename makefile - starts with capital M · 16f1917f
  Stefan Bunde authored Apr 10, 2018
  
  16f1917f
Apr 09, 2018
- 258 282/285: setup auth views · 371afe30
  Bengfort authored Apr 09, 2018
  
  371afe30
- 258 286: add base template · 2eb61dca
  Bengfort authored Apr 09, 2018
  
  2eb61dca
- 258 286: install bootstrap · f7d9373f
  Bengfort authored Apr 09, 2018
  
  f7d9373f
- 262 273: Add .gitlab-ci base structure with dummy test job · 780f688c
  Timo authored Apr 09, 2018
  
  780f688c
- #276 add makefile for django project · 9efeb691
  Stefan Bunde authored Apr 09, 2018
  
  9efeb691
- Merge branch 'start-project' into 'master' · 9b91caab
  Bengfort authored Apr 09, 2018
```
Start project

See merge request !1
```
  9b91caab
- #270 add comments as headings in settings.py · 0f85bb0c
  Stefan Bunde authored Apr 09, 2018
  
  0f85bb0c
- Merge branch '2018-04-tb-config' into 'master' · 9ad053be
  Bunde authored Apr 09, 2018
```
262: editorconfig and flake8

See merge request !2
```
  9ad053be
- #271 create initial setup.py and add requirements · 6da6429a
  Stefan Bunde authored Apr 09, 2018
  
  6da6429a
- #270 start project · fea2e5a1
  Stefan Bunde authored Apr 09, 2018
  
  fea2e5a1
- fix flake8 config · c5be566e
  Bengfort authored Apr 09, 2018
  
  c5be566e
- 262 272: configure flake8 · 62cceae7
  Bengfort authored Apr 09, 2018
  
  62cceae7
- 262 275: add .editorconfig · 1675c6a9
  Bengfort authored Apr 09, 2018
```
with max_line_length=100
```
  1675c6a9