Commits · 5af9f95a0ddf09c7a9fb3656ea35188c110561c1 · AlekSIS® / Official / AlekSIS-Core

Nov 11, 2020
- Merge branch '315-conflicting-migrations-detected' into 'master' · 5af9f95a
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Conflicting migrations detected" Closes #315 See merge request AlekSIS/official/AlekSIS!382
  5af9f95a
- Fix conflicting migrations · 77f8b742
  Tom Teichler authored 4 years ago
  
  77f8b742
Nov 08, 2020
- Merge branch 'enable-migration-check' into 'master' · d8cc3412
  Nik | Klampfradler authored 4 years ago
  
  Enable migration check See merge request AlekSIS/official/AlekSIS!380
  d8cc3412
- Enable migration check · ab0e2e28
  Tom Teichler authored 4 years ago
  
  ab0e2e28
- Merge branch 'group-stats' into 'master' · efe7b67d
  Jonathan Weth authored 4 years ago
  
  Add statistics about group to group view See merge request AlekSIS!229
  efe7b67d
- Merge branch 'master' into group-stats · 35de8737
  Tom Teichler authored 4 years ago
  
  35de8737
Nov 02, 2020
- Merge branch '305-job-failed-12083' into 'master' · f90161bc
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Job Failed #12083" Closes #305 See merge request AlekSIS/official/AlekSIS!378
  f90161bc
Nov 01, 2020
- Merge branch 'master' into group-stats · 9d5bc0a1
  Tom Teichler authored 4 years ago
  
  9d5bc0a1
Oct 30, 2020
- Update submodules · eb639d2a
  Tom Teichler authored 4 years ago
  
  eb639d2a
- Merge branch 'master' into 305-job-failed-12083 · e702242b
  Tom Teichler authored 4 years ago
  
  e702242b
- Revert "Run on merge requests" · a423d227
  Tom Teichler authored 4 years ago
  
  This reverts commit 70492bf4.
  a423d227
- Fix lint · 183cc856
  Tom Teichler authored 4 years ago
  
  183cc856
- Catch operational error to fix docker build · 55501d2f
  Tom Teichler authored 4 years ago
  
  55501d2f
- Reformat · b0ffe11b
  Jonathan Weth authored 4 years ago
  
  b0ffe11b
- Run on merge requests · 70492bf4
  Tom Teichler authored 4 years ago
  
  70492bf4
- Update lockfile · 30462594
  Tom Teichler authored 4 years ago
  
  30462594
- Update submodules · b07e6587
  Tom Teichler authored 4 years ago
  
  b07e6587
- Merge branch '102-use-select2-everywhere' into 'master' · 02d63ca2
  Jonathan Weth authored 4 years ago
  
  Resolve "Use Select2 everywhere" Closes #102 See merge request AlekSIS/official/AlekSIS!362
  02d63ca2
- Change guardians field in person edit form to multiple select field · 6c963958
  Hangzhi Yu authored 4 years ago
  
  6c963958
Oct 29, 2020
- Revert child groups form changes · 3a52d935
  Hangzhi Yu authored 4 years ago
  
  3a52d935
- Merge branch 'revert-da80a668 ' into 'master' · 5adc93ab
  Jonathan Weth authored 4 years ago
  
  Revert "Merge branch 'add-landscape-print-template' into 'master'" See merge request AlekSIS/official/AlekSIS!377
  5adc93ab
- Revert "Merge branch 'add-landscape-print-template' into 'master'" · e6e683ec
  Jonathan Weth authored 4 years ago
  
  This reverts merge request !339
  e6e683ec
- Reformat code · 34598ddd
  Hangzhi Yu authored 4 years ago
  
  34598ddd
Oct 27, 2020
- Merge branch 'add-landscape-print-template' into 'master' · da80a668
  Jonathan Weth authored 4 years ago
  
  Add landscape print template. Closes #311 Closes #311 See merge request AlekSIS/official/AlekSIS!339
  da80a668
- Add option to use landscape print template · df78f6bc
  Tom Teichler authored 4 years ago
  
  df78f6bc
Oct 21, 2020
- Update poetry.lock · 518a9471
  Jonathan Weth authored 4 years ago
  
  518a9471
Oct 08, 2020
- Add select2 to remaining forms and new template for django-material · 8e28570f
  Hangzhi Yu authored 4 years ago
  
  8e28570f
Oct 06, 2020
- Template layout improvements · d822215e
  Hangzhi Yu authored 4 years ago
  
  d822215e
- Add select2 customizations to more forms · fe4cc9b9
  Hangzhi Yu authored 4 years ago
  
  fe4cc9b9
Oct 05, 2020
- Add django-material widget template for select 2 multiple select widget · 1ea7e33b
  Hangzhi Yu authored 4 years ago
  
  1ea7e33b
- Merge branch '102-use-select2-everywhere' of... · 2b3d5201
  Hangzhi Yu authored 4 years ago
  
  Merge branch '102-use-select2-everywhere' of https://edugit.org/AlekSIS/AlekSIS into 102-use-select2-everywhere
  2b3d5201
- NOT WORKING: WORK COMMIT · b0e70d4a
  Hangzhi Yu authored 4 years ago
  
  b0e70d4a
Sep 26, 2020
- Merge branch '306-django-contrib-postgres-fields-jsonfield-is-deprecated' into 'master' · 22cede0c
  Nik | Klampfradler authored 4 years ago
  
  Resolve "django.contrib.postgres.fields.JSONField is deprecated" Closes #306 See merge request AlekSIS/official/AlekSIS!373
  22cede0c
- Merge branch '296-creating-translation-files-fails-because-circular-import' into 'master' · 92c258b0
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Creating translation files fails because circular import" Closes #296 See merge request AlekSIS/official/AlekSIS!374
  92c258b0
- Merge branch 'fix-timezone-now' into 'master' · 18102df5
  Nik | Klampfradler authored 4 years ago
  
  Replace datetime.now() by timezone.now() Closes #190 See merge request AlekSIS/official/AlekSIS!375
  18102df5
- Replace datetime.now() by timezone.now() · 4d7df218
  Tom Teichler authored 4 years ago
  
  4d7df218
Sep 25, 2020
- Fix circular import · 50eaeffa
  Tom Teichler authored 4 years ago
  
  50eaeffa
- Use JSONField from Django · 0fda787b
  Tom Teichler authored 4 years ago
  
  0fda787b
Sep 22, 2020
- Merge branch 'fix-docker' into 'master' · 7f1a59aa
  Jonathan Weth authored 4 years ago
  
  Fix import See merge request AlekSIS/official/AlekSIS!370
  7f1a59aa
Sep 21, 2020
- Fix import · ed1c7a81
  Tom Teichler authored 4 years ago
  
  ed1c7a81