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

Conversation

ixc
Copy link

@ixc ixc commented Aug 23, 2011

Brief changelog:

  • OEmbedField added (validates that the URL is a handle-able oEmbed URL).
  • fetch_dict() helper function (for when you need the full oEmbed response).
  • Use of templatetag without arguments fixed.
  • URL matching regexes fixed to prevent matching surrounding HTML tags.
  • Quite a bit of code clean-up, DRYing, and PEP-8-ification.

DrMeers and others added 16 commits October 14, 2010 10:39
@DrMeers
Add OEmbedField.
5e24c32
@DrMeers
Add support for SoundCloud and official.fm
b181765
@yedpodtrzitko
repair usage of filter without args
fcbe4e2
added method for fetching dict from provider without embedding
e986823
@DrMeers
Merge branch 'master' of github.com:jezdez/django-oembed
78911f3 
Conflicts:
	oembed/fixtures/initial_data.json
@DrMeers
Replace trailing \\S* components with whitelisted characters from RFC…
a4f5cd4 
…3986.

 -- Avoid problems with <p>http://domain.com/path</p> eating the </p>, for example.
@DrMeers
Apparently skipped a lot of trailing \\S patterns in previous commit.
73d2501 
 -- Don't remember doing it on purpose...
@Aramgutang
Merge remote-tracking branch 'tttallis/master' into HEAD
34c48cd
@Aramgutang
Cleaned-up the new fetch_dict helper function and optimised a few DB …
a5ce33d 
…queries.
@Aramgutang
A bit of PEP-8-ification and removed unused views.py.
4748922
@Aramgutang
Merged in fork by yedpodtrzitko, and resolved conflict in core.py.
95240e3
@Aramgutang
No need to try simplejson first, then django.utils.simplejson, the la…
febaef0 
…tter will grab the best one available. Also, PEP-8-ified imports.
@Aramgutang
Increased the DRYness of building the oEmbed URL, and switched to usi…
2bac165 
…ng urlparse instead of risky string concatenation for the URL construction.
@Aramgutang
Better linebreaks in the comments.
5ae922e
@Aramgutang
Tweetphoto is no more. Removed from tests.
fd2159b
@Aramgutang
Added everyone whose changes I merged in to CONTRIBUTORS.
ece8771
@jezdez
Copy link
Owner

jezdez commented Aug 23, 2011

Looks pretty good but needs documentation updates.

@ixc
Copy link
Author

ixc commented Aug 24, 2011

OK, I'll try to find the time to add some documentation next week.

EvoTech and others added 30 commits June 14, 2012 01:46
urlunquote_plus
3339794
compatible with Django 1.3
802353d
new argument template_dir='oembed' for oembed.core.replace(). Oembed …
c25a9e9 
…inline support (for non-block elements)
Decoding HTML Entities to Text for wikipedia
84b2d21
Merge commit '61202faab1de8f0eddcbe16e1d42fc7652772bf6'
2741c81 
Conflicts:
	oembed/templatetags/oembed_tags.py
@Aramgutang
Prevent deprecation warnings on Django 1.5 when marking the template …
d25c169 
…filter as safe.
@wil
use timezone aware datetime when USE_TZ is True
8874789
@wil
use Twitter-native OEmbed URL, recognise new Twitter URL formats
a52822a 
* allows /status/ (without "es") and https
@wil
vimeo regex: allow channel videos
901c86f 
* vimeo video URLs can also look like http://vimeo.com/channels/<user>/<id>
@wil
one slash too many
436343d
@DrMeers
Update oembed filter registration to non-deprecated form.
27f8a6d
@DrMeers
Merge branch 'master' of github.com:ixc/django-oembed
5b8c667 
Conflicts:
	oembed/templatetags/oembed_tags.py
Update to allow https links as import for oembed link will export // …
1213437 
…link
@DrMeers
simplejson is deprecated
c86adcc
Added verbose names to fix admin formatting
5bc4b44
Merge branch 'master' of https://github.com/tttallis/django-oembed
c7f02c3 
Conflicts:
	oembed/fixtures/initial_data.json
Merge branch 'master' of https://github.com/DrMeers/django-oembed
987f22e
@DrMeers
allow http(s)
8bbcfe7
@DrMeers
Update endpoints to use HTTPS where possible.
cd4ed97 
 -- There are probably more; see https://core.trac.wordpress.org/ticket/28507
@DrMeers
support older Django versions without django.utils.timezone.now
17edd18
@DrMeers
colon!
6a32a53
Add .idea to .gitignore
7027ca8
Replace deprecated django.utils.simplejson with standard json lib
f235ca5
Add support for Django 1.7
698bf65
Add support for https URLs for all providers
fd67428
@Aramgutang
Merge remote-tracking branch 'ISKME/master'
39202b0 
 Conflicts:
	oembed/core.py
	oembed/fixtures/initial_data.json
	oembed/models.py
@Aramgutang
Merge remote-tracking branch 'drmeers/master'
d55d3d5 
 Conflicts:
	oembed/fixtures/initial_data.json
	oembed/models.py
add missing migration
83b18ae
@mrmachine
Django 1.11 updates.
6b78f97 
No longer use vendored `simplejson` package. Use `json` from stdlib.
@mrmachine
Merge django-1-11 into master
ef3c035
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@ixc @jezdez @DrMeers @yedpodtrzitko @Aramgutang @tttallis @wil @mrmachine