aleksis/AlekSIS-App-Alsijil
Watch
10
0
Fork
You've already forked AlekSIS-App-Alsijil
 0
Code Issues 48 Pull requests 7 Projects Releases 3 Packages 1 Activity Actions

Resolve "Make Alsijil work with current core" #433

Merged
hansegucker merged 19 commits from 60-make-alsijil-work-with-current-core into master 2020-06-15 12:18:32 +02:00
Conversation 26 Commits 19 Files changed 11 +172 -229
tteichler commented 2020-05-11 13:46:53 +02:00
Owner
Copy link

Closes #60

Closes #60
tteichler commented 2020-05-11 13:46:54 +02:00
Author
Owner
Copy link

changed milestone to %8

changed milestone to %8
tteichler commented 2020-05-11 15:32:26 +02:00
Author
Owner
Copy link

added 5 commits

Compare with previous version

added 5 commits <ul><li>d7a1eaa0 - Update dependencies</li><li>46ed36f7 - Sort imports</li><li>bfe3e56e - Fix apps.py</li><li>3d1904c1 - Re-create migrations</li><li>7d31b655 - Use ExtensibleModel</li></ul> [Compare with previous version](/AlekSIS/Onboarding/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2106&start_sha=c8431ea9e739badcafcbafc250ab7a68a7e57583)
tteichler commented 2020-05-11 15:54:34 +02:00
Author
Owner
Copy link

added 1 commit

  • 684c19f0 - Remove non-existing decorators

Compare with previous version

added 1 commit <ul><li>684c19f0 - Remove non-existing decorators</li></ul> [Compare with previous version](/AlekSIS/Onboarding/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2107&start_sha=7d31b65512faea0aaf986bcea5a239e718306071)
tteichler commented 2020-05-11 15:54:58 +02:00
Author
Owner
Copy link

/cc @nik

/cc @nik
nik commented 2020-05-11 16:14:14 +02:00
Owner
Copy link

@hansegucker was supposed to plan a meeting about this in the course of tomorrow

@hansegucker was supposed to plan a meeting about this in the course of tomorrow
tteichler commented 2020-05-22 18:49:51 +02:00
Author
Owner
Copy link

What was the decision here?

What was the decision here?
hansegucker commented 2020-05-22 19:24:40 +02:00
Owner
Copy link

There is an issue that has still to be done.

There is an issue that has still to be done.
tteichler commented 2020-05-25 13:42:30 +02:00
Author
Owner
Copy link

Can you mention this issue here and mark this MR as blocked by this issue?

Can you mention this issue here and mark this MR as blocked by this issue?
hansegucker commented 2020-05-26 12:30:18 +02:00
Owner
Copy link

Blocked by https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/issues/85

Blocked by https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos/-/issues/85
hansegucker commented 2020-05-26 17:27:54 +02:00
Owner
Copy link

Please add verbose names to the models.

Please add verbose names to the models.
hansegucker commented 2020-05-26 17:43:08 +02:00
Owner
Copy link

mentioned in issue #61

mentioned in issue #61
tteichler commented 2020-05-29 12:30:26 +02:00
Author
Owner
Copy link

Done

Done
tteichler commented 2020-05-29 12:30:52 +02:00
Author
Owner
Copy link

added 7 commits

  • 684c19f0...be383026 - 5 commits from branch master
  • 91804534 - Merge branch 'master' into 60-make-alsijil-work-with-current-core
  • 78bc4525 - Add verbose names to models

Compare with previous version

added 7 commits <ul><li>684c19f0...be383026 - 5 commits from branch <code>master</code></li><li>91804534 - Merge branch &#39;master&#39; into 60-make-alsijil-work-with-current-core</li><li>78bc4525 - Add verbose names to models</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2375&start_sha=684c19f0bbc875e54b7f683fa225087f1a2ec3a6)
nik commented 2020-06-01 21:57:17 +02:00
Owner
Copy link

added 3 commits

  • 4da81bd8 - Fix week view code
  • 7eba57d9 - Merge remote-tracking branch 'origin/master' into 60-make-alsijil-work-with-current-core-fixes
  • 5f16cb3c - Merge branch '60-make-alsijil-work-with-current-core-fixes' into...

Compare with previous version

added 3 commits <ul><li>4da81bd8 - Fix week view code</li><li>7eba57d9 - Merge remote-tracking branch &#39;origin/master&#39; into 60-make-alsijil-work-with-current-core-fixes</li><li>5f16cb3c - Merge branch &#39;60-make-alsijil-work-with-current-core-fixes&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2394&start_sha=78bc4525baebc5f88c027b5687062b5447c1756b)
leuckeju commented 2020-06-12 10:08:53 +02:00
Member
Copy link

mentioned in issue AlekSIS-App-Chronos#87

mentioned in issue AlekSIS-App-Chronos#87
leuckeju commented 2020-06-12 10:47:33 +02:00
Member
Copy link

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2512&start_sha=5f16cb3c77dd3180e5d5ee2c5064b1f8a14b1488#17fa7705c025f0876e0fe2c72d23ddad96fcf6f2_241_241)
leuckeju commented 2020-06-12 10:47:35 +02:00
Member
Copy link

added 6 commits

Compare with previous version

added 6 commits <ul><li>94d5efbf - Rename annotation</li><li>24fcf2c2 - Clear fixme, use SchoolYear model</li><li>029a65ab - Simplify comparison</li><li>f005a767 - Use PEP8 formatting</li><li>7f86898a - Rename annotation in template</li><li>40d877cc - Update image, center it and limit its sizes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2512&start_sha=5f16cb3c77dd3180e5d5ee2c5064b1f8a14b1488)
hansegucker commented 2020-06-13 17:46:48 +02:00
Owner
Copy link

added 1 commit

  • e6b86387 - Use SchoolTerm instead of SchoolYear and catch non-existing school term

Compare with previous version

added 1 commit <ul><li>e6b86387 - Use SchoolTerm instead of SchoolYear and catch non-existing school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2533&start_sha=40d877cc497406d5b376f3222e630f53e77315ca)
hansegucker commented 2020-06-13 17:47:04 +02:00
Owner
Copy link

resolved all threads

resolved all threads
hansegucker commented 2020-06-13 17:50:27 +02:00
Owner
Copy link

added 2 commits

  • dc9817f1 - 1 commit from branch master
  • f7597d17 - Merge branch 'master' into 60-make-alsijil-work-with-current-core

Compare with previous version

added 2 commits <ul><li>dc9817f1 - 1 commit from branch <code>master</code></li><li>f7597d17 - Merge branch &#39;master&#39; into 60-make-alsijil-work-with-current-core</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/43/diffs?diff_id=2536&start_sha=e6b86387719a8a958a16ea5f6b2a2b68c6db3010)
hansegucker commented 2020-06-13 17:51:36 +02:00
Owner
Copy link

Please review. @nik

Please review. @nik
hansegucker commented 2020-06-13 17:51:36 +02:00
Owner
Copy link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
hansegucker commented 2020-06-13 17:51:36 +02:00
Owner
Copy link

assigned to @nik

assigned to @nik
tteichler commented 2020-06-14 14:34:23 +02:00
Author
Owner
Copy link

changed milestone to %2

changed milestone to %2
nik commented 2020-06-15 12:18:32 +02:00
Owner
Copy link

mentioned in commit 772ea75cb8

mentioned in commit 772ea75cb8af5f439058620ed4794352d59a5b07
nik commented 2020-06-15 12:18:32 +02:00
Owner
Copy link

merged

merged
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

  
source::aleksolotl
No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
source::aleksolotl
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
nik
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
aleksis/AlekSIS-App-Alsijil!433
No description provided.