search

standardebooks / web

The source code for the Standard Ebooks website.
https://standardebooks.org
Creative Commons Zero v1.0 Universal
234 stars 61 forks source link

Rebase onto master and add additional validation #353

Closed colagrosso closed 4 months ago

colagrosso commented 4 months ago

This PR looks bad, but it does only 2 things:

  1. Rebase onto master
  2. Additional Ebook validation

The merge conflicts are with EbookSource and EbookSourceType. Both 5b3f8f7b7732d98f2eecc6ac7b2fd8481af2d9e0 in master and a2cc7190a4fee228802abc7f448fd612b302a2aa in db-rewrite changed EbookSource.php.

I fixed the merge conflict in the "Spell out EbookSourceType values" commit, 2c39057a6746c917b10eb79c5461cfb8d75c1ebc, and the additional Ebook validation is at the end, 9316a5dd5cf1b4f1f0c2d0aeca14f44665e92f57.

Since this is an experimental branch, and (I believe) I'm the only one working on it, it should be fine to force push to db-rewrite. Once you review the additional Ebook validation, of course.

I'll try to avoid conflicts with master in the future, but I do appreciate the improvements you're adding there, and I may rebase onto master (without conflicts) when I can pull in useful commits.

colagrosso commented 4 months ago

I added another merge commit at the end that made GitHub happy. I did it in the web editor, so I made a little tab/spaces error that I will clean up later.

acabal commented 4 months ago

OK, I had to squash it because Github wouldn't let me rebase. Don't worry too much about the commit history, we'll squash it all down into one when we merge into master.