Code

Update#4

Code

Merged

tburrows13 merged 98 commits intotburrows13:mastertburrows13/moviepy:masterfrom Zulko:masterZulko/moviepy:masterCopy head branch name to clipboardFeb 27, 2017

+298-155

Commits

Commits on Aug 24, 2015

• Fixed copy-paste typo

  Show description for 4e60a71
  temerick

  committed
  4e60a71

Commits on Sep 20, 2015

• Fixed missing list

  Show description for f0372ad
  

  LunarLanding

  committed
  f0372ad

Commits on Oct 7, 2015

• fixed module hierarchy for Trajectory

  bwagner

  committed
  efaba09

• fixed addy

  bwagner

  committed
  2153c20

Commits on Dec 23, 2015

• small recipe

  

  Andres Vargas

  committed
  3ae11f5

Commits on Dec 28, 2015

• on_color function docstring has wrong parameter

  Show description for 8d0cc38
  cblument

  committed
  8d0cc38

Commits on Jan 26, 2016

• Update README.rst

  Show description for f0dc512
  tcyrus

  committed
  f0dc512

Commits on Jun 16, 2016

• fix deprecation message

  Show description for 8986d2f
  mgaitan

  authored
  8986d2f

Commits on Oct 10, 2016

• ImageSequenceClip: Check for fps and durations rather than fps and duration

  jeromegrosse

  committed
  85c631d

Commits on Oct 17, 2016

• Add a test case.

  

  Andrew Wagner

  committed
  33e2975

• Add another test

  

  Andrew Wagner

  committed
  870a5f4

Commits on Jan 16, 2017

• ensures int arguments to np.reshape; closes #383

  tyarkoni

  committed
  814b776

Commits on Feb 10, 2017

• fix issue #401

  

  Billy Earney

  committed
  04b6bc6

Commits on Feb 14, 2017

• Merge pull request #405 from Gloin1313/master

  Show description for 6453c7f
  Zulko

  authored
  6453c7f

• Merge pull request #2 from Zulko/master

  Show description for 05e88b7
  bearney74

  authored
  05e88b7

Commits on Feb 15, 2017

• fix issue #335

  

  Billy Earney

  committed
  015f9a3

• Update maintainer section in README

  mbeacom

  committed
  afa1eb3

• Merge pull request #409 from mbeacom/fix-readme

  Show description for eb32bc1
  

  Mark Beacom

  authored
  eb32bc1

• Merge pull request #403 from earney/master

  Show description for 212db1f
  

  Mark Beacom

  authored
  212db1f

• Merge pull request #384 from tyarkoni/master

  Show description for a49be81
  

  Mark Beacom

  authored
  a49be81

• Merge pull request #3 from Zulko/master

  Show description for ef83248
  bearney74

  authored
  ef83248

• Merge pull request #244 from cblument/doc_fix

  Show description for ceb4076
  

  Mark Beacom

  authored
  ceb4076

• Merge pull request #4 from Zulko/master

  Show description for 13ac192
  bearney74

  authored
  13ac192

• make concatenate_videoclips Python 3 compatible.. fix issue #313

  

  Billy Earney

  committed
  a87b99b

• Merge pull request #410 from earney/master

  Show description for 3137695
  

  Mark Beacom

  authored
  3137695

• Increment release version

  mbeacom

  committed
  bed4266

• CompositeVideoClip doesn't accept an argument of transparent

  

  Billy Earney

  committed
  20a70f0

• move PY3 variable to compat.py

  

  Billy Earney

  committed
  a5a575a

• Merge pull request #5 from Zulko/master

  Show description for 8a7f841
  bearney74

  authored
  8a7f841

• fix movie => moviepy typo

  

  Billy Earney

  committed
  8c1aaa5

• fix issue #341

  

  Billy Earney

  committed
  cec4511

• Merge branch 'master' of github.com:earney/moviepy

  

  Billy Earney

  committed
  a38e4cd

• Merge pull request #411 from earney/master

  Show description for 2f824b0
  bearney74

  authored
  2f824b0

• Fixed typo #375

  Show description for e3480c6
  

  Gloin1313

  authored
  e3480c6

• Merge pull request #6 from Zulko/master

  Show description for 16d7c81
  bearney74

  authored
  16d7c81

• fix issue #357, which makes real problem more obvious (media file does not exist

  

  Billy Earney

  committed
  f4a4606

• Merge pull request #243 from zodman/master

  Show description for 75bc1af
  bearney74

  authored
  75bc1af

• Revert "small recipe (mirroring a video)"

  Zulko

  authored
  f7ad6be

• Merge pull request #414 from Zulko/revert-243-master

  Show description for 54bdeeb
  Zulko

  authored
  54bdeeb

• Merge pull request #7 from Zulko/master

  Show description for ca009a3
  bearney74

  authored
  ca009a3

Commits on Feb 16, 2017

• Merge pull request #302 from mgaitan/patch-2

  Show description for 118f952
  

  Gloin1313

  authored
  118f952

• Merge pull request #254 from tcyrus/patch-1

  Show description for fb023fb
  

  Gloin1313

  authored
  fb023fb

• Merge pull request #8 from Zulko/master

  Show description for 1381b38
  bearney74

  authored
  1381b38

Commits on Feb 17, 2017

• Merge pull request #331 from jeromegrosse/bug-imagesequenceclip-duration

  Show description for 64871cf
  bearney74

  authored
  64871cf

Commits on Feb 18, 2017

• Merge branch 'master' of https://github.com/Zulko/moviepy

  tburrows13

  committed
  c7e46a0

• Fixed indentation

  

  Gloin1313

  authored
  58f9022

Commits on Feb 19, 2017

• .gitignore ignore Mac-specific files, Jetbrains settings dir

  kerstin

  committed
  2b9b14b

• README.rst make mention of Gitter, add PyPI and Gitter badge

  kerstin

  committed
  0360aee

• README.rst wording, formatting

  kerstin

  committed
  24c538a

• README.rst structure link targets, add co-maintainers (with @username)

  kerstin

  committed
  8ab44ea

• README.rst move maintainers, contributing sections; change docs x-reference name

  kerstin

  committed
  11cc67d

• README.rst fix grammar

  kerstin

  committed
  fdd9413

Commits on Feb 20, 2017

• Merge pull request #413 from earney/master

  Show description for 3d91ddd
  bearney74

  authored
  3d91ddd

• fix issue 145. raise Exception when concatenate method != chain or compose

  bearney74

  committed
  b4cf52f

• make PEP8 compatible

  bearney74

  committed
  1bb1e3c

• Merge pull request #428 from earney/issue_145

  Show description for 35b4e5e
  Zulko

  authored
  35b4e5e

• Merge pull request #425 from kerstin/readme_improvements

  Show description for edbb772
  kerstin

  authored
  edbb772

• fix PR #413 . (issue #357)

  bearney74

  committed
  639e449

• Merge pull request #429 from earney/issue_145

  Show description for 5ef16e9
  bearney74

  authored
  5ef16e9

• Merge pull request #1 from Zulko/master

  Show description for f8092d0
  bearney74

  authored
  f8092d0

• create test for issue #145

  bearney74

  committed
  ed4adbe

Commits on Feb 21, 2017

• add tests/media to .gitignore

  bearney74

  committed
  19d4f03

• Merge pull request #431 from earney/pytest

  Show description for d3582b1
  bearney74

  authored
  d3582b1

• Merge pull request #2 from Zulko/master

  Show description for 360a407
  bearney74

  authored
  360a407

• Merge pull request #339 from drewm1980/master

  Show description for 66c061f
  bearney74

  authored
  66c061f

• Merge pull request #3 from Zulko/master

  Show description for cbbb276
  bearney74

  authored
  cbbb276

• Merge pull request #197 from temerick/patch-1

  Show description for 2e036d3
  bearney74

  authored
  2e036d3

• Merge pull request #211 from LunarLanding/patch-1

  Show description for e4d9032
  bearney74

  authored
  e4d9032

• Merge pull request #215 from bwagner/master

  Show description for ce38d41
  bearney74

  authored
  ce38d41

• fix Issue #385 , no DirectoryClip class (#434)

  Show description for fca1727
  bearney74

  authored
  fca1727

Commits on Feb 22, 2017

• fix issue 417, unicode has no attribute 'shape' error.

  bearney74

  committed
  3870506

• add test for issue 417

  bearney74

  committed
  3ec5106

• add test for issue 417

  bearney74

  committed
  3d877cb

• Fixed resize documentation issue #319 (#346)

  

  jmisacube

  authored and

  bearney74

  committed
  32b7007

• Merge pull request #4 from Zulko/master

  Show description for fe3474e
  bearney74

  authored
  fe3474e

• Handle bytes when listing fonts in VideoClip.py (#306)

  Show description for df31c03
  

  Zowie

  authored and

  bearney74

  committed
  df31c03

• Merge pull request #5 from Zulko/master

  Show description for c019484
  bearney74

  authored
  c019484

• add test for PR306

  bearney74

  committed
  f07e6a3

• add test for PR306 (#440)

  bearney74

  authored
  ba1dd25

• Merge pull request #6 from Zulko/master

  Show description for 319a52d
  bearney74

  authored
  319a52d

Commits on Feb 23, 2017

• create test file for pull requests (#433)

  bearney74

  authored
  372177a

• Test issue 407 (video has a valid fps after concatenate function) (#443)

  bearney74

  authored
  09d3572

• Merge pull request #7 from Zulko/master

  Show description for 674b1d7
  bearney74

  authored
  674b1d7

• Move PR test to test_PR.py file (#444)

  Show description for fd36a54
  bearney74

  authored
  fd36a54

• fix merge issue, add code to add python image for tests

  bearney74

  committed
  4446225

• Merge branch 'earney-issue417'

  bearney74

  committed
  8c41594

• add code to download python_logo.png

  bearney74

  committed
  9e6b9c8

• Merge branch 'master' into issue417

  bearney74

  authored
  ff44f23

• Merge branch 'master' into master

  bearney74

  authored
  b3dba11

Commits on Feb 24, 2017

• Merge pull request #438 from earney/issue417

  Show description for 83ed8a5
  bearney74

  authored
  83ed8a5

• remove duplicate test_issue_417 function

  bearney74

  authored
  b1016cb

Commits on Feb 26, 2017

• add testing with travis-ci (#447)

  Show description for ff82fe8
  bearney74

  authored
  ff82fe8

• put DEVNULL into compat.py (#432)

  bearney74

  authored
  ec57a19

• add travis-ci badge to readme file

  bearney74

  authored
  e8d124a

Commits on Feb 27, 2017

• pick highest fps when concatenating (#416)

  Show description for c0f6925
  

  BrianLee608

  authored and

  bearney74

  committed
  c0f6925

• add test for issue 416

  bearney74

  authored
  5eb43c9

• fix test_issue_416

  bearney74

  authored
  04bb711

• Merge branch 'master' into master

  

  Gloin1313

  authored
  b8bc801