Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fixed a typo for internal, unused part of the file upload icon for status page #4750

Merged
merged 1 commit into from
May 10, 2024
Merged

chore: fixed a typo for internal, unused part of the file upload icon for status page #4750

merged 1 commit into from
May 10, 2024

Conversation

jmolnar-comparative
Copy link
Contributor

@jmolnar-comparative jmolnar-comparative commented May 8, 2024 •
edited

⚠️⚠️⚠️ Since we do not accept all types of pull requests and do not want to waste your time. Please be sure that you have read pull request rules:
https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma

Tick the checkbox if you understand [x]:

  • I have read and understand the pull request rules.

Description

Fixes #4749

Type of change

Please delete any options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • My code follows the style guidelines of this project
  • I ran ESLint and other linters for modified files
  • I have performed a self-review of my own code and tested it
  • I have commented my code, particularly in hard-to-understand areas (including JSDoc for methods)
  • My changes generates no new warnings
  • My code needed automated testing. I have added them (this is optional task)

@jmolnar-comparative jmolnar-comparative mentioned this pull request May 8, 2024
Closed
1 task
@CommanderStorm CommanderStorm added this to the 1.23.14 milestone May 8, 2024
@CommanderStorm
Copy link
Collaborator

I consider this as an uncontroversial bugfix
=> I would like this to be in 1.23.X instead

Could you rebase this to said branch via running

npm run rebase-pr-to-1.23.X

@CommanderStorm CommanderStorm changed the base branch from master to 1.23.X May 8, 2024 22:07
@CommanderStorm CommanderStorm changed the title fix explicitly-specified icon for status page: no such thing as config.icon chore: fixed a typo for internal, unused part of the file upload icon for status page May 8, 2024
@Zaid-maker
Copy link
Contributor

That's a lot of changes??

@jmolnar-comparative
Copy link
Contributor Author

I think somebody changed the target to 1.23.x; it was originally based on the main branch.

@jmolnar-comparative
Copy link
Contributor Author

Needs to be rebased. Frank asked me to do that, but I've been too busy with my job

@jmolnar-comparative
Copy link
Contributor Author

For context: my original PR was 1 commit, +/- 1 line

@CommanderStorm CommanderStorm changed the base branch from 1.23.X to master May 10, 2024 18:32
@CommanderStorm
Copy link
Collaborator

I guess then this is going into v2.0.

Think this can also be considered a "feature" as this strictly speaking adds functionality to the internal api and not to the user interface.

=> merging with junior maintainer approval.

@CommanderStorm CommanderStorm merged commit 237a6e8 into louislam:master May 10, 2024
17 checks passed
@CommanderStorm CommanderStorm modified the milestones: 1.23.14, 2.0.0 May 10, 2024
@jmolnar-comparative jmolnar-comparative mentioned this pull request May 13, 2024
Merged
7 tasks
@jmolnar-comparative
Copy link
Contributor Author

@CommanderStorm I made a backport to 1.23.X here: #4757

@jmolnar-comparative jmolnar-comparative deleted the jm/fix-saveStatusPage-icon-nonBase64 branch May 13, 2024 16:45
@CommanderStorm CommanderStorm added the area:status-page Everything related to the status page label May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area:status-page Everything related to the status page
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

saveStatusPage socket handler does not use icon specified in payload if not base64-encoded
3 participants
@jmolnar-comparative @CommanderStorm @Zaid-maker