| Commit message (Collapse) | Author | Age | Files | Lines | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@dfcdf7b
(cherry picked from commit 49c1c476ab997cd1e87ac693b17fe3df0c334346)
Conflicts:
	module/plugins/container/LinkList.py
	pyload/plugins/crypter/HoerbuchIn.py
	pyload/plugins/hoster/ChipDe.py
	pyload/plugins/hoster/DebridItaliaCom.py
	pyload/plugins/hoster/MultiDebridCom.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@d3be840
(cherry picked from commit f2deb6e7001e97d14bc4e9ee28c49eea806e62c6)
Conflicts:
	pyload/plugins/crypter/HoerbuchIn.py
	pyload/plugins/hoster/DebridItaliaCom.py
	pyload/plugins/hoster/MultiDebridCom.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@aa7b3f9
(cherry picked from commit 5fed2b0180b95eed9ee82f82dff1a5bf8c66c2f5)
Conflicts:
	module/plugins/AccountManager.py
	module/plugins/ReCaptcha.py
	module/plugins/captcha/GigasizeCom.py
	module/plugins/captcha/LinksaveIn.py
	module/plugins/container/LinkList.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/UnrestrictLi.py
	module/plugins/internal/MultiHoster.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/accounts/PremiumizeMe.py
	pyload/plugins/internal/NetloadInOCR.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@1387ded
(cherry picked from commit f7fb0220ae1be71afe8c64892dcaa8c1ea5a1469)
Conflicts:
	module/plugins/AccountManager.py
	module/plugins/container/LinkList.py
	module/plugins/internal/MultiHoster.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@74bcc70
(cherry picked from commit cca4127f9853ab029cbf0b55fedced124400952d)
Conflicts:
	module/plugins/Account.py
	module/plugins/Container.py
	module/plugins/Crypter.py
	module/plugins/Hook.py
	module/plugins/Plugin.py
	module/plugins/container/LinkList.py
	pyload/plugins/crypter/HoerbuchIn.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@6c57a37
(cherry picked from commit ce955b6c04f6ddaab1696c6cabf5e0aa83cbf846)
Conflicts:
	module/plugins/Account.py
	module/plugins/Container.py
	module/plugins/Crypter.py
	module/plugins/Hoster.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/UnrestrictLi.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merged #375
(cherry picked from commit 7f239b41cb29ee95c878f78a6e9cacd55f301a8d)
Conflicts:
	pyload/plugins/accounts/BoltsharingCom.py
	pyload/plugins/accounts/HellspyCz.py
	pyload/plugins/accounts/Share76Com.py
	pyload/plugins/accounts/UploadstationCom.py
	pyload/plugins/accounts/WuploadCom.py
	pyload/plugins/accounts/X7To.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Conflicts:
	module/config/default.conf
	module/plugins/accounts/DdlstorageCom.py
	module/plugins/accounts/RealdebridCom.py
	module/plugins/accounts/UploadheroCom.py
	module/plugins/crypter/DownloadVimeoCom.py
	module/plugins/crypter/FilebeerInfoFolder.py
	module/plugins/crypter/Movie2kTo.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/Premium4Me.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/ChipDe.py
	module/plugins/hoster/DdlstorageCom.py
	module/plugins/hoster/MovReelCom.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/hoster/SpeedLoadOrg.py
	module/plugins/hoster/ZeveraCom.py
	module/web/media/default/css/default.css
	module/web/media/default/css/window.css
	module/web/templates/default/base.html
	module/web/templates/default/captcha.html
	module/web/templates/default/home.html
	module/web/templates/default/queue.html
	module/web/templates/default/window.html
	pyload/plugins/accounts/AlldebridCom.py
	pyload/plugins/accounts/Http.py
	pyload/plugins/accounts/MultishareCz.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/accounts/PremiumizeMe.py
	pyload/plugins/accounts/ZeveraCom.py
	pyload/plugins/addons/Captcha9kw.py
	pyload/plugins/addons/CaptchaTrader.py
	pyload/plugins/addons/ClickAndLoad.py
	pyload/plugins/addons/Ev0InFetcher.py
	pyload/plugins/addons/ExternalScripts.py
	pyload/plugins/addons/ExtractArchive.py
	pyload/plugins/addons/HotFolder.py
	pyload/plugins/addons/MergeFiles.py
	pyload/plugins/addons/MultiHome.py
	pyload/plugins/addons/XMPPInterface.py
	pyload/plugins/crypter/C1neonCom.py
	pyload/plugins/crypter/CryptItCom.py
	pyload/plugins/crypter/ILoadTo.py
	pyload/plugins/crypter/LofCc.py
	pyload/plugins/crypter/NCryptIn.py
	pyload/plugins/crypter/OronComFolder.py
	pyload/plugins/crypter/RSLayerCom.py
	pyload/plugins/crypter/SecuredIn.py
	pyload/plugins/crypter/TrailerzoneInfo.py
	pyload/plugins/crypter/WiiReloadedOrg.py
	pyload/plugins/hoster/AlldebridCom.py
	pyload/plugins/hoster/BasePlugin.py
	pyload/plugins/hoster/CzshareCom.py
	pyload/plugins/hoster/DepositfilesCom.py
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FastshareCz.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/MegasharesCom.py
	pyload/plugins/hoster/MultishareCz.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NetloadIn.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/NowDownloadEu.py
	pyload/plugins/hoster/PornhostCom.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/PremiumizeMe.py
	pyload/plugins/hoster/PutlockerCom.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/RealdebridCom.py
	pyload/plugins/hoster/ShareplaceCom.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UnrestrictLi.py
	pyload/plugins/hoster/UploadedTo.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/hoster/X7To.py
	pyload/plugins/hoster/XHamsterCom.py
	pyload/plugins/hoster/YoupornCom.py
	pyload/plugins/hoster/YourfilesTo.py
	pyload/plugins/hoster/YoutubeCom.py
	pyload/plugins/hoster/ZippyshareCom.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Conflicts:
	module/plugins/hoster/UnrestrictLi.py
	pyload/plugins/hooks/Captcha9kw.py
	pyload/plugins/hoster/AlldebridCom.py
	pyload/plugins/hoster/BitshareCom.py
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/LuckyShareNet.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/PremiumizeMe.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/RealdebridCom.py
	pyload/plugins/hoster/ShareplaceCom.py
	pyload/plugins/hoster/UploadedTo.py
	pyload/plugins/hoster/UploadingCom.py
	pyload/plugins/hoster/Xdcc.py
	pyload/plugins/hoster/YourfilesTo.py
	pyload/plugins/hoster/ZeveraCom.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
(cherry picked from commit dd30ed8ae9f9ba1472d1ff9721d626dcc39b12fd)
Conflicts:
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/LuckyShareNet.py
	pyload/plugins/hoster/UploadedTo.py
 | 
|    | 
 |