Charles Holbrow [Fri, 1 Feb 2013 18:18:38 +0000 (18:18 +0000)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld into pylibmc
Charles Holbrow [Fri, 1 Feb 2013 18:13:56 +0000 (13:13 -0500)]
adding pylibmc to production requirements, removing unused imports from production settings #31
Charles Holbrow [Fri, 1 Feb 2013 18:00:08 +0000 (13:00 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Fri, 1 Feb 2013 18:00:00 +0000 (13:00 -0500)]
Configuring production settings for postgresql #67 and PyLibMemCache #31
Seth Woodworth [Fri, 1 Feb 2013 17:47:56 +0000 (12:47 -0500)]
adding an empty placeholder course_form.html to allow CourseSaveView to function
Seth Woodworth [Fri, 1 Feb 2013 17:37:33 +0000 (12:37 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Fri, 1 Feb 2013 17:37:16 +0000 (12:37 -0500)]
add CourseSaveView ModelFormMixin and ProcessFormView view class that saves course and redirects
Seth Woodworth [Fri, 1 Feb 2013 17:36:39 +0000 (12:36 -0500)]
add CourseSaveView route to urls
Seth Woodworth [Fri, 1 Feb 2013 17:36:04 +0000 (12:36 -0500)]
modify add course lightbox styling and autocomplete js
Seth Woodworth [Fri, 1 Feb 2013 17:35:14 +0000 (12:35 -0500)]
modify Course.save to append the model id to the slug
Charles Holbrow [Fri, 1 Feb 2013 17:31:32 +0000 (12:31 -0500)]
removing slash after all instances of {{ STATIC_URL }} template tag #66
Charles Holbrow [Fri, 1 Feb 2013 16:50:38 +0000 (11:50 -0500)]
replacing /static with {{ STATIC_URL }} template tag
Charles Holbrow [Fri, 1 Feb 2013 01:05:22 +0000 (20:05 -0500)]
testing PyLibMCCache as caching backend
Charles Holbrow [Thu, 31 Jan 2013 23:38:48 +0000 (18:38 -0500)]
Course Detail style tweaks #55
Charles Holbrow [Thu, 31 Jan 2013 23:35:19 +0000 (18:35 -0500)]
adding clarification to gdrive docs
Charles Holbrow [Thu, 31 Jan 2013 22:44:09 +0000 (17:44 -0500)]
adding documentation for dbimport
Charles Holbrow [Thu, 31 Jan 2013 05:00:54 +0000 (00:00 -0500)]
fix error with file importing
Charles Holbrow [Wed, 30 Jan 2013 22:13:24 +0000 (17:13 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 30 Jan 2013 22:11:46 +0000 (17:11 -0500)]
adding script in import db from json
Charles Holbrow [Wed, 30 Jan 2013 19:05:11 +0000 (14:05 -0500)]
adding hidden OS X file to .gitignore
Charles Holbrow [Wed, 30 Jan 2013 02:17:03 +0000 (21:17 -0500)]
adding manage command to dump json
Charles Holbrow [Wed, 30 Jan 2013 01:28:01 +0000 (20:28 -0500)]
adding import script for usde schools (req. schemamigration)
Seth Woodworth [Wed, 30 Jan 2013 00:39:51 +0000 (19:39 -0500)]
fixing school autocomplete for add course box
Seth Woodworth [Tue, 29 Jan 2013 23:32:23 +0000 (18:32 -0500)]
update link to new github repo
Seth Woodworth [Tue, 29 Jan 2013 22:18:26 +0000 (17:18 -0500)]
removing old unused imports
Seth Woodworth [Tue, 29 Jan 2013 21:47:39 +0000 (16:47 -0500)]
adding django-grapelli, and adding a fkey lookup from Course to School model
Seth Woodworth [Tue, 29 Jan 2013 19:33:21 +0000 (14:33 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Sat, 26 Jan 2013 01:42:58 +0000 (20:42 -0500)]
chmod jquery.tablesorter.min.js to 644
Charles Holbrow [Sat, 26 Jan 2013 01:32:21 +0000 (20:32 -0500)]
adding some missing js scripts for querying
Charles Holbrow [Sat, 26 Jan 2013 01:12:01 +0000 (20:12 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Conflicts:
karmaworld/templates/courses/course_list.html
Charles Holbrow [Sat, 26 Jan 2013 01:10:58 +0000 (20:10 -0500)]
adding basit filtering functionality
Seth Woodworth [Sat, 26 Jan 2013 00:44:32 +0000 (19:44 -0500)]
adding basic version of jquery school autocomplete
Seth Woodworth [Sat, 26 Jan 2013 00:23:58 +0000 (19:23 -0500)]
adding initial create course lightbox, loads on click
Seth Woodworth [Sat, 26 Jan 2013 00:23:00 +0000 (19:23 -0500)]
adding untested json endpoint for searching schools
Seth Woodworth [Fri, 25 Jan 2013 22:05:36 +0000 (17:05 -0500)]
removing about page image caption until we can get better style for it
Seth Woodworth [Fri, 25 Jan 2013 21:52:43 +0000 (16:52 -0500)]
re-add school leader board by writing an AboutView TemplateView
Seth Woodworth [Fri, 25 Jan 2013 21:51:59 +0000 (16:51 -0500)]
set default sort order for schools (file_count descending)
Seth Woodworth [Fri, 25 Jan 2013 00:54:57 +0000 (19:54 -0500)]
adding file_count to School model and functions to update it
Seth Woodworth [Thu, 24 Jan 2013 22:27:49 +0000 (17:27 -0500)]
adding terms template and urlroute, updated footer to use url pattern, fixes #57
Seth Woodworth [Thu, 24 Jan 2013 19:32:02 +0000 (14:32 -0500)]
adding lightbox show and lightbox dismiss javascript to course_detail
Seth Woodworth [Thu, 24 Jan 2013 00:11:29 +0000 (19:11 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 24 Jan 2013 00:11:06 +0000 (19:11 -0500)]
adding docstrings to notes.views
Seth Woodworth [Thu, 24 Jan 2013 00:10:53 +0000 (19:10 -0500)]
removing additional context for adding NoteForm to course_detail template, not needed
Seth Woodworth [Thu, 24 Jan 2013 00:08:13 +0000 (19:08 -0500)]
refactor note views for Note object to handle get and post http methods to save note filemeta form
Seth Woodworth [Thu, 24 Jan 2013 00:07:00 +0000 (19:07 -0500)]
updating course_detail template's javascript
Seth Woodworth [Wed, 23 Jan 2013 23:44:41 +0000 (18:44 -0500)]
reformat and cleanup upload lightbox template
Seth Woodworth [Wed, 23 Jan 2013 23:44:04 +0000 (18:44 -0500)]
modify the returned note_url from file upload to decide where to post filemeta form
Charles Holbrow [Wed, 23 Jan 2013 23:29:01 +0000 (18:29 -0500)]
import_json cleans data more effectivley
Charles Holbrow [Wed, 23 Jan 2013 21:11:34 +0000 (16:11 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 23 Jan 2013 21:11:22 +0000 (16:11 -0500)]
tweaking json db import script
Seth Woodworth [Wed, 23 Jan 2013 21:09:47 +0000 (16:09 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 23 Jan 2013 20:16:09 +0000 (15:16 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 23 Jan 2013 20:15:13 +0000 (15:15 -0500)]
Updating import script to handle \\\r case (import escaped javascript string)
bobcall [Wed, 23 Jan 2013 17:36:33 +0000 (12:36 -0500)]
Changed code url in karmaworld/templates/footer.html from: djkarma -> karmaworld
Seth Woodworth [Wed, 23 Jan 2013 08:52:11 +0000 (03:52 -0500)]
adding ModelForm for
Seth Woodworth [Wed, 23 Jan 2013 08:22:36 +0000 (03:22 -0500)]
removing old html from upload form, add new global styles
Seth Woodworth [Wed, 23 Jan 2013 08:21:44 +0000 (03:21 -0500)]
attempt conditional import of GOOGLE_USER for notes.models
Seth Woodworth [Wed, 23 Jan 2013 08:21:01 +0000 (03:21 -0500)]
adding header info to urls
Seth Woodworth [Wed, 23 Jan 2013 06:06:48 +0000 (01:06 -0500)]
document Note.get_absolute_url
Seth Woodworth [Wed, 23 Jan 2013 05:39:51 +0000 (00:39 -0500)]
cleanup gdrive, remove dead code path (is_pdf) and refactor variable names
Seth Woodworth [Wed, 23 Jan 2013 05:37:20 +0000 (00:37 -0500)]
fixing note url generation when there is no slug set
Seth Woodworth [Wed, 23 Jan 2013 04:46:41 +0000 (23:46 -0500)]
customizing the gdrive module to use the new Note schema, gdrive upload works
Seth Woodworth [Wed, 23 Jan 2013 04:33:37 +0000 (23:33 -0500)]
commenting out user specific upload functions
Seth Woodworth [Wed, 23 Jan 2013 03:51:13 +0000 (22:51 -0500)]
fixing the documentation formatting for google drive exchange code url format
Seth Woodworth [Wed, 23 Jan 2013 03:44:35 +0000 (22:44 -0500)]
customize google drive auth module for new security layout
Seth Woodworth [Wed, 23 Jan 2013 03:43:53 +0000 (22:43 -0500)]
adding documentation on authenticating a karmaworld instance against google drive
Seth Woodworth [Wed, 23 Jan 2013 03:03:13 +0000 (22:03 -0500)]
adding secrets directory to karmaworld with init file, but nothing checked in here in the future
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