Commits · 6a6c29fbf0514c1dbf82cd48f307f2f2ee628f12 · 0inraMfauri / Official

May 19, 2021
- Merge branch '24-rename-rules-to-allow-differentiation-from-permissions' into 'master' · 6a6c29fb
  Nik | Klampfradler authored 3 years ago
  
  Resolve "Rename rules to allow differentiation from permissions" Closes #24 See merge request AlekSIS/official/AlekSIS-App-Untis!69
  6a6c29fb
- Rename rules · 16c8614b
  Hangzhi Yu authored 3 years ago
  
  16c8614b
May 16, 2021
- Merge branch 'update/poetry-3' into 'master' · 2b02d17b
  Jonathan Weth authored 3 years ago
  
  Update poetry.lock See merge request AlekSIS/official/AlekSIS-App-Untis!68
  2b02d17b
- Update poetry.lock · 4bbb57c0
  Jonathan Weth authored 3 years ago
  
  4bbb57c0
May 07, 2021
- Merge branch '23-extra-lessons-are-imported-without-school-terms-linked' into 'master' · 8e272bf6
  Nik | Klampfradler authored 3 years ago
  
  Resolve "Extra lessons are imported without linked school terms" Closes #23 See merge request AlekSIS/official/AlekSIS-App-Untis!67
  8e272bf6
May 04, 2021
- Link extra lessons with school term · 57b2f3b4
  Jonathan Weth authored 3 years ago
  
  57b2f3b4
Apr 13, 2021
- Merge branch 'nik-master-patch-98760' into 'master' · ffbc2343
  Jonathan Weth authored 3 years ago
  
  Denote Teckids e.V. as licensor as defined by EUPL See merge request AlekSIS/official/AlekSIS-App-Untis!66
  ffbc2343
- Denote Teckids e.V. as licensor as defined by EUPL · e974b11a
  Nik | Klampfradler authored 3 years ago
  
  This is important to clarify the jurisdiction and court location in case of license disputes.
  e974b11a
Apr 12, 2021
- Merge branch 'update/copyright' into 'master' · 75b60629
  Nik | Klampfradler authored 3 years ago
  
  Update copyright information for 2021 See merge request AlekSIS/official/AlekSIS-App-Untis!64
  75b60629
Apr 06, 2021
- Merge branch 'master' into update/copyright · 2ac3dcea
  Jonathan Weth authored 3 years ago
  
  2ac3dcea
- Merge branch 'update/poetry-2' into 'master' · cf85abcd
  Tom Teichler authored 3 years ago
  
  Update poetry.lock See merge request AlekSIS/official/AlekSIS-App-Untis!65
  cf85abcd
- Update poetry.lock · 029d3c42
  Jonathan Weth authored 3 years ago and Tom Teichler committed 3 years ago
  
  029d3c42
- Update copyright information for 2021 · 0024d887
  Jonathan Weth authored 3 years ago
  
  0024d887
Mar 23, 2021
- Merge branch 'renovate/defusedxml-0.x' into 'master' · b86f79dc
  Jonathan Weth authored 4 years ago
  
  Update dependency defusedxml to ^0.7.0 See merge request AlekSIS/official/AlekSIS-App-Untis!63
  b86f79dc
- Update dependency defusedxml to ^0.7.0 · e3e93bd5
  Tine Wittler authored 4 years ago
  
  e3e93bd5
Mar 13, 2021
- Merge branch '21-break-supervisions-must-be-deleted-cleanly' into 'master' · 49759568
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Break supervisions must be deleted cleanly" Closes #21 See merge request AlekSIS/official/AlekSIS-App-Untis!62
  49759568
- [Supervisions] Fix call of get_or_create so that supervisions are correctly updated and deleted · bb633e34
  Jonathan Weth authored 4 years ago
  
  bb633e34
Mar 12, 2021
- Merge branch 'trigger-dist-pipeline' into 'master' · bab86952
  Tom Teichler authored 4 years ago
  
  Trigger dist pipeline on master See merge request AlekSIS/official/AlekSIS-App-Untis!61
  bab86952
Mar 11, 2021
- Trigger dist pipeline on master · 1a1c2e9b
  Tom Teichler authored 4 years ago
  
  1a1c2e9b
Mar 10, 2021
- Merge branch 'fix-ci-config' into 'master' · d6432412
  Tom Teichler authored 4 years ago
  
  Update ci config See merge request AlekSIS/official/AlekSIS-App-Untis!60
  d6432412
- Update ci config · 04258374
  Tom Teichler authored 4 years ago
  
  04258374
Feb 20, 2021
- Merge branch '20-delete-untis-lessons-without-lesson-periods-while-importing' into 'master' · d0f283d2
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Delete UNTIS lessons without lesson periods while importing" Closes #20 See merge request AlekSIS/official/AlekSIS-App-Untis!58
  d0f283d2
Feb 19, 2021
- Merge branch 'update/poetry' into 'master' · 35e7358e
  Jonathan Weth authored 4 years ago
  
  Update poetry.lock See merge request AlekSIS/official/AlekSIS-App-Untis!59
  35e7358e
- Update poetry.lock · 8ae4a2e9
  Jonathan Weth authored 4 years ago
  
  8ae4a2e9
- Delete UNTIS lessons without lesson periods while importing · d0aa5b17
  Jonathan Weth authored 4 years ago
  
  d0aa5b17
Feb 17, 2021
- Merge branch 'refactor/non-optional-celery' into 'master' · 0eceea90
  Nik | Klampfradler authored 4 years ago
  
  Make Celery non-optional See merge request AlekSIS/official/AlekSIS-App-Untis!56
  0eceea90
Feb 16, 2021
- Make Celery non-optional · 1ba10d79
  Jonathan Weth authored 4 years ago
  
  1ba10d79
Feb 06, 2021
- Merge branch 'github-pr-template-for-mirror' into 'master' · df57f33f
  Nik | Klampfradler authored 4 years ago
  
  Add template for pull requests at GitHub for mirroring See merge request AlekSIS/official/AlekSIS-App-Untis!55
  df57f33f
- Add template for pull requests at GitHub for mirroring · 0a17cca4
  Jonathan Weth authored 4 years ago
  
  0a17cca4
Jan 23, 2021
- Merge branch 'feature/compile-messages-before-build' into 'master' · cfaa7d5a
  Nik | Klampfradler authored 4 years ago
  
  Update tox.ini; compile messages before building dist See merge request AlekSIS/official/AlekSIS-App-Untis!54
  cfaa7d5a
- Update tox.ini; compile messages before building dist · acbff75d
  Nik | Klampfradler authored 4 years ago
  
  acbff75d
Jan 17, 2021
- Merge branch 'gettext-lazy' into 'master' · c9323e35
  Jonathan Weth authored 4 years ago
  
  ugettext lazy is deprecated. See merge request AlekSIS/official/AlekSIS-App-Untis!51
  c9323e35
- Merge branch 'master' into gettext-lazy · 40e40a72
  Jonathan Weth authored 4 years ago
  
  40e40a72
Jan 16, 2021

Merge branch '18-untis-globalpermissions-aleksis-core-w002-model-globalpermissions-in-app-config-aleksis-apps' into 'master'

Resolve "untis.GlobalPermissions: (aleksis.core.W002) Model GlobalPermissions in app config aleksis.apps.untis doesnot derive from aleksis.core.mixins.ExtensibleModel"

Closes #18

See merge request AlekSIS/official/AlekSIS-App-Untis!53

3a595840

Add PureDjangoModel class. Closes #18 · 81aaddcd
Tom Teichler authored 4 years ago

81aaddcd

Jan 14, 2021
- Merge branch 'update-lockfile-core' into 'master' · 5aa7169c
  Tom Teichler authored 4 years ago
  
  Fix testsuite See merge request AlekSIS/official/AlekSIS-App-Untis!52
  5aa7169c
- Update lockfile · 007d018f
  Tom Teichler authored 4 years ago
  
  007d018f
- Update ci config · 99c7c81f
  Tom Teichler authored 4 years ago
  
  99c7c81f
Jan 12, 2021
- Update lockfile. · 0f083b71
  Tom Teichler authored 4 years ago
  
  0f083b71
- ugettext lazy is deprecated. · e3f5d78f
  Tom Teichler authored 4 years ago
  
  e3f5d78f