Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kronoscode/django-magicembed
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: DME-3
Choose a base ref
...
head repository: kronoscode/django-magicembed
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 16 files changed
  • 5 contributors

Commits on Aug 5, 2015

  1. DME-3 building a better python package

    @oscarmcm
    oscarmcm committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    68bbfd0 View commit details
    Browse the repository at this point in the history

  2. DME-3 fix code blocks in README.md file

    @oscarmcm
    oscarmcm committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    9c5b675 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:kronoscode/django-magicembed

    @fitoria
    fitoria committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    7089989 View commit details
    Browse the repository at this point in the history

  4. fixed issue on youtube

    @fitoria
    fitoria committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    6858acd View commit details
    Browse the repository at this point in the history

  5. bumping version

    @fitoria
    fitoria committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    ea75755 View commit details
    Browse the repository at this point in the history

  6. better exceptions, remove unused packages

    @oscarmcm
    oscarmcm committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    79e1333 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8 from oscarmcm/master 

    better exceptions, remove unused packages
    @fitoria
    fitoria committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    d361ac5 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2015

  1. Fix error with vimeo iframe

    @oscarmcm
    oscarmcm committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    3574153 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from oscarmcm/DME-4 

    Fix error with vimeo iframe
    @fitoria
    fitoria committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    aef6a95 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2015

  1. Improvements to the test suite. 

    - Added mocks for the Vimeo and Embedly API calls.
- Removed extra argument from the return value of the `render_html`
  method for the `Vimeo` provider.
    @josernestodavila Dávila Pantoja, José Ernesto
    josernestodavila authored and Dávila Pantoja, José Ernesto committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    a8e2576 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. Merge pull request #11 from josernestodavila/tests-improvements 

    Improvements to the test suite.
    @fitoria
    fitoria committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    56d2198 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2015

  1. Added simple tests for the Magicembed Template Tags. 

    - Added the `TemplateTagsTest` class to test the rendering of the
  Magicembed template tags.
- Added myself to `AUTHORS` file.
    José Ernesto Dávila Pantoja
    José Ernesto Dávila Pantoja committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    3cd841f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from josernestodavila/templatetags_tests 

    Added simple tests for the Magicembed Template Tags.
    @fitoria
    fitoria committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    3c488e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2015

  1. Test Exceptions Raised. 

    - Use the `django.test.TestCase` class instead of `unittest.TestCase` to be
  able to override the settings for some tests.
- Catch the `IOError` exception instead of the `ImproperlyConfigured`
  exception when the EMBEDBLY_API is None.
    Dávila Pantoja, José Ernesto
    Dávila Pantoja, José Ernesto committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    984c2d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. Merge pull request #13 from josernestodavila/test_exceptions_raised 

    Test Exceptions Raised.
    @fitoria
    fitoria committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    62e432c View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. docs: Fix simple typo, ussage -> usage 

    There is a small typo in magicembed/templatetags/magicembed_tags.py.

Should read `usage` rather than `ussage`.
    @timgates42
    timgates42 committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    c707242 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Merge pull request #15 from timgates42/bugfix_typo_usage 

    docs: Fix simple typo, ussage -> usage
    @fitoria
    fitoria authored Mar 26, 2020
    Configuration menu
    Copy the full SHA
    865be0a View commit details
    Browse the repository at this point in the history
Loading