| .. |
|
migrations
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
scripts
|
119e167d47
Merged in mk200789/django-hackathon-starter (pull request #27)
|
il y a 11 ans |
|
static
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
templates
|
e756fc30ac
instagram.py: created function get_user_media() that handles getting recent media from user
|
il y a 11 ans |
|
unittests
|
66de6d9aae
Merging Marco's pull request
|
il y a 11 ans |
|
__init__.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
admin.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
forms.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
models.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
serializers.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
tests.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
il y a 11 ans |
|
urls.py
|
2bf6595074
json response for instagram user's media
|
il y a 11 ans |
|
views.py
|
aff14c69fc
ionic: modify instagramUser template to display instagram user's images, controller, and factory
|
il y a 11 ans |
David Leonard
119e167d47
Merged in mk200789/django-hackathon-starter (pull request #27)