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

Simpler custom configuration and better related docs #1109

Merged
merged 26 commits into from
Apr 27, 2020
Merged

Simpler custom configuration and better related docs #1109

merged 26 commits into from
Apr 27, 2020

Commits on Mar 25, 2020

  1. simpler custom configuration. updated docs

    @mgaitan
    mgaitan committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    e6bc906 View commit details
    Browse the repository at this point in the history

  2. correct dependency name

    @mgaitan
    mgaitan committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    eedf7db View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge branch 'master' into 793_custom_configs

    @mgaitan
    mgaitan committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    555af19 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:mgaitan/moviepy into 793_custom_c… 

    …onfigs
    @mgaitan
    mgaitan committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    da9a8ea View commit details
    Browse the repository at this point in the history

  3. dont mention me twice

    @mgaitan
    mgaitan committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    25633c4 View commit details
    Browse the repository at this point in the history

  4. Merge branch '793_custom_configs' of github.com:mgaitan/moviepy into … 

    …793_custom_configs
    @mgaitan
    mgaitan committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    9a07707 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Merge branch 'master' into 793_custom_configs

    @mgaitan
    mgaitan committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    9aaf443 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. Correct English 

    Add changelog entry
Fix some string formatting errors
    @tburrows13
    tburrows13 committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    1621bcf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 793_custom_configs

    @tburrows13
    tburrows13 committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    b7ccb1b View commit details
    Browse the repository at this point in the history

  3. Add back an erroneously removed f-string

    @tburrows13
    tburrows13 committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    a60b438 View commit details
    Browse the repository at this point in the history

  4. Add change as an announcement in changelog

    @tburrows13
    tburrows13 committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    9d0c342 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. Merge branch 'master' into 793_custom_configs

    @tburrows13
    tburrows13 committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    1b8afc1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. restore ubuntu message. wording and fix

    @mgaitan
    mgaitan committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    3af36d4 View commit details
    Browse the repository at this point in the history

  2. Merge branch '793_custom_configs' of github.com:mgaitan/moviepy into … 

    …793_custom_configs
    @mgaitan
    mgaitan committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    72406d7 View commit details
    Browse the repository at this point in the history

  3. check tip

    @mgaitan
    mgaitan committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    63d93a3 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'zulko/master' into 793_custom_configs

    @mgaitan
    mgaitan committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    48cedb8 View commit details
    Browse the repository at this point in the history

  5. clarify dotenv example

    @mgaitan
    mgaitan committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    e0bcfa3 View commit details
    Browse the repository at this point in the history

  6. black

    @mgaitan
    mgaitan committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    5739898 View commit details
    Browse the repository at this point in the history

  7. Clean up and improve install.rst

    @tburrows13
    tburrows13 committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    908f26b View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Merge branch 'master' into 793_custom_configs

    @tburrows13
    tburrows13 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d8141bb View commit details
    Browse the repository at this point in the history

  2. Apply Black

    @tburrows13
    tburrows13 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    a4f464e View commit details
    Browse the repository at this point in the history

  3. Apply Black (2)

    @tburrows13
    tburrows13 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    3be30dd View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. Merge branch 'master' into 793_custom_configs 

    # Conflicts:
#	CHANGELOG.md
#	docs/install.rst
#	moviepy/config_defaults.py
#	moviepy/video/io/ffmpeg_tools.py
    @tburrows13
    tburrows13 committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    70bfa77 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Fix merge

    @tburrows13
    tburrows13 committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    327237b View commit details
    Browse the repository at this point in the history

  2. Update install.rst

    @tburrows13
    tburrows13 committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    e5ff599 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @tburrows13
    tburrows13 committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    3d313ab View commit details
    Browse the repository at this point in the history