aleksis/AlekSIS-Core
9
0
Fork 0
Code Issues 197 Pull requests 63 Projects Releases 14 Packages 1 Wiki Activity Actions

WIP: Draft: Resolve "Rewrite password change templates" #2473

Draft
tteichler wants to merge 5 commits from 574-rewrite-password-change-templates into master
pull from: 574-rewrite-password-change-templates
merge into: aleksis:master
Conversation 18 Commits 5 Files changed 3 +31 -27
tteichler commented 2021-12-16 22:05:39 +01:00
Owner
Copy link

Closes #574

From !2095

Closes #574 From !2095
tteichler commented 2021-12-16 22:05:39 +01:00
Author
Owner
Copy link

assigned to @debdolph

assigned to @debdolph
tteichler commented 2021-12-16 22:06:44 +01:00
Author
Owner
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>c4469eb0 - Rewrite password reset template</li><li>0d66e2c1 - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/828/diffs?diff_id=14626&start_sha=ee119980638a7c31773cdbea173f94a2fc34da00)
tteichler commented 2021-12-16 22:06:53 +01:00
Author
Owner
Copy link

changed the description

changed the description
tteichler commented 2021-12-16 22:06:57 +01:00
Author
Owner
Copy link

assigned to @hansegucker and unassigned @debdolph

assigned to @hansegucker and unassigned @debdolph
tteichler commented 2021-12-21 16:49:12 +01:00
Author
Owner
Copy link

added 38 commits

  • 0d66e2c1...8cd2dd85 - 37 commits from branch master
  • ec4545df - Merge branch 'master' into 574-rewrite-password-change-templates

Compare with previous version

added 38 commits <ul><li>0d66e2c1...8cd2dd85 - 37 commits from branch <code>master</code></li><li>ec4545df - Merge branch &#39;master&#39; into 574-rewrite-password-change-templates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/828/diffs?diff_id=14932&start_sha=0d66e2c1700cba40b199dd9f7e57d6df4c482a47)
tteichler commented 2021-12-21 16:51:23 +01:00
Author
Owner
Copy link

marked this merge request as ready

marked this merge request as **ready**
leuckeju commented 2021-12-21 17:10:06 +01:00
Member
Copy link

Screenshots please

Screenshots please
leuckeju commented 2021-12-21 17:13:37 +01:00
Member
Copy link

This doesn't look right

This doesn't look right
leuckeju commented 2021-12-21 17:13:37 +01:00
Member
Copy link

Please use our alert component thingy instead of a filled card. I believe there is actually a snippet you can use (I believe something like msgbox.html, but I'm not sure)

Please use our alert component thingy instead of a filled card. I believe there is actually a snippet you can use (I believe something like `msgbox.html`, but I'm not sure)
tteichler commented 2021-12-23 22:44:16 +01:00
Author
Owner
Copy link

resolved all threads

resolved all threads
tteichler commented 2021-12-23 22:44:59 +01:00
Author
Owner
Copy link

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/828/diffs?diff_id=15018&start_sha=ec4545df4527692f82d9e4dc1865fce2d8fcdbe5#45267e3a9556cafa9cb7b61dab7a3b6659e73aad_44_44)
tteichler commented 2021-12-23 22:45:00 +01:00
Author
Owner
Copy link

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/828/diffs?diff_id=15018&start_sha=ec4545df4527692f82d9e4dc1865fce2d8fcdbe5#e3a6e12ce483f8b83c4b3db5d3f37ca4b17eb541_10_9)
tteichler commented 2021-12-23 22:45:00 +01:00
Author
Owner
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>7f044dad - Fix merge issues</li><li>e67ba8c9 - Use msgbox template</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/828/diffs?diff_id=15018&start_sha=ec4545df4527692f82d9e4dc1865fce2d8fcdbe5)
hansegucker commented 2021-12-23 22:52:01 +01:00
Owner
Copy link

@debdolph Please add a screenshot of the new page.

@debdolph Please add a screenshot of the new page.
tteichler commented 2021-12-23 23:26:35 +01:00
Author
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>00ce0e96 - Use msgbox template</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/828/diffs?diff_id=15021&start_sha=e67ba8c9af3ed2f86d71f6e90d08ada6d4f87c94)
tteichler commented 2021-12-23 23:26:48 +01:00
Author
Owner
Copy link

Screenshot_from_2021-12-23_23-25-34

![Screenshot_from_2021-12-23_23-25-34](/uploads/7115efe60556916557b9b9df5f009dcc/Screenshot_from_2021-12-23_23-25-34.png)
nik commented 2021-12-24 00:48:09 +01:00
Owner
Copy link

Please add a screenshot you actually mean eriously. This cannot really be what you want AlekSIS to look like.

Please add a screenshot you actually mean eriously. This cannot really be what you want AlekSIS to look like.
nik commented 2021-12-24 18:52:16 +01:00
Owner
Copy link

marked this merge request as draft

marked this merge request as **draft**
This pull request has changes conflicting with the target branch.
  • CHANGELOG.rst
  • aleksis/core/templates/account/password_change.html
  • aleksis/core/templates/account/password_reset_from_key_done.html
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 574-rewrite-password-change-templates:574-rewrite-password-change-templates
git switch 574-rewrite-password-change-templates

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff 574-rewrite-password-change-templates
git switch 574-rewrite-password-change-templates
git rebase master
git switch master
git merge --ff-only 574-rewrite-password-change-templates
git switch 574-rewrite-password-change-templates
git rebase master
git switch master
git merge --no-ff 574-rewrite-password-change-templates
git switch master
git merge --squash 574-rewrite-password-change-templates
git switch master
git merge --ff-only 574-rewrite-password-change-templates
git switch master
git merge 574-rewrite-password-change-templates
git push origin master
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
hansegucker
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-Core!2473
No description provided.