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

initial commit for ZAP Chat 18 #13

Merged
merged 1 commit into from
Feb 15, 2025
Merged

initial commit for ZAP Chat 18 #13

merged 1 commit into from
Feb 15, 2025

Conversation

8linkz
Copy link
Contributor

@8linkz 8linkz commented Dec 15, 2024

Heyho - here are the unfortunately delayed but revised subtitles for the ZAP Chat 18 video.
I hope I spelled Antero(?) correctly. Otherwise I had problems with the other open source project name KIX(?) - so the name may be misspelled here.

Otherwise I hope it fits.

videourl: https://www.youtube.com/watch?v=7kqg7x7d6os

@8linkz 8linkz force-pushed the 18 branch 2 times, most recently from 3178acc to 4cc5df6 Compare December 15, 2024 04:48
@8linkz
Copy link
Contributor Author

8linkz commented Dec 15, 2024

For whatever reason the subtitles for episode 17 are in there now - I only used sqash and signoff :-(

@thc202
Copy link
Member

thc202 commented Dec 15, 2024

Antero is correct: https://www.zaproxy.org/docs/team/antero/ It's KICS.

@8linkz
Copy link
Contributor Author

8linkz commented Jan 22, 2025

bumb

before I fumble something here again, it would be nice to delete the 17 (and if there should be no more changes)

@kingthorin
Copy link
Member

Delete 17 from the PR?

@8linkz
Copy link
Contributor Author

8linkz commented Jan 22, 2025

yes - because it was a mistake to add both, and github hates me.

@kingthorin
Copy link
Member

Sure, I'll take care of that.

@kingthorin kingthorin force-pushed the 18 branch 2 times, most recently from 1401e03 to 0321fbe Compare January 22, 2025 13:19
initial commit for ZAP Chat 18

Signed-off-by: Blinkz <[email protected]>
@kingthorin
Copy link
Member

⚠️ Before you do any other changes⚠️

Assuming origin is https://github.com/8linkz/zap-media-resources.git

  1. git fetch origin
  2. git reset --hard origin/18
  3. If you check git log -2 --oneline it should look like:
$ git log -2 --oneline
d7216ab (HEAD -> 18, origin/18) Add the first version of the episode 18 curated subtitle
abe74f6 (upstream/main, origin/main, origin/HEAD, main) Merge pull request #12 from 8linkz/17

@8linkz
Copy link
Contributor Author

8linkz commented Jan 22, 2025

thanks to you - if it doesn't need any other changes, then it can go through?

@8linkz
Copy link
Contributor Author

8linkz commented Feb 15, 2025

bump

@thc202 thc202 merged commit ac829f2 into zaproxy:main Feb 15, 2025
2 checks passed
@thc202
Copy link
Member

thc202 commented Feb 15, 2025

Thank you!

@8linkz 8linkz deleted the 18 branch February 15, 2025 09:00
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.

4 participants