Skynet/ldap_frontend
6
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Resolve "Updating the favicon" #24

Open
eoghanconlon73 wants to merge 3 commits from 10-updating-the-favicon into main
pull from: 10-updating-the-favicon
merge into: Skynet:main
Conversation 7 Commits 3 Files changed 12 +240 -13
eoghanconlon73 commented 2024-04-19 23:20:05 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Closes #10

Closes #10
eoghanconlon73 commented 2024-04-19 23:20:05 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

assigned to @eoghanconlon73

assigned to @eoghanconlon73
eoghanconlon73 commented 2024-04-19 23:29:34 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 2 commits

  • 89d0e0fe - Feat. Adding the new favicon to the website
  • ad5d255f - Removing the old favicon

Compare with previous version

added 2 commits <ul><li>89d0e0fe - Feat. Adding the new favicon to the website</li><li>ad5d255f - Removing the old favicon</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/14/diffs?diff_id=469&start_sha=36c5e5bbae7adcc404bec6d643cae5fd8a6c87bb)
eoghanconlon73 commented 2024-04-19 23:31:22 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

  • a7de35ed - Fix. Extra dot in type attribute

Compare with previous version

added 1 commit <ul><li>a7de35ed - Fix. Extra dot in type attribute</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/14/diffs?diff_id=471&start_sha=ad5d255fc0754e64aaf2109bb7449b7f0494de8e)
eoghanconlon73 commented 2024-04-19 23:31:42 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

requested review from @silver

requested review from @silver
eoghanconlon73 commented 2024-04-19 23:32:24 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Just for the record there is some unused css in sign-up.html, it is out of scope for this merge though

Just for the record there is some unused css in sign-up.html, it is out of scope for this merge though
silver commented 2024-04-19 23:35:52 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

@eoghanconlon73 when opened up does it still work?

@eoghanconlon73 when opened up does it still work?
eoghanconlon73 commented 2024-04-20 01:27:42 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

I'll check it tomorrow, on my way to bed

I'll check it tomorrow, on my way to bed
silver requested review from silver 2024-08-08 14:42:33 +00:00
silver requested review from eoghanconlon73 2024-08-08 14:42:33 +00:00
silver self-assigned this 2024-08-08 14:42:50 +00:00
eoghanconlon73 was assigned by silver 2024-08-08 14:42:50 +00:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 10-updating-the-favicon:10-updating-the-favicon
git checkout 10-updating-the-favicon

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 checkout main
git merge --no-ff 10-updating-the-favicon
git checkout 10-updating-the-favicon
git rebase main
git checkout main
git merge --ff-only 10-updating-the-favicon
git checkout 10-updating-the-favicon
git rebase main
git checkout main
git merge --no-ff 10-updating-the-favicon
git checkout main
git merge --squash 10-updating-the-favicon
git checkout main
git merge --ff-only 10-updating-the-favicon
git checkout main
git merge 10-updating-the-favicon
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
silver
eoghanconlon73
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
silver
eoghanconlon73
1 participant
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: Skynet/ldap_frontend#24
No description provided.
Delete branch "10-updating-the-favicon"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?