Commits · 0384b0fe7114f22bbdebd483e7065316a8f21d8e · AlekSIS® / Official / AlekSIS-Core

Jul 06, 2020
- Make virtual foreign key optional · 0384b0fe
  Jonathan Weth authored 4 years ago
  
  0384b0fe
Jul 05, 2020
- Update poetry.lock · 68c58c72
  Jonathan Weth authored 4 years ago
  
  68c58c72
Jul 02, 2020
- Merge branch 'renovate/django-ipware-3.x' into 'master' · b55b83c0
  Nik | Klampfradler authored 4 years ago
  
  Update dependency django-ipware to v3 See merge request AlekSIS/official/AlekSIS!324
  b55b83c0
- Update dependency django-ipware to v3 · da52d590
  Tine Wittler authored 4 years ago
  
  da52d590
Jun 28, 2020
- Merge branch 'drop-image-cropping' into 'master' · 64b6a21f
  Nik | Klampfradler authored 4 years ago
  
  Drop image cropping for now See merge request AlekSIS/official/AlekSIS!322
  64b6a21f
- Merge branch 'master' into drop-image-cropping · 63f6df8e
  Tom Teichler authored 4 years ago
  
  63f6df8e
- Drop image cropping for now. · 60ea786f
  Tom Teichler authored 4 years ago
  
  60ea786f
- Merge branch '212-add-django-filter-to-person-and-group-tables' into 'master' · d6a0b2bd
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Add django-filter to person and group tables" Closes #212 See merge request AlekSIS/official/AlekSIS!321
  d6a0b2bd
- Add filter to group and person views · 10248ca6
  Tom Teichler authored 4 years ago
  
  10248ca6
Jun 27, 2020
- Merge branch 'feature/extensible-model-fk' into 'master' · 75256e08
  Nik | Klampfradler authored 4 years ago
  
  Allow adding a foreign key to Exensible Model See merge request AlekSIS/official/AlekSIS!305
  75256e08
- Merge branch 'renovate/django-otp-0.x' into 'master' · 5bae5747
  Nik | Klampfradler authored 4 years ago
  
  Update dependency django-otp to v0.9.3 See merge request AlekSIS/official/AlekSIS!319
  5bae5747
- Fix syntax errors and property creation in foreign_key helper · 9202d5f8
  Jonathan Weth authored 4 years ago
  
  9202d5f8
- Use right form · 6772fdf7
  Tom Teichler authored 4 years ago
  
  6772fdf7
- Merge branch 'master' into feature/extensible-model-fk · df039094
  Jonathan Weth authored 4 years ago
  
  df039094
- Update dependency django-otp to v0.9.3 · 43db0ddb
  Tine Wittler authored 4 years ago
  
  43db0ddb
- Update submodules · 1356c2c2
  Tom Teichler authored 4 years ago
  
  1356c2c2
- Merge branch '249-ldap-allow-multiple-search-bases-for-users-and-groups' into 'master' · edc5c39d
  Jonathan Weth authored 4 years ago
  
  Resolve "[LDAP] Allow multiple search bases for users and groups" Closes #249 See merge request AlekSIS!262
  edc5c39d
- Update poetry.lock · fdbf402e
  Nik | Klampfradler authored 4 years ago
  
  fdbf402e
- Merge branch 'master' into 249-ldap-allow-multiple-search-bases-for-users-and-groups · a5f1942b
  Jonathan Weth authored 4 years ago
  
  a5f1942b
- Make foreign key reverse on extensible model behave like foreign key · 5514e0ab
  Nik | Klampfradler authored 4 years ago
  
  5514e0ab
- Fix typo · 594508fa
  Nik | Klampfradler authored 4 years ago
  
  594508fa
- Fix typo · 34ecd209
  Nik | Klampfradler authored 4 years ago
  
  34ecd209
- Merge branch 'master' into feature/extensible-model-fk · 353474a4
  Nik | Klampfradler authored 4 years ago
  
  353474a4
- Merge branch '275-add-missing-__str__-methods' into 'master' · d801f952
  Jonathan Weth authored 4 years ago
  
  Resolve "Add missing __str__ methods" Closes #275 See merge request AlekSIS/official/AlekSIS!316
  d801f952
- Add missing __str__ methods · 62b6894c
  Tom Teichler authored 4 years ago
  
  62b6894c
Jun 26, 2020
- Merge branch '273-let-apps-add-extra-permissions-to-models' into 'master' · 1d045dfb
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Let apps add extra permissions to models" Closes #273 See merge request AlekSIS/official/AlekSIS!308
  1d045dfb
- Merge branch '242-create-delete-person-and-group' into 'master' · 7ba87e5a
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Create / delete person and group" Closes #242 See merge request AlekSIS!265
  7ba87e5a
- Merge branch '133-implement-django-health-check' into 'master' · a320184d
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Implement django-health-check" Closes #133 See merge request AlekSIS/official/AlekSIS!315
  a320184d
Jun 24, 2020
- Merge branch 'master' into 273-let-apps-add-extra-permissions-to-models · 97d76f59
  Jonathan Weth authored 4 years ago
  
  97d76f59
- Merge branch '292-fix-design-of-custom-error-pages' into 'master' · 9d7bbf6a
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Fix design of custom error pages" Closes #292 See merge request AlekSIS/official/AlekSIS!311
  9d7bbf6a
- Merge branch 'fix/template-paths-school-term' into 'master' · e08e412e
  Nik | Klampfradler authored 4 years ago
  
  Fix paths to core templates in some templates See merge request AlekSIS/official/AlekSIS!312
  e08e412e
- Merge branch 'extend-base-print' into 'master' · 651b3835
  Nik | Klampfradler authored 4 years ago
  
  Fix and extend base_print.html See merge request AlekSIS/official/AlekSIS!313
  651b3835
Jun 23, 2020
- Implement django-health-check · 0ff596d3
  Tom Teichler authored 4 years ago
  
  0ff596d3
- Merge branch 'master' into 242-create-delete-person-and-group · 4a19af29
  Tom Teichler authored 4 years ago
  
  4a19af29
Jun 22, 2020
- Merge branch 'revert-b9fb222c ' into 'master' · 94958995
  Nik | Klampfradler authored 4 years ago
  
  Revert "Merge branch '133-implement-django-health-check' into 'master'" See merge request AlekSIS/official/AlekSIS!314
  94958995
- Revert "Merge branch '133-implement-django-health-check' into 'master'" · eeef13fb
  Nik | Klampfradler authored 4 years ago
  
  This reverts merge request !261
  eeef13fb
- Merge branch '133-implement-django-health-check' into 'master' · b9fb222c
  Jonathan Weth authored 4 years ago
  
  Resolve "Implement django-health-check" Closes #133 See merge request AlekSIS!261
  b9fb222c
- Merge branch 'master' into 133-implement-django-health-check · 291546a1
  Jonathan Weth authored 4 years ago
  
  291546a1
Jun 21, 2020
- Fix usage of dynamic preferences in base_print.html · b14f43c3
  Jonathan Weth authored 4 years ago
  
  b14f43c3
- Add option to set positions for page breaks in base_print.html · 73af7d4b
  Jonathan Weth authored 4 years ago
  
  73af7d4b