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

Upstream #54

Merged
merged 12 commits into from
Feb 29, 2016
Merged

Upstream #54

merged 12 commits into from
Feb 29, 2016

Conversation

labrys
Copy link
Contributor

@labrys labrys commented Feb 29, 2016

Commits on Feb 26, 2016

  • terbolous - Norbits provider 53c66a3
  • terbolous - Fix docstrings, quotes and some other coding style issues 24e338f
  • terbolous - use str.format instead of %s for search string 5b8ae9c

Commits on Feb 27, 2016

Commits on Feb 28, 2016

Commits on Feb 29, 2016

  • labrys - Merge remote-tracking branch 'sickrage/develop' into develop a0b13b4

eriweb and others added 12 commits February 27, 2016 00:40
@eriweb
Norbits provider
53c66a3
@eriweb
Fix docstrings, quotes and some other coding style issues
24e338f
@eriweb
use str.format instead of %s for search string
5b8ae9c
@eriweb
rewrite, got rid of unnecessary methods and based the provider on abn…
3ec5b3b 
…ormal.py
Merge pull request #1076 from terbolous/develop
51d0fd6 
Add provider Norbits
Change UA for statistical reasons
cd4b972
Merge pull request #1082 from SickRage/UA-Change
36b198d 
Change UA for statistical reasons
@adaur
Update T411 domain name
cba38b4
Merge pull request #1084 from SickRage/adaur-patch-1
b94d78a 
Update T411 domain name
Fix tvchaosuk, there is one persistent cookie for CF, then totals 4 c…
2505409 
…ookies when authed

Fix tntvillage login, has 3 cookies when logged in. RSS search still disabled in this provider
Fixes https://github.com/SickRage/sickrage-issues/issues/1072
Merge pull request #1085 from SickRage/tvchaos_tntv
e8bcc38 
Fix tvchaos and tntvillage logins
@labrys
Merge remote-tracking branch 'sickrage/develop' into develop
a0b13b4 
# Conflicts:
#	sickbeard/common.py
@labrys
Copy link
Contributor Author

labrys commented Feb 29, 2016

Approved!

Approved with PullApprove

@labrys
Copy link
Contributor Author

labrys commented Feb 29, 2016

Closing and reopening to coax checks to finish.

@labrys labrys closed this Feb 29, 2016
@labrys labrys reopened this Feb 29, 2016
labrys added a commit that referenced this pull request Feb 29, 2016
@labrys
Merge pull request #54 from pymedusa/upstream
24eb637 
Upstream
@labrys labrys merged commit 24eb637 into develop Feb 29, 2016
@labrys labrys deleted the upstream branch February 29, 2016 07:00
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@labrys @eriweb @miigotu @adaur