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

Reintegrate all skyshard changes #10

Open
wants to merge 152 commits into
base: smallrivers
Choose a base branch
from
Open

Reintegrate all skyshard changes #10

wants to merge 152 commits into from

Conversation

rborer
Copy link

@rborer rborer commented Aug 12, 2016

Cherry-pick everything until commit 0eedcaa.

andresp99999 and others added 30 commits August 9, 2016 17:24
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
#	src/test/java/de/jetwick/snacktory/ArticleTextExtractorTest.java
…e patterns and test cases

# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
#	src/test/java/de/jetwick/snacktory/ArticleTextExtractorTest.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
…r logging info for debugging

# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
New tests introduced by 0e753c2 requires changes as we extract the title differently than upstream.
# Conflicts:
#	src/test/java/de/jetwick/snacktory/ArticleTextExtractorTest.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/HtmlFetcher.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
andresp99999 and others added 30 commits August 12, 2016 11:12
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
# Conflicts:
#	src/main/java/de/jetwick/snacktory/ArticleTextExtractor.java
We get slightly less content with our implementation (probably because of karussell#47).
Photo credits are now excluded
Remove unused import & variables. Make sure internal classes are static so they don't keep a reference to the parent instance!
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.

2 participants