Resolve "Events replace lessons" #511

Merged

hansegucker merged 2 commits from 127-events-replace-lessons into master 2021-11-02 11:05:27 +01:00

Conversation 6 Commits 2 Files changed 3 +95 -20

hansegucker commented 2021-10-29 20:59:10 +02:00 (Migrated from edugit.org)

Copy link

Closes #127

Closes #127 

hansegucker commented 2021-10-29 20:59:14 +02:00 (Migrated from edugit.org)

Copy link

assigned to @hansegucker

assigned to @hansegucker

hansegucker commented 2021-11-01 21:23:25 +01:00 (Migrated from edugit.org)

Copy link

changed the description

changed the description

hansegucker commented 2021-11-01 21:48:50 +01:00 (Migrated from edugit.org)

Copy link

added 6 commits

• f1f8b712...8e316c3c - 4 commits from branch master
• f36a8ae4 - Fix timetable builder to replace normal lesson periods by events if groups are matching
• 7b871ad3 - Update changelog

Compare with previous version

added 6 commits <ul><li>f1f8b712...8e316c3c - 4 commits from branch <code>master</code></li><li>f36a8ae4 - Fix timetable builder to replace normal lesson periods by events if groups are matching</li><li>7b871ad3 - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/207/diffs?diff_id=12867&start_sha=f1f8b71296674f0c24f2e9ac6ed879ec957c5d9a)

hansegucker commented 2021-11-01 21:48:52 +01:00 (Migrated from edugit.org)

Copy link

marked this merge request as ready

marked this merge request as **ready**

hansegucker commented 2021-11-01 21:48:55 +01:00 (Migrated from edugit.org)

Copy link

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker

nik (Migrated from edugit.org) merged commit 1ea5410829 into master 2021-11-02 11:05:28 +01:00

nik commented 2021-11-02 11:05:33 +01:00 (Migrated from edugit.org)

Copy link

mentioned in commit 1ea5410829

mentioned in commit 1ea541082922cccf31de1ca977d131ba84f3ad54

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

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

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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-Chronos!511

No description provided.