summaryrefslogtreecommitdiffstats
path: root/pyload/plugins
Commit message (Collapse)AuthorAgeFilesLines
* New base pluginsGravatar Walter Purcaro 2014-10-03174-168/+168
|
* Fix previous merge commitGravatar Walter Purcaro 2014-10-035-0/+275
|
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-10-0335-231/+372
| | | | | | | | Conflicts: pyload/plugins/ocr/GigasizeCom.py pyload/plugins/ocr/LinksaveIn.py pyload/plugins/ocr/NetloadIn.py pyload/plugins/ocr/ShareonlineBiz.py
* Changed XFileSharingPro and UpdateManager to internal pluginsGravatar Walter Purcaro 2014-09-2830-29/+29
|
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-09-28131-1054/+736
| | | | | | | | | | | | | | | | | Conflicts: pyload/plugins/crypter/MultiuploadCom.py pyload/plugins/crypter/SerienjunkiesOrg.py pyload/plugins/hooks/ExternalScripts.py pyload/plugins/hooks/ExtractArchive.py pyload/plugins/hooks/MergeFiles.py pyload/plugins/hoster/CatShareNet.py pyload/plugins/hoster/FilezyNet.py pyload/plugins/hoster/IFileWs.py pyload/plugins/hoster/PremiumTo.py pyload/plugins/hoster/SpeedyshareCom.py pyload/plugins/hoster/UptoboxCom.py pyload/plugins/hoster/XFileSharingPro.py pyload/plugins/hoster/ZippyshareCom.py
* [FourSharedCom] Newline returnsGravatar Walter Purcaro 2014-09-141-0/+1
|
* Merge remote-tracking branch 'pyload/stable' into 0.4.10Gravatar Walter Purcaro 2014-09-149-77/+80
| | | | | | | | | | | | | | | | | | | | Conflicts: module/plugins/accounts/MultiDebridCom.py module/plugins/accounts/MyfastfileCom.py module/plugins/hooks/MultiDebridCom.py module/plugins/hooks/MyfastfileCom.py module/plugins/hooks/Premium4Me.py module/plugins/hooks/PremiumTo.py module/plugins/hoster/MultiDebridCom.py module/plugins/hoster/MyfastfileCom.py module/plugins/hoster/Premium4Me.py module/plugins/hoster/PremiumTo.py pyload/plugins/accounts/MultiDebridCom.py pyload/plugins/accounts/Premium4Me.py pyload/plugins/hooks/MultiDebridCom.py pyload/plugins/hooks/Premium4Me.py pyload/plugins/hoster/MultiDebridCom.py pyload/plugins/hoster/Premium4Me.py
* Restructure pyload file tree (1)Gravatar Walter Purcaro 2014-09-1469-607/+78
|
* [Lib] Update simplejson to v3.6.3 + one file wsgiserver + importing fixupGravatar Walter Purcaro 2014-09-149-10/+10
|
* module -> pyloadGravatar Walter Purcaro 2014-09-14383-0/+25445