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

Resolve "Favicon should contain only school bag" #2417

Merged
hansegucker merged 6 commits from 254-favicon-should-contain-only-school-bag into master 2021-12-20 22:06:56 +01:00
Conversation 30 Commits 6 Files changed 11 +7 -1
leuckeju commented 2021-11-09 16:03:55 +01:00
Member
Copy link

Closes #254

Closes #254
leuckeju commented 2021-11-09 16:03:56 +01:00
Author
Member
Copy link

assigned to @leuckeju

assigned to @leuckeju
leuckeju commented 2021-11-09 16:05:34 +01:00
Author
Member
Copy link

added 1 commit

  • acf007b5 - Use AlekSIS favicon as default favicon

Compare with previous version

added 1 commit <ul><li>acf007b5 - Use AlekSIS favicon as default favicon</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=13242&start_sha=5261b30c899c295f70e6ed0679f6309f779a7d37)
leuckeju commented 2021-11-09 16:05:51 +01:00
Author
Member
Copy link

assigned to @hansegucker and unassigned @ZugBahnHof

assigned to @hansegucker and unassigned @ZugBahnHof
leuckeju commented 2021-11-09 16:05:52 +01:00
Author
Member
Copy link

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2021-11-09 16:13:38 +01:00
Owner
Copy link

May I ask why we still have this icons folder with all these pregenerated files? Is it still used anywhere?

May I ask why we still have this icons folder with all these pregenerated files? Is it still used anywhere?
leuckeju commented 2021-11-09 16:15:01 +01:00
Author
Member
Copy link

I have no idea tbh, I just saw !2124 of @debdolph and noticed this missing change

I have no idea tbh, I just saw !2124 of @debdolph and noticed this missing change
hansegucker commented 2021-11-09 16:20:48 +01:00
Owner
Copy link

A short git grep said that they aren't used in any place. So, I think we should drop the icons folder and copy the largest favicon file to the img folder (with a new speaking name).

A short `git grep` said that they aren't used in any place. So, I think we should drop the `icons` folder and copy the largest favicon file to the `img` folder (with a new speaking name).
nik commented 2021-11-09 16:32:23 +01:00
Owner
Copy link

Please update the changelog.

Please update the changelog.
leuckeju commented 2021-11-09 17:10:51 +01:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>7956534c - Remove old generated icons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=13248&start_sha=acf007b5e576a275cc8b5a662a7708530bc7ca26)
leuckeju commented 2021-11-09 17:13:09 +01:00
Author
Member
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b1efc5c4 - Update CHANGELOG.rst</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=13249&start_sha=7956534ca6578bea24d4dd7dfbda422cb11dfbce)
leuckeju commented 2021-11-09 17:43:00 +01:00
Author
Member
Copy link

resolved all threads

resolved all threads
leuckeju commented 2021-12-03 21:23:58 +01:00
Author
Member
Copy link

What is preventing this from being merged @hansegucker ?

What is preventing this from being merged @hansegucker ?
hansegucker commented 2021-12-07 11:14:50 +01:00
Owner
Copy link

The merge conflicts you have to resolve.

The merge conflicts you have to resolve.
nik commented 2021-12-07 21:24:13 +01:00
Owner
Copy link

This issue is handled in !2125. Why is there a second MR for this?

This issue is handled in !2125. Why is there a second MR for this?
nik commented 2021-12-07 21:24:19 +01:00
Owner
Copy link

marked this merge request as draft

marked this merge request as **draft**
hansegucker commented 2021-12-07 21:26:50 +01:00
Owner
Copy link

!2125 also does much unnecessary stuff. Interesting ...

!2125 also does much unnecessary stuff. Interesting ...
leuckeju commented 2021-12-14 11:08:11 +01:00
Author
Member
Copy link

added 139 commits

  • b1efc5c4...f183bdf6 - 138 commits from branch master
  • 68e01d5b - Merge branch 'master' into '254-favicon-should-contain-only-school-bag'

Compare with previous version

added 139 commits <ul><li>b1efc5c4...f183bdf6 - 138 commits from branch <code>master</code></li><li>68e01d5b - Merge branch &#39;master&#39; into &#39;254-favicon-should-contain-only-school-bag&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=14470&start_sha=b1efc5c46f15e8ba7c8edb992ec28d70ebeca10e)
leuckeju commented 2021-12-14 11:08:26 +01:00
Author
Member
Copy link

resolved

resolved
nik commented 2021-12-14 12:57:26 +01:00
Owner
Copy link

marked this merge request as ready

marked this merge request as **ready**
leuckeju commented 2021-12-14 12:58:08 +01:00
Author
Member
Copy link

can this thread be resolved?

can this thread be resolved?
nik commented 2021-12-20 13:55:41 +01:00
Owner
Copy link

requested review from @hansegucker

requested review from @hansegucker
nik commented 2021-12-20 13:55:45 +01:00
Owner
Copy link

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker
nik commented 2021-12-20 13:57:31 +01:00
Owner
Copy link

added 38 commits

  • 68e01d5b...0bacbedd - 37 commits from branch master
  • 14d03c22 - Merge branch 'master' into '254-favicon-should-contain-only-school-bag'

Compare with previous version

added 38 commits <ul><li>68e01d5b...0bacbedd - 37 commits from branch <code>master</code></li><li>14d03c22 - Merge branch &#39;master&#39; into &#39;254-favicon-should-contain-only-school-bag&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=14797&start_sha=68e01d5b06545d0c5e6278eab6e71cfbfd4d4edb)
nik commented 2021-12-20 13:57:53 +01:00
Owner
Copy link

resolved all threads

resolved all threads
nik scheduled this pull request to auto merge when all checks succeed 2021-12-20 13:58:03 +01:00
hansegucker canceled auto merging this pull request when all checks succeed 2021-12-20 14:00:48 +01:00
hansegucker commented 2021-12-20 14:00:53 +01:00
Owner
Copy link

marked this merge request as draft

marked this merge request as **draft**
nik commented 2021-12-20 14:01:23 +01:00
Owner
Copy link

marked this merge request as ready

marked this merge request as **ready**
nik commented 2021-12-20 14:04:19 +01:00
Owner
Copy link

added 1 commit

  • 6510c6f8 - Merge branch 'master' into '254-favicon-should-contain-only-school-bag'

Compare with previous version

added 1 commit <ul><li>6510c6f8 - Merge branch &#39;master&#39; into &#39;254-favicon-should-contain-only-school-bag&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=14802&start_sha=14d03c22e091a0a9006e0d8346845137a8642c1f)
nik scheduled this pull request to auto merge when all checks succeed 2021-12-20 14:04:40 +01:00
nik commented 2021-12-20 20:38:43 +01:00
Owner
Copy link

aborted the automatic merge because source branch was updated

aborted the automatic merge because source branch was updated
nik commented 2021-12-20 20:38:43 +01:00
Owner
Copy link

added 10 commits

  • 6510c6f8...662f796e - 9 commits from branch master
  • a29d1d00 - Merge branch 'master' into '254-favicon-should-contain-only-school-bag'

Compare with previous version

added 10 commits <ul><li>6510c6f8...662f796e - 9 commits from branch <code>master</code></li><li>a29d1d00 - Merge branch &#39;master&#39; into &#39;254-favicon-should-contain-only-school-bag&#39;</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/772/diffs?diff_id=14855&start_sha=6510c6f826985c07e6c63038f0e02b8975636e29)
nik scheduled this pull request to auto merge when all checks succeed 2021-12-20 20:39:02 +01:00
nik merged commit 8f4e5735ab into master 2021-12-20 22:06:56 +01:00
nik commented 2021-12-20 22:06:57 +01:00
Owner
Copy link

mentioned in commit 8f4e5735ab

mentioned in commit 8f4e5735abf271e49332562b6c3799593a14151d
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
nik
3 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!2417
No description provided.