Commit Graph

2539 Commits (2d0efe70a684cf378c6c325eafc8e52a85321157)
 

Author SHA1 Message Date
Philipp Hagemeister 9868c781a1 Merge remote-tracking branch 'origin/master'
Philipp Hagemeister c257baff85 Merge remote-tracking branch 'rzhxeo/youporn-hd'
Conflicts:
	youtube_dl/utils.py
rzhxeo 878e83c5a4 YoupornIE: Clean up extraction of hd video
rzhxeo 0012690aae Let aes_decrypt_text return bytes instead of unicode
rzhxeo 6e74bc41ca Fix division bug in aes.py
rzhxeo cba892fa1f Add intlist_to_bytes to utils.py
rzhxeo 550bfd4cbd Merge pull request from phihag/youporn-hd-pr
Allow changes to run under Python 3
Jaime Marquínez Ferrándiz 920ef0779b Hide the password and username in verbose mode (closes )
Philipp Hagemeister 48ea9cea77 Allow changes to run under Python 3
Philipp Hagemeister ccf4b799df Merge remote-tracking branch 'origin/master'
Philipp Hagemeister f143d86ad2 [sohu] Handle encoding, and fix tests
Jaime Marquínez Ferrándiz 8ae97d76ee PostProcessingError holds the message in the 'msg' property, not in 'message' (fixes )
Causes DeprecationWarning: http://www.python.org/dev/peps/pep-0352/
Philipp Hagemeister f8b362739e Merge remote-tracking branch 'Huarong/master'
Philipp Hagemeister 6d69d03bac Merge remote-tracking branch 'origin/reuse_ies'
Philipp Hagemeister 204da0d3e3 Merge remote-tracking branch 'origin/master'
Philipp Hagemeister c496ca96e7 Fix platform name in Python 2 with --verbose (Closes )
Jaime Marquínez Ferrándiz 67b22dd036 Add extractors for video.mit.edu and techtv.mit.edu (closes )
video.mit.edu just embeds the videos from techtv.mit.edu
Philipp Hagemeister ce6a696e4d Remove unused imports
Philipp Hagemeister a5caba1eb0 [generic] simply use urljoin
Pierre Rudloff cd9c100963 Merge remote-tracking branch 'upstream/master'
Philipp Hagemeister edde6c56ac Print playpath with --get-url (Fixes )
Pierre Rudloff b7f89fe692 Merge remote-tracking branch 'upstream/master'
Philipp Hagemeister ae3531adf9 [generic] Fix URL concatenation
When the url is something like http://example.org/foo/bar?x=y  and the added is file/video.mp4 , we want http://example.org/foo/file/video.mp4
Fixes .
Philipp Hagemeister 8cf5ee7831 Merge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister aa3e950764 Tolerate junk at the end of gzip-compressed content ()
Pierre Rudloff 1301a0dd42 Merge remote-tracking branch 'upstream/master'
Jaime Marquínez Ferrándiz af8bd6a82d Show the time taken to download in the same format as the ETA
Jaime Marquínez Ferrándiz 6d38616e67 Merge pull request from h3xx/master
Add some verbosity when reporting finished downloads

Remove the mixed use of tabs and spaces for indentation.
Philipp Hagemeister 4f5f18acb9 [addanime] add file
Jaime Marquínez Ferrándiz 3e223834d9 [youtube] update algo for length 88, thanks to @Ramhack (fixes )
Jaime Marquínez Ferrándiz a1bb0f8773 [cnn] remove debug print call.
Jaime Marquínez Ferrándiz 0e283428f7 HTTPError is in urllib.error in Python 3, not in http.error
Philipp Hagemeister 2eabb80254 [addanime] improve
Philipp Hagemeister 44586389e4 [appletrailers] Add support
Ismael Mejia 06a401c845 Merge branch 'master' into subtitles_rework
Philipp Hagemeister 273f603efb [cnn] Allow more URLs
Philipp Hagemeister 1619e22f40 release 2013.08.28
Philipp Hagemeister 88a79ce6a6 Delete default user agent (Fixes )
Philipp Hagemeister acebc9cd6b Revert "Install our own HTTPS handler as well ()"
This reverts commit 36399e8576 and fixes .
Jaime Marquínez Ferrándiz 443c12a703 Merge pull request from whydoubt/fix_gplus
Initial slash in Google+ photos link was removed
Jeff Smith 7f3c4f4f65 Initial slash in Google+ photos link was removed
Jaime Marquínez Ferrándiz 0bc56fa66a Add an extractor for NBC news (closes )
Jaime Marquínez Ferrándiz 1a582dd49d Add an extractor for CNN (closes )
Pierre Rudloff c5b921b597 Merge remote-tracking branch 'upstream/master'
Philipp Hagemeister e86ea47c02 [canalc2] Small improvements
Philipp Hagemeister aa5a63a5b5 Merge remote-tracking branch 'Rudloff/canalc2'
Jaime Marquínez Ferrándiz 2a7b4da9b2 [hark] get the song info in JSON and extract more information.
Jaime Marquínez Ferrándiz 069d098f84 [canalplus] Accept player.canalplus.fr urls
Philipp Hagemeister b3889f7023 release 2013.08.27
Philipp Hagemeister 65883c8dbd Merge branch 'master' of github.com:rg3/youtube-dl