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 #26

Merged
merged 21 commits into from
Feb 26, 2016
Merged

Upstream #26

merged 21 commits into from
Feb 26, 2016

Conversation

labrys
Copy link
Contributor

@labrys labrys commented Feb 26, 2016

Fixes #

Proposed changes in this pull request:

  • PR is based on the DEVELOP branch
  • Don't send big changes all at once. Split up big PRs into multiple smaller PRs that are easier to manage and review
  • Read contribution guide

miigotu and others added 21 commits February 17, 2016 09:58
Fix searches with ABNormal
8695768 
Replace double quotes with single quotes as per our decided convention

ABNormal, sort by Time for rss, or Seeders for everything else.
NewPCT:
a445380 
  * Unicode literals
  * Fix string quotes
  * Fix get_url override
  * Conformity and cleanup
@Indigo744
Add OCS network logo
e143bb9 
Added OCS (Orange Ciné Series) logo, a french network.
Merge pull request #1050 from Indigo744/patch-logo-network-ocs
26ddbf4 
Add OCS network logo
@disrani
Plex: Always return True when getting auth token if username/password…
b6c7a19 
… aren't configured

This was causing failures to update Plex server when no username and password
were specified since we were failing to get the auth token
Use a decorator to prevent processing a dir more than once at a time,…
dde73ea 
… regardless of caller

Fixes https://github.com/SickRage/sickrage-issues/issues/1028
Merge pull request #1067 from SickRage/no_overlap_pp
2654d07 
Use a decorator to prevent processing a dir more than once at a time,…
Merge pull request #1061 from disrani/develop
492876c 
Plex: Always return True when getting auth token if username/password…
Merge branch 'master' into develop
f4f2752
Fixes https://github.com/SickRage/sickrage-issues/issues/1046
72b9c0b
fix: Danishbits provider now works again
28a2af7 
Aparently, BS4 `class_` lookup does not work when element has more than one class? Anywho, replaced
the lookup with `id`
Merge pull request #1069 from nesler/fix-provider-danishbits
c122a84 
fix: Danishbits provider now works again
Gui had wrong replacement chars for scene numbers in renamer
f432b0a
Disable show update on start until it can be improved
68720a5
Missed a few replace-map typos
93c88ca
Merge pull request #1070 from SickRage/replaces-maps
49f597a 
Replaces maps
@neoatomic
Added provider icons for french-adn.com & torrentshack.me
0dadb35
Merge pull request #1072 from neoatomic/develop
2f5e8ad 
Added provider icons for french-adn.com & torrentshack.me
50 Threads? Really? This fix halves VIRT alloc, to halve it again add…
2d7e561 
… export MALLOC_ARENA_MAX=2 (or 1) to your runscript on linux)
Merge pull request #1073 from SickRage/threads-fix
beddbac 
Fixes too many threads and VIRT memory
@labrys
Merge remote-tracking branch 'sickrage/develop' into develop
67d66f8 
# Conflicts:
#	SickBeard.py
@Hellowlol
Copy link
Contributor

So what's up with the latest change. Is it this just a name change (new repo) or more drama? :)

labrys added a commit that referenced this pull request Feb 26, 2016
@labrys
Merge pull request #26 from pymedusa/upstream
b716f43 
Upstream
@labrys labrys merged commit b716f43 into develop Feb 26, 2016
@labrys labrys deleted the upstream branch February 26, 2016 11:13
@labrys
Copy link
Contributor Author

labrys commented Feb 26, 2016

@Hellowlol PM me in IRC or e-mail me at [email protected]

@p0psicles p0psicles mentioned this pull request Apr 8, 2022
Closed
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.
6 participants
@labrys @Hellowlol @miigotu @Indigo744 @disrani @neoatomic