Commits · 4cbdb5f98a2e1addd6783cd3c630b67e2bdbceaa · AlekSIS® / Official / AlekSIS-Core

Jul 24, 2020
- Fixed content type bug · 4cbdb5f9
  Hangzhi Yu authored 4 years ago
  
  4cbdb5f9
Jul 17, 2020
- Merge branch 'master' into 293-add-helper-function-to-filter-a-queryset-by-a-rule · 3302dfad
  Hangzhi Yu authored 4 years ago
  
  3302dfad
- Revert "use try/except" · 479ed4f4
  Hangzhi Yu authored 4 years ago
  
  This reverts commit fd60f148.
  479ed4f4
- Merge branch 'feature/base-delete-view' into 'master' · c0331a18
  Nik | Klampfradler authored 4 years ago
  
  Add a common class-based delete view (including template) See merge request AlekSIS/official/AlekSIS!331
  c0331a18
Jul 14, 2020
- Merge branch 'master' into feature/base-delete-view · 3ba2f310
  Jonathan Weth authored 4 years ago
  
  Verified
  
  3ba2f310
- Add warning to delete view to prevent wrong usage · 5f6a10e3
  Jonathan Weth authored 4 years ago
  
  Verified
  
  5f6a10e3
Jul 12, 2020
- Merge branch 'renovate/isort-5.x' into 'master' · 692a99f1
  Jonathan Weth authored 4 years ago
  
  Update dependency isort to v5 See merge request AlekSIS/official/AlekSIS!330
  692a99f1
- Add a common class-based delete view (including template) · cdc4fcbb
  Jonathan Weth authored 4 years ago
  
  Verified
  
  cdc4fcbb
- Update dependency isort to v5 · 71c35076
  Tine Wittler authored 4 years ago
  
  71c35076
Jul 10, 2020
- Merge branch 'fix/views-models' into 'master' · 297fdc37
  Nik | Klampfradler authored 4 years ago
  
  Fixes in views and models See merge request AlekSIS/official/AlekSIS!325
  297fdc37
- Merge branch '294-improve-newly-added-filters' into 'master' · a7107d14
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Improve newly added filters" Closes #294 See merge request AlekSIS/official/AlekSIS!327
  a7107d14
- Reformat · 129f4906
  Jonathan Weth authored 4 years ago
  
  Verified
  
  129f4906
- Fix clean method of SchoolTerm (exclude wasn't done correctly) · 98d5e9c0
  Jonathan Weth authored 4 years ago
  
  Verified
  
  98d5e9c0
- Divide filters by headings and add clear button · 042c945b
  Jonathan Weth authored 4 years ago
  
  Verified
  
  042c945b
- Add more fields to person and group filters and merge some filter fields · c51734a5
  Jonathan Weth authored 4 years ago
  
  Verified
  
  c51734a5
- Reformat · cbbcf144
  Jonathan Weth authored 4 years ago
  
  Verified
  
  cbbcf144
- Fix typo · 18caee07
  Jonathan Weth authored 4 years ago
  
  Verified
  
  18caee07
- Fix clean method of SchoolTerm (exclude wasn't done correctly) · 3f415724
  Jonathan Weth authored 4 years ago
  
  Verified
  
  3f415724
Jul 06, 2020
- Merge branch 'fix/make-virtual-foreign-key-optional' into 'master' · 8612b134
  Nik | Klampfradler authored 4 years ago
  
  Make virtual foreign key optional See merge request AlekSIS/official/AlekSIS!326
  8612b134
- Fix typo · c4d8bf59
  Jonathan Weth authored 4 years ago
  
  Verified
  
  c4d8bf59
- Make virtual foreign key optional · 0384b0fe
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0384b0fe
- Fix clean method of SchoolTerm (exclude wasn't done correctly) · 7fe69580
  Jonathan Weth authored 4 years ago
  
  Verified
  
  7fe69580
Jul 05, 2020
- Update poetry.lock · 68c58c72
  Jonathan Weth authored 4 years ago
  
  Verified
  
  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
- use try/except · fd60f148
  Hangzhi Yu authored 4 years ago
  
  fd60f148
- 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
- Reformat · 175fa7ed
  Hangzhi Yu authored 4 years ago
  
  175fa7ed
- Use both approaches in predicate · 92db09d3
  Hangzhi Yu authored 4 years ago
  
  92db09d3
- Remove duplicated code · 9fb1c20d
  Hangzhi Yu authored 4 years ago
  
  9fb1c20d
- Use new helper function in has_any_object predicate · abee08ee
  Hangzhi Yu authored 4 years ago
  
  abee08ee
Jun 27, 2020
- Accept both HttpRequests and Models in helper function · fbf131ba
  Hangzhi Yu authored 4 years ago
  
  fbf131ba
- Add helper function which filters queryset by permission and user · 0b5fe448
  Hangzhi Yu authored 4 years ago
  
  0b5fe448
- 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
  
  Verified
  
  9202d5f8