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.

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

More source code #5

Merged
merged 15 commits into from
Jul 14, 2024
Merged

More source code #5

merged 15 commits into from
Jul 14, 2024

Conversation

MrSn0wy
Copy link
Contributor

@MrSn0wy MrSn0wy commented Jun 28, 2024

Heya!
This pr includes:

  • The finished Compatibility page
  • The Finished rust database updater script
  • Fixed XXS by adding a CSP
  • Github .yml files for automatic updates on the gh-pages branch
  • Deletion of the Coming Soon page
  • A more "finished" folder structure
  • An animation on the main page

I also tried to keep track of all the changes with a changelog.

This version could be released on obliteration.net (however the download page is not finished yet)
You can preview the current site here: https://mrsn0wy.github.io/obhqWebsite/

@MrSn0wy MrSn0wy force-pushed the main branch 3 times, most recently from bc102ca to a0a4543 Compare June 28, 2024 21:32
Copy link
Member

@ultimaweapon ultimaweapon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! I found some issues so please take a look.

updater/src/config.rs Outdated Show resolved Hide resolved
updater/src/config.rs Show resolved Hide resolved
updater/Cargo.lock Outdated Show resolved Hide resolved
public_html/_errorPages/500.html Outdated Show resolved Hide resolved
public_html/_errorPages/404.html Outdated Show resolved Hide resolved
public_html/_errorPages/403.html Outdated Show resolved Hide resolved
updater/src/config.rs Show resolved Hide resolved
Copy link
Member

@ultimaweapon ultimaweapon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay to go live. Thanks!

@ultimaweapon
Copy link
Member

Wait, just notice there are some conflicts.

@MrSn0wy
Copy link
Contributor Author

MrSn0wy commented Jul 6, 2024

yeah, sadly i can't fix the conflicts. Can't you maybe force-push it to the repo or something?

@ultimaweapon
Copy link
Member

Can you provide more details about the conflicts? GitHub did not provide any information except This branch has conflicts that must be resolved. Normally it will show a list of file that has some conflicts.

@MrSn0wy
Copy link
Contributor Author

MrSn0wy commented Jul 7, 2024

I can't, however i think it has to do with the first pull request. When it got accepted I didn't pull it since i already had all the changes in the repo (since i made the pr lmao). Maybe github thinks there are "changes" and that there are somehow conflicts?

@ultimaweapon
Copy link
Member

Thanks for the information. Let's see if I can fix this.

@ultimaweapon
Copy link
Member

I have rebase your main branch on top of main branch on this repository. But I need to force-push to your main so this PR can be merge. Are you okay with this?

@MrSn0wy
Copy link
Contributor Author

MrSn0wy commented Jul 13, 2024

heya, i forgot rebasing was a thing. hopefully everything should be good to merge now!

@ultimaweapon ultimaweapon merged commit 5be3981 into obhq:main Jul 14, 2024
@ultimaweapon ultimaweapon linked an issue Jul 17, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Find a solution to deal with XSS
2 participants