Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2d4bade
resizes background image
henrykh Mar 10, 2015
60405aa
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
2fa6584
messing with tests.
constanthatz Mar 10, 2015
16cf40d
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 10, 2015
ccb989f
moves css to static directory
henrykh Mar 10, 2015
41071cb
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
a4dfcb8
remove old login.html.
constanthatz Mar 10, 2015
45ff1c4
add STATICFILES_DIRS to settings.
constanthatz Mar 10, 2015
23fd144
moves static folder into imager folder
henrykh Mar 10, 2015
fe9aea9
start to add grappelli and set STATIC_ROOT, TEMPLATE_CONTEXT_PROCESSORS
constanthatz Mar 10, 2015
292d80b
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 10, 2015
e6b0253
grappelli installed
constanthatz Mar 10, 2015
9fd06fc
add slash to TEMPLATE_DIRS.
constanthatz Mar 10, 2015
d02bd2a
remove deprecated imports in settings
constanthatz Mar 10, 2015
2b87cd9
fix if statement in home.html
constanthatz Mar 10, 2015
04fb9a1
fixes to home.html and views
henrykh Mar 10, 2015
65aa15a
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
b7192f3
cleans up imager/views
henrykh Mar 10, 2015
994d5b0
modify profile admin to account for new or edit profile and update gi…
constanthatz Mar 10, 2015
3b16404
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 10, 2015
0817a44
fix imports for thumbnail and admin field display for profile.
constanthatz Mar 10, 2015
4bd8631
add thumbnail methods to profile and photo models, update admin model…
constanthatz Mar 10, 2015
042f1cd
admin page thumbnail broken
constanthatz Mar 10, 2015
d49b78c
comment out thumbnail fields in photo and profile for testing.
constanthatz Mar 10, 2015
72c3d7a
comment out pdb
constanthatz Mar 10, 2015
2a13d1d
work on profile.html and css
henrykh Mar 10, 2015
71364f0
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
5e539a6
add cover thumbnail method to album model
constanthatz Mar 10, 2015
ca1548c
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 10, 2015
c7f50e8
adds normalize.css, routes for app urls
henrykh Mar 10, 2015
7167288
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
3803809
first draft library view, images urls, library template. comment pdb.
constanthatz Mar 10, 2015
39a3df4
moves profile.html
henrykh Mar 10, 2015
78c3549
fix merge
henrykh Mar 10, 2015
44029da
login redirect update
henrykh Mar 10, 2015
65346b8
second draft library view, images urls, library template
constanthatz Mar 10, 2015
d610b2d
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 10, 2015
0a8e66a
revert thumbnails to admin page. broken.
constanthatz Mar 10, 2015
8c8dc81
admin fix. broken
constanthatz Mar 10, 2015
91b8438
adds default profile image
henrykh Mar 10, 2015
b3241b9
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
4503ed7
admin fix. broken
constanthatz Mar 10, 2015
434e4b1
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 10, 2015
c86a543
add css for library
constanthatz Mar 10, 2015
9a46d7e
add link to library page
henrykh Mar 10, 2015
a5692f0
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 10, 2015
e8e0140
css for library grid
constanthatz Mar 10, 2015
247cfe9
initial work on stream view
henrykh Mar 11, 2015
c577a73
first draft lightbox
constanthatz Mar 11, 2015
bcdaf4d
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 11, 2015
5d827af
second draft lightbox
constanthatz Mar 11, 2015
ff9308e
working lightbox
constanthatz Mar 11, 2015
b81f915
working thumbnail for photo admin.
constanthatz Mar 11, 2015
e979ed1
adds stream view
henrykh Mar 11, 2015
ecd758e
working thumbnails for album cover and profile picture in admin.
constanthatz Mar 11, 2015
5b73035
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
constanthatz Mar 11, 2015
a72f3e0
css updates
henrykh Mar 11, 2015
58f695f
Merge branch 'front-end' of github.com:henrykh/django-imager into fro…
henrykh Mar 11, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,14 @@ coverage.xml

# Django stuff:
*.log
media/*

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Sublime
*.sublime-project
*.sublime-workspace
14 changes: 0 additions & 14 deletions imager/login.html

This file was deleted.

16 changes: 13 additions & 3 deletions imager/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
# Application definition

INSTALLED_APPS = (
'grappelli',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down Expand Up @@ -86,17 +87,25 @@

USE_TZ = True

# Request context processor
from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS
TEMPLATE_CONTEXT_PROCESSORS += ("django.core.context_processors.request",)

# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.7/howto/static-files/

STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, "static")
STATICFILES_DIRS = (
os.path.join(BASE_DIR, "imager/static/"),
)

MEDIA_URL = "/media/"
MEDIA_ROOT = os.path.join(BASE_DIR, "media")

TEMPLATE_DIRS = [
os.path.join(BASE_DIR, "imager/templates")
]
TEMPLATE_DIRS = (
os.path.join(BASE_DIR, "imager/templates/"),
)

# Email backend for development
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
Expand All @@ -106,3 +115,4 @@
REGISTRATION_AUTO_LOGIN = True
REGISTRATION_OPEN = True
LOGIN_URL = '/accounts/login/'
LOGIN_REDIRECT_URL = '/profile/'
Loading