Skip to content
This repository has been archived by the owner on Jan 9, 2018. It is now read-only.

Consolidated the changes from many of the forks #1

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open

Consolidated the changes from many of the forks #1

wants to merge 66 commits into from

Commits on Oct 13, 2010

  1. Add OEmbedField.

    @DrMeers
    DrMeers committed Oct 13, 2010
    Configuration menu
    Copy the full SHA
    5e24c32 View commit details
    Browse the repository at this point in the history

  2. Add support for SoundCloud and official.fm

    @DrMeers
    DrMeers committed Oct 13, 2010
    Configuration menu
    Copy the full SHA
    b181765 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2010

  1. repair usage of filter without args

    @yedpodtrzitko
    yedpodtrzitko committed Nov 16, 2010
    Configuration menu
    Copy the full SHA
    fcbe4e2 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2011

  1. added method for fetching dict from provider without embedding

    Thomas Ashelford committed Feb 11, 2011
    Configuration menu
    Copy the full SHA
    e986823 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2011

  1. Merge branch 'master' of github.com:jezdez/django-oembed 

    Conflicts:
	oembed/fixtures/initial_data.json
    @DrMeers
    DrMeers committed Jun 10, 2011
    Configuration menu
    Copy the full SHA
    78911f3 View commit details
    Browse the repository at this point in the history

  2. Replace trailing \\S* components with whitelisted characters from RFC… 

    …3986.

 -- Avoid problems with <p>http://domain.com/path</p> eating the </p>, for example.
    @DrMeers
    DrMeers committed Jun 10, 2011
    Configuration menu
    Copy the full SHA
    a4f5cd4 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2011

  1. Apparently skipped a lot of trailing \\S patterns in previous commit. 

     -- Don't remember doing it on purpose...
    @DrMeers
    DrMeers committed Jul 3, 2011
    Configuration menu
    Copy the full SHA
    73d2501 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2011

  1. Merge remote-tracking branch 'tttallis/master' into HEAD

    @Aramgutang
    Aramgutang committed Aug 17, 2011
    Configuration menu
    Copy the full SHA
    34c48cd View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2011

  1. Cleaned-up the new fetch_dict helper function and optimised a few DB … 

    …queries.
    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    a5ce33d View commit details
    Browse the repository at this point in the history

  2. A bit of PEP-8-ification and removed unused views.py.

    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    4748922 View commit details
    Browse the repository at this point in the history

  3. Merged in fork by yedpodtrzitko, and resolved conflict in core.py.

    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    95240e3 View commit details
    Browse the repository at this point in the history

  4. No need to try simplejson first, then django.utils.simplejson, the la… 

    …tter will grab the best one available. Also, PEP-8-ified imports.
    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    febaef0 View commit details
    Browse the repository at this point in the history

  5. Increased the DRYness of building the oEmbed URL, and switched to usi… 

    …ng urlparse instead of risky string concatenation for the URL construction.
    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    2bac165 View commit details
    Browse the repository at this point in the history

  6. Better linebreaks in the comments.

    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    5ae922e View commit details
    Browse the repository at this point in the history

  7. Tweetphoto is no more. Removed from tests.

    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    fd2159b View commit details
    Browse the repository at this point in the history

  8. Added everyone whose changes I merged in to CONTRIBUTORS.

    @Aramgutang
    Aramgutang committed Aug 18, 2011
    Configuration menu
    Copy the full SHA
    ece8771 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2011

  1. Accept youtu.be URLs.

    @DrMeers
    DrMeers committed Aug 24, 2011
    Configuration menu
    Copy the full SHA
    b6244ab View commit details
    Browse the repository at this point in the history

  2. Store JSON in StoredOEmbed. *Now uses South*. And allows thumbnail_ur… 

    …l access.
    @DrMeers
    DrMeers committed Aug 24, 2011
    Configuration menu
    Copy the full SHA
    d0cadbc View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2011

  1. Python 2.5-compatible parse_qs import.

    @DrMeers
    DrMeers committed Aug 25, 2011
    Configuration menu
    Copy the full SHA
    ea8207c View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2012

  1. removed OohEmbed providers, as the service is now defunct

    @tttallis
    tttallis committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    e23bce5 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. On line 81 there's a settings.DEBUG without the corresponding import … 

    …at the top.
    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    abc75f5 View commit details
    Browse the repository at this point in the history

  2. Fixed vimeo regex

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    2014fc1 View commit details
    Browse the repository at this point in the history

  3. Needed for line 81

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    9362349 View commit details
    Browse the repository at this point in the history

  4. Access any property of a StoredOEmbed object in template

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    f005ed9 View commit details
    Browse the repository at this point in the history

  5. Basic cleaning

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    414efe5 View commit details
    Browse the repository at this point in the history

  6. Basic cleaning 2

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    295fa1e View commit details
    Browse the repository at this point in the history

  7. Default not video image

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    96911ae View commit details
    Browse the repository at this point in the history

  8. New blip.tv endpoint

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    e3353fd View commit details
    Browse the repository at this point in the history

  9. Better the way it was

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    1eb566f View commit details
    Browse the repository at this point in the history

  10. As noted by @Aramgutang, it should be from django.conf import settings

    Francisco Ceruti committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    61202fa View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2012

  1. Fixing ValueError: Invalid \escape: line 136 column 45 (char 4283)

    Francisco Ceruti committed Apr 2, 2012
    Configuration menu
    Copy the full SHA
    95131ad View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2012

  1. Update oembed/fixtures/initial_data.json

    Francisco Ceruti committed Apr 9, 2012
    Configuration menu
    Copy the full SHA
    5d47370 View commit details
    Browse the repository at this point in the history

  2. Update oembed/fixtures/initial_data.json

    Francisco Ceruti committed Apr 9, 2012
    Configuration menu
    Copy the full SHA
    597a2d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2012

  1. passed matched url to template

    EvoTech committed Jun 13, 2012
    Configuration menu
    Copy the full SHA
    fec30f3 View commit details
    Browse the repository at this point in the history

  2. new templates

    EvoTech committed Jun 13, 2012
    Configuration menu
    Copy the full SHA
    2d0c9f4 View commit details
    Browse the repository at this point in the history

  3. CSS class name fixed

    EvoTech committed Jun 13, 2012
    Configuration menu
    Copy the full SHA
    2ab70e5 View commit details
    Browse the repository at this point in the history

  4. urlunquote_plus

    EvoTech committed Jun 13, 2012
    Configuration menu
    Copy the full SHA
    3339794 View commit details
    Browse the repository at this point in the history

  5. compatible with Django 1.3

    EvoTech committed Jun 13, 2012
    Configuration menu
    Copy the full SHA
    802353d View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2012

  1. new argument template_dir='oembed' for oembed.core.replace(). Oembed … 

    …inline support (for non-block elements)
    EvoTech committed Jun 15, 2012
    Configuration menu
    Copy the full SHA
    c25a9e9 View commit details
    Browse the repository at this point in the history

  2. Decoding HTML Entities to Text for wikipedia

    EvoTech committed Jun 15, 2012
    Configuration menu
    Copy the full SHA
    84b2d21 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2012

  1. Merge commit '61202faab1de8f0eddcbe16e1d42fc7652772bf6' 

    Conflicts:
	oembed/templatetags/oembed_tags.py
    Greg Turner committed Jul 22, 2012
    Configuration menu
    Copy the full SHA
    2741c81 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2013

  1. Prevent deprecation warnings on Django 1.5 when marking the template … 

    …filter as safe.
    @Aramgutang
    Aramgutang committed Jan 31, 2013
    Configuration menu
    Copy the full SHA
    d25c169 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2013

  1. use timezone aware datetime when USE_TZ is True

    @wil
    wil committed Feb 19, 2013
    Configuration menu
    Copy the full SHA
    8874789 View commit details
    Browse the repository at this point in the history

  2. use Twitter-native OEmbed URL, recognise new Twitter URL formats 

    * allows /status/ (without "es") and https
    @wil
    wil committed Feb 19, 2013
    Configuration menu
    Copy the full SHA
    a52822a View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2013

  1. vimeo regex: allow channel videos 

    * vimeo video URLs can also look like http://vimeo.com/channels/<user>/<id>
    @wil
    wil committed Feb 20, 2013
    Configuration menu
    Copy the full SHA
    901c86f View commit details
    Browse the repository at this point in the history

  2. one slash too many

    @wil
    wil committed Feb 20, 2013
    Configuration menu
    Copy the full SHA
    436343d View commit details
    Browse the repository at this point in the history

Commits on May 21, 2013

  1. Update oembed filter registration to non-deprecated form.

    @DrMeers
    DrMeers committed May 21, 2013
    Configuration menu
    Copy the full SHA
    27f8a6d View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2013

  1. Merge branch 'master' of github.com:ixc/django-oembed 

    Conflicts:
	oembed/templatetags/oembed_tags.py
    @DrMeers
    DrMeers committed Aug 2, 2013
    Configuration menu
    Copy the full SHA
    5b8c667 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2013

  1. Update to allow https links as import for oembed link will export // … 

    …link
    Stuart Dines committed Nov 26, 2013
    Configuration menu
    Copy the full SHA
    1213437 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2013

  1. simplejson is deprecated

    @DrMeers
    DrMeers committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    c86adcc View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2013

  1. Added verbose names to fix admin formatting

    Stuart Dines committed Nov 29, 2013
    Configuration menu
    Copy the full SHA
    5bc4b44 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2013

  1. Merge branch 'master' of https://github.com/tttallis/django-oembed 

    Conflicts:
	oembed/fixtures/initial_data.json
    Greg Turner committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    c7f02c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/DrMeers/django-oembed

    Greg Turner committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    987f22e View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2014

  1. allow http(s)

    @DrMeers
    DrMeers committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    8bbcfe7 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2014

  1. Update endpoints to use HTTPS where possible. 

     -- There are probably more; see https://core.trac.wordpress.org/ticket/28507
    @DrMeers
    DrMeers committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    cd4ed97 View commit details
    Browse the repository at this point in the history

  2. support older Django versions without django.utils.timezone.now

    @DrMeers
    DrMeers committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    17edd18 View commit details
    Browse the repository at this point in the history

  3. colon!

    @DrMeers
    DrMeers committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    6a32a53 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2015

  1. Add .idea to .gitignore

    Andrey Fedoseev committed Apr 2, 2015
    Configuration menu
    Copy the full SHA
    7027ca8 View commit details
    Browse the repository at this point in the history

  2. Replace deprecated django.utils.simplejson with standard json lib

    Andrey Fedoseev committed Apr 2, 2015
    Configuration menu
    Copy the full SHA
    f235ca5 View commit details
    Browse the repository at this point in the history

  3. Add support for Django 1.7

    Andrey Fedoseev committed Apr 2, 2015
    Configuration menu
    Copy the full SHA
    698bf65 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. Add support for https URLs for all providers

    Andrey Fedoseev committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    fd67428 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2015

  1. Merge remote-tracking branch 'ISKME/master' 

     Conflicts:
	oembed/core.py
	oembed/fixtures/initial_data.json
	oembed/models.py
    @Aramgutang
    Aramgutang committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    39202b0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'drmeers/master' 

     Conflicts:
	oembed/fixtures/initial_data.json
	oembed/models.py
    @Aramgutang
    Aramgutang committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    d55d3d5 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. add missing migration

    Sam Minton committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    83b18ae View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. Django 1.11 updates. 

    No longer use vendored `simplejson` package. Use `json` from stdlib.
    @mrmachine
    mrmachine committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    6b78f97 View commit details
    Browse the repository at this point in the history

  2. Merge django-1-11 into master

    @mrmachine
    mrmachine committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    ef3c035 View commit details
    Browse the repository at this point in the history