summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Seth Woodworth [Wed, 23 Jan 2013 00:40:23 +0000 (19:40 -0500)]
integrating ajaxupload upto gdrive celery task executing
Seth Woodworth [Tue, 22 Jan 2013 22:54:43 +0000 (17:54 -0500)]
adding ipdb to dev reqs for better breakpont debugging
Seth Woodworth [Mon, 21 Jan 2013 20:19:26 +0000 (15:19 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 21 Jan 2013 20:07:43 +0000 (15:07 -0500)]
adding ajax_upload route to urls
Seth Woodworth [Mon, 21 Jan 2013 20:07:28 +0000 (15:07 -0500)]
customizing upload complete functionality in ajaxuploader for our project
Seth Woodworth [Mon, 21 Jan 2013 20:07:03 +0000 (15:07 -0500)]
adding some style to global for a universal upload button
Seth Woodworth [Mon, 21 Jan 2013 20:06:37 +0000 (15:06 -0500)]
adding lightboxen block to base.html template
Seth Woodworth [Mon, 21 Jan 2013 20:06:09 +0000 (15:06 -0500)]
adding upload lightbox template and adding include to the course_detail page
Seth Woodworth [Mon, 21 Jan 2013 06:47:40 +0000 (01:47 -0500)]
Update about page hero-text names
reverse names to match reversed image
Seth Woodworth [Sat, 19 Jan 2013 00:42:03 +0000 (19:42 -0500)]
remove heroku specific postgres and memcache configs
Seth Woodworth [Sat, 19 Jan 2013 00:30:13 +0000 (19:30 -0500)]
adding pylibmc to prod reqs
Seth Woodworth [Sat, 19 Jan 2013 00:26:37 +0000 (19:26 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Sat, 19 Jan 2013 00:26:27 +0000 (19:26 -0500)]
adding djano-kombu to dev requirements to avoid installing rabbitmq on development machines
Seth Woodworth [Sat, 19 Jan 2013 00:25:31 +0000 (19:25 -0500)]
I don't think we require gevent or newrelic in production at this time
Charles Holbrow [Fri, 18 Jan 2013 23:57:19 +0000 (18:57 -0500)]
adding regex to reimport javascript escaped strings when importing html
Seth Woodworth [Fri, 18 Jan 2013 23:16:33 +0000 (18:16 -0500)]
adding bootstrap-modal.js for displaying the upload modal
Charles Holbrow [Fri, 18 Jan 2013 22:28:50 +0000 (17:28 -0500)]
updated support for displaying a note in an iframe.
Charles Holbrow [Fri, 18 Jan 2013 22:25:08 +0000 (17:25 -0500)]
import json now skips duplicate notes
Charles Holbrow [Fri, 18 Jan 2013 19:08:25 +0000 (14:08 -0500)]
Adding scripts and json dumps to import previous db
Charles Holbrow [Fri, 18 Jan 2013 18:55:24 +0000 (13:55 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Fri, 18 Jan 2013 18:55:16 +0000 (13:55 -0500)]
adding ipython to dev reqs
Charles Holbrow [Fri, 18 Jan 2013 18:53:57 +0000 (13:53 -0500)]
adding missing import to notes.models
Seth Woodworth [Thu, 17 Jan 2013 20:10:59 +0000 (15:10 -0500)]
adding BSD license declaration for ajaxuploader app
Seth Woodworth [Thu, 17 Jan 2013 20:10:27 +0000 (15:10 -0500)]
importing celery tasks from djkarma
Seth Woodworth [Thu, 17 Jan 2013 20:09:44 +0000 (15:09 -0500)]
adding ajaxuploader to installed apps in settings/common.py
Seth Woodworth [Thu, 17 Jan 2013 20:09:21 +0000 (15:09 -0500)]
adding raw note iframe view, route and template
Seth Woodworth [Thu, 17 Jan 2013 20:08:38 +0000 (15:08 -0500)]
temp escaping variables for gdrive upload
Seth Woodworth [Thu, 17 Jan 2013 19:48:57 +0000 (14:48 -0500)]
adding imports for google drive
Seth Woodworth [Thu, 17 Jan 2013 18:39:31 +0000 (13:39 -0500)]
adding additional ajaxuploader import files
Seth Woodworth [Thu, 17 Jan 2013 18:38:52 +0000 (13:38 -0500)]
import gdrive.py and the ajaxuploader app
bobcall [Wed, 16 Jan 2013 12:46:16 +0000 (07:46 -0500)]
Added missing env.run to fabfile.py
Seth Woodworth [Tue, 15 Jan 2013 02:16:59 +0000 (21:16 -0500)]
modify models.Note.get_absolute_url to generate note urls
Seth Woodworth [Tue, 15 Jan 2013 02:08:41 +0000 (21:08 -0500)]
adding links from the course_list template to the course_detail page
Seth Woodworth [Tue, 15 Jan 2013 01:15:14 +0000 (20:15 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 15 Jan 2013 00:59:01 +0000 (19:59 -0500)]
importing much of Lucian's fabfile.py from django-startproject
Charles Holbrow [Mon, 14 Jan 2013 23:53:36 +0000 (18:53 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 14 Jan 2013 23:53:31 +0000 (18:53 -0500)]
Adding sorter arrows for course list. #37 Next: filtering
Seth Woodworth [Mon, 14 Jan 2013 23:47:34 +0000 (18:47 -0500)]
adding karmaworld/static to gitignore
Charles Holbrow [Mon, 14 Jan 2013 23:12:26 +0000 (18:12 -0500)]
adding tablesorter functionality #37
Charles Holbrow [Mon, 14 Jan 2013 21:55:29 +0000 (16:55 -0500)]
rename static folder to assets
Charles Holbrow [Mon, 14 Jan 2013 21:43:38 +0000 (16:43 -0500)]
Debug Toolbar will no longer interrupt our redirects
Charles Holbrow [Mon, 14 Jan 2013 21:16:41 +0000 (16:16 -0500)]
adding about page #18
Charles Holbrow [Mon, 14 Jan 2013 19:44:41 +0000 (14:44 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 14 Jan 2013 19:44:35 +0000 (14:44 -0500)]
Tags field now optional. fixes #30
Seth Woodworth [Mon, 14 Jan 2013 19:40:19 +0000 (11:40 -0800)]
Merge pull request #29 from LucianU/master
General adjustments to the project
Seth Woodworth [Mon, 14 Jan 2013 19:37:05 +0000 (14:37 -0500)]
set admins + admin emails and set America/New_York timezone (US/Eastern)
Seth Woodworth [Mon, 14 Jan 2013 19:36:34 +0000 (14:36 -0500)]
cleaning up shebang, copyright and file encoding for virtualenv
Lucian Ursu [Sat, 12 Jan 2013 10:59:48 +0000 (12:59 +0200)]
Using the production settings as the default in wsgi.py.
Lucian Ursu [Sat, 12 Jan 2013 10:30:22 +0000 (12:30 +0200)]
Removed the karmaworld/libs directory, because it's not currently used.
Lucian Ursu [Sat, 12 Jan 2013 10:28:49 +0000 (12:28 +0200)]
Moved wsgi.py inside the karmaworld package because that's where it belongs.
Lucian Ursu [Sat, 12 Jan 2013 10:27:35 +0000 (12:27 +0200)]
Deleted Procfile because it's heroku specific and requirements.txt because the requirements have their own directory.
Lucian Ursu [Sat, 12 Jan 2013 10:24:26 +0000 (12:24 +0200)]
Adding the 'apps' directory to python path in manage.py, to avoid import problems in development.
Seth Woodworth [Fri, 11 Jan 2013 23:12:01 +0000 (18:12 -0500)]
forking django-taggit to the FinalsClub repo
Seth Woodworth [Thu, 10 Jan 2013 21:08:17 +0000 (16:08 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 10 Jan 2013 21:07:52 +0000 (16:07 -0500)]
commenting out other unused html from note_detail
Seth Woodworth [Thu, 10 Jan 2013 21:00:55 +0000 (16:00 -0500)]
clean whitespace
bobcall [Thu, 10 Jan 2013 20:46:09 +0000 (15:46 -0500)]
added instructor_name / email to dj_to_world_json.py
Seth Woodworth [Thu, 10 Jan 2013 20:45:01 +0000 (15:45 -0500)]
conditional display of note.desc on note_detail page
Seth Woodworth [Thu, 10 Jan 2013 20:44:43 +0000 (15:44 -0500)]
add slug and get_absolute_url method for the Note model
Seth Woodworth [Thu, 10 Jan 2013 20:33:49 +0000 (15:33 -0500)]
adding first pass of note viewing page, iframe NotImplemented
Seth Woodworth [Thu, 10 Jan 2013 19:22:25 +0000 (14:22 -0500)]
adding first run of course_detail template that lists notes
Seth Woodworth [Thu, 10 Jan 2013 18:49:47 +0000 (13:49 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 10 Jan 2013 18:34:19 +0000 (13:34 -0500)]
route courses through /school_slug/course_slug/ instead of /course_slug
bobcall [Thu, 10 Jan 2013 17:24:35 +0000 (12:24 -0500)]
Fixed spelling error in bin/dj_to_world.py
bobcall [Wed, 9 Jan 2013 23:26:26 +0000 (18:26 -0500)]
Added dj_to_world_json.py to bin
Seth Woodworth [Wed, 9 Jan 2013 22:56:04 +0000 (17:56 -0500)]
got prefix-less slug matching working for course_detail
Seth Woodworth [Wed, 9 Jan 2013 22:51:15 +0000 (17:51 -0500)]
adding CourseDetailView, route and placeholder template for course_detail view (aka note list view)
Seth Woodworth [Wed, 9 Jan 2013 22:50:01 +0000 (17:50 -0500)]
css changes to go along with course_list / home
Seth Woodworth [Wed, 9 Jan 2013 22:49:45 +0000 (17:49 -0500)]
fixing up the course_list template to be shiney and compliant
Seth Woodworth [Wed, 9 Jan 2013 22:49:20 +0000 (17:49 -0500)]
commenting out the logged in header template
Seth Woodworth [Wed, 9 Jan 2013 22:48:52 +0000 (17:48 -0500)]
adding oauth2client requirement for the DriveAuth model
Seth Woodworth [Wed, 9 Jan 2013 22:47:58 +0000 (17:47 -0500)]
chmod +x fabfile.py
Seth Woodworth [Wed, 9 Jan 2013 21:53:38 +0000 (16:53 -0500)]
adding DriveAuth model to notes app, closes #10
Seth Woodworth [Tue, 8 Jan 2013 00:50:13 +0000 (19:50 -0500)]
adding docs about our external css and js imports
Seth Woodworth [Tue, 8 Jan 2013 00:47:56 +0000 (19:47 -0500)]
adding initial database config docs
Seth Woodworth [Mon, 7 Jan 2013 21:20:43 +0000 (16:20 -0500)]
adding static files, woo
Seth Woodworth [Mon, 7 Jan 2013 20:59:40 +0000 (15:59 -0500)]
adding layout documentation for sphinx
Seth Woodworth [Mon, 7 Jan 2013 20:47:41 +0000 (15:47 -0500)]
adding courses init py
Seth Woodworth [Mon, 7 Jan 2013 20:47:21 +0000 (15:47 -0500)]
importing simplified templates
Seth Woodworth [Mon, 7 Jan 2013 20:45:18 +0000 (15:45 -0500)]
adding course_list homepage url
Seth Woodworth [Mon, 7 Jan 2013 20:44:56 +0000 (15:44 -0500)]
adding Couse fkey to Note model
Seth Woodworth [Mon, 7 Jan 2013 20:44:39 +0000 (15:44 -0500)]
organizing course model and adding update_note_count func
Seth Woodworth [Fri, 4 Jan 2013 00:46:12 +0000 (19:46 -0500)]
fixing some note model save functionality
Seth Woodworth [Fri, 4 Jan 2013 00:45:54 +0000 (19:45 -0500)]
adding courses app, Course and School models
Seth Woodworth [Thu, 3 Jan 2013 00:19:05 +0000 (19:19 -0500)]
adding migrations and uploads to gitignore
Seth Woodworth [Thu, 3 Jan 2013 00:16:20 +0000 (19:16 -0500)]
adding notes app with Note model and adding taggit tagging manager
Seth Woodworth [Wed, 2 Jan 2013 20:40:58 +0000 (15:40 -0500)]
adding docs for configuring and sourcing a virtualenv
Seth Woodworth [Wed, 2 Jan 2013 18:57:20 +0000 (13:57 -0500)]
chmod +x manage.py
Seth Woodworth [Wed, 2 Jan 2013 18:55:16 +0000 (13:55 -0500)]
basing the django project on rdegges' django-skel
Seth Woodworth [Thu, 20 Dec 2012 20:07:07 +0000 (12:07 -0800)]
Initial commit