oweals/karmaworld.git
11 years agomodify Course.save to append the model id to the slug
Seth Woodworth [Fri, 1 Feb 2013 17:35:14 +0000 (12:35 -0500)]
modify Course.save to append the model id to the slug

11 years agofixing school autocomplete for add course box
Seth Woodworth [Wed, 30 Jan 2013 00:39:51 +0000 (19:39 -0500)]
fixing school autocomplete for add course box

11 years agoupdate link to new github repo
Seth Woodworth [Tue, 29 Jan 2013 23:32:23 +0000 (18:32 -0500)]
update link to new github repo

11 years agoremoving old unused imports
Seth Woodworth [Tue, 29 Jan 2013 22:18:26 +0000 (17:18 -0500)]
removing old unused imports

11 years agoadding django-grapelli, and adding a fkey lookup from Course to School model
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

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 29 Jan 2013 19:33:21 +0000 (14:33 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agochmod jquery.tablesorter.min.js to 644
Seth Woodworth [Sat, 26 Jan 2013 01:42:58 +0000 (20:42 -0500)]
chmod jquery.tablesorter.min.js to 644

11 years agoadding some missing js scripts for querying
Charles Holbrow [Sat, 26 Jan 2013 01:32:21 +0000 (20:32 -0500)]
adding some missing js scripts for querying

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
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

11 years agoadding basit filtering functionality
Charles Holbrow [Sat, 26 Jan 2013 01:10:58 +0000 (20:10 -0500)]
adding basit filtering functionality

11 years agoadding basic version of jquery school autocomplete
Seth Woodworth [Sat, 26 Jan 2013 00:44:32 +0000 (19:44 -0500)]
adding basic version of jquery school autocomplete

11 years agoadding initial create course lightbox, loads on click
Seth Woodworth [Sat, 26 Jan 2013 00:23:58 +0000 (19:23 -0500)]
adding initial create course lightbox, loads on click

11 years agoadding untested json endpoint for searching schools
Seth Woodworth [Sat, 26 Jan 2013 00:23:00 +0000 (19:23 -0500)]
adding untested json endpoint for searching schools

11 years agoremoving about page image caption until we can get better style for it
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

11 years agore-add school leader board by writing an AboutView TemplateView
Seth Woodworth [Fri, 25 Jan 2013 21:52:43 +0000 (16:52 -0500)]
re-add school leader board by writing an AboutView TemplateView

11 years agoset default sort order for schools (file_count descending)
Seth Woodworth [Fri, 25 Jan 2013 21:51:59 +0000 (16:51 -0500)]
set default sort order for schools (file_count descending)

11 years agoadding file_count to School model and functions to update it
Seth Woodworth [Fri, 25 Jan 2013 00:54:57 +0000 (19:54 -0500)]
adding file_count to School model and functions to update it

11 years agoadding terms template and urlroute, updated footer to use url pattern, fixes #57
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

11 years agoadding lightbox show and lightbox dismiss javascript to course_detail
Seth Woodworth [Thu, 24 Jan 2013 19:32:02 +0000 (14:32 -0500)]
adding lightbox show and lightbox dismiss javascript to course_detail

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 24 Jan 2013 00:11:29 +0000 (19:11 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding docstrings to notes.views
Seth Woodworth [Thu, 24 Jan 2013 00:11:06 +0000 (19:11 -0500)]
adding docstrings to notes.views

11 years agoremoving additional context for adding NoteForm to course_detail template, not needed
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

11 years agorefactor note views for Note object to handle get and post http methods to save note...
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

11 years agoupdating course_detail template's javascript
Seth Woodworth [Thu, 24 Jan 2013 00:07:00 +0000 (19:07 -0500)]
updating course_detail template's javascript

11 years agoreformat and cleanup upload lightbox template
Seth Woodworth [Wed, 23 Jan 2013 23:44:41 +0000 (18:44 -0500)]
reformat and cleanup upload lightbox template

11 years agomodify the returned note_url from file upload to decide where to post filemeta form
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

11 years agoimport_json cleans data more effectivley
Charles Holbrow [Wed, 23 Jan 2013 23:29:01 +0000 (18:29 -0500)]
import_json cleans data more effectivley

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 23 Jan 2013 21:11:34 +0000 (16:11 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agotweaking json db import script
Charles Holbrow [Wed, 23 Jan 2013 21:11:22 +0000 (16:11 -0500)]
tweaking json db import script

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 23 Jan 2013 21:09:47 +0000 (16:09 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoMerge 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

11 years agoUpdating import script to handle \\\r case (import escaped javascript string)
Charles Holbrow [Wed, 23 Jan 2013 20:15:13 +0000 (15:15 -0500)]
Updating import script to handle \\\r case (import escaped javascript string)

11 years agoChanged code url in karmaworld/templates/footer.html from: djkarma -> karmaworld
bobcall [Wed, 23 Jan 2013 17:36:33 +0000 (12:36 -0500)]
Changed code url in karmaworld/templates/footer.html from: djkarma -> karmaworld

11 years agoadding ModelForm for
Seth Woodworth [Wed, 23 Jan 2013 08:52:11 +0000 (03:52 -0500)]
adding ModelForm for

11 years agoremoving old html from upload form, add new global styles
Seth Woodworth [Wed, 23 Jan 2013 08:22:36 +0000 (03:22 -0500)]
removing old html from upload form, add new global styles

11 years agoattempt conditional import of GOOGLE_USER for notes.models
Seth Woodworth [Wed, 23 Jan 2013 08:21:44 +0000 (03:21 -0500)]
attempt conditional import of GOOGLE_USER for notes.models

11 years agoadding header info to urls
Seth Woodworth [Wed, 23 Jan 2013 08:21:01 +0000 (03:21 -0500)]
adding header info to urls

11 years agodocument Note.get_absolute_url
Seth Woodworth [Wed, 23 Jan 2013 06:06:48 +0000 (01:06 -0500)]
document Note.get_absolute_url

11 years agocleanup gdrive, remove dead code path (is_pdf) and refactor variable names
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

11 years agofixing note url generation when there is no slug set
Seth Woodworth [Wed, 23 Jan 2013 05:37:20 +0000 (00:37 -0500)]
fixing note url generation when there is no slug set

11 years agocustomizing the gdrive module to use the new Note schema, gdrive upload works
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

11 years agocommenting out user specific upload functions
Seth Woodworth [Wed, 23 Jan 2013 04:33:37 +0000 (23:33 -0500)]
commenting out user specific upload functions

11 years agofixing the documentation formatting for google drive exchange code url format
Seth Woodworth [Wed, 23 Jan 2013 03:51:13 +0000 (22:51 -0500)]
fixing the documentation formatting for google drive exchange code url format

11 years agocustomize google drive auth module for new security layout
Seth Woodworth [Wed, 23 Jan 2013 03:44:35 +0000 (22:44 -0500)]
customize google drive auth module for new security layout

11 years agoadding documentation on authenticating a karmaworld instance against google drive
Seth Woodworth [Wed, 23 Jan 2013 03:43:53 +0000 (22:43 -0500)]
adding documentation on authenticating a karmaworld instance against google drive

11 years agoadding secrets directory to karmaworld with init file, but nothing checked in here...
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

11 years agointegrating ajaxupload upto gdrive celery task executing
Seth Woodworth [Wed, 23 Jan 2013 00:40:23 +0000 (19:40 -0500)]
integrating ajaxupload upto gdrive celery task executing

11 years agoadding ipdb to dev reqs for better breakpont debugging
Seth Woodworth [Tue, 22 Jan 2013 22:54:43 +0000 (17:54 -0500)]
adding ipdb to dev reqs for better breakpont debugging

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 21 Jan 2013 20:19:26 +0000 (15:19 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding ajax_upload route to urls
Seth Woodworth [Mon, 21 Jan 2013 20:07:43 +0000 (15:07 -0500)]
adding ajax_upload route to urls

11 years agocustomizing upload complete functionality in ajaxuploader for our project
Seth Woodworth [Mon, 21 Jan 2013 20:07:28 +0000 (15:07 -0500)]
customizing upload complete functionality in ajaxuploader for our project

11 years agoadding some style to global for a universal upload button
Seth Woodworth [Mon, 21 Jan 2013 20:07:03 +0000 (15:07 -0500)]
adding some style to global for a universal upload button

11 years agoadding lightboxen block to base.html template
Seth Woodworth [Mon, 21 Jan 2013 20:06:37 +0000 (15:06 -0500)]
adding lightboxen block to base.html template

11 years agoadding upload lightbox template and adding include to the course_detail page
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

11 years agoUpdate about page hero-text names
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

11 years agoremove heroku specific postgres and memcache configs
Seth Woodworth [Sat, 19 Jan 2013 00:42:03 +0000 (19:42 -0500)]
remove heroku specific postgres and memcache configs

11 years agoadding pylibmc to prod reqs
Seth Woodworth [Sat, 19 Jan 2013 00:30:13 +0000 (19:30 -0500)]
adding pylibmc to prod reqs

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Sat, 19 Jan 2013 00:26:37 +0000 (19:26 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding djano-kombu to dev requirements to avoid installing rabbitmq on development...
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

11 years agoI don't think we require gevent or newrelic in production at this time
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

11 years agoadding regex to reimport javascript escaped strings when importing html
Charles Holbrow [Fri, 18 Jan 2013 23:57:19 +0000 (18:57 -0500)]
adding regex to reimport javascript escaped strings when importing html

11 years agoadding bootstrap-modal.js for displaying the upload modal
Seth Woodworth [Fri, 18 Jan 2013 23:16:33 +0000 (18:16 -0500)]
adding bootstrap-modal.js for displaying the upload modal

11 years agoupdated support for displaying a note in an iframe.
Charles Holbrow [Fri, 18 Jan 2013 22:28:50 +0000 (17:28 -0500)]
updated support for displaying a note in an iframe.

11 years agoimport json now skips duplicate notes
Charles Holbrow [Fri, 18 Jan 2013 22:25:08 +0000 (17:25 -0500)]
import json now skips duplicate notes

11 years agoAdding scripts and json dumps to import previous db
Charles Holbrow [Fri, 18 Jan 2013 19:08:25 +0000 (14:08 -0500)]
Adding scripts and json dumps to import previous db

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Fri, 18 Jan 2013 18:55:24 +0000 (13:55 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding ipython to dev reqs
Charles Holbrow [Fri, 18 Jan 2013 18:55:16 +0000 (13:55 -0500)]
adding ipython to dev reqs

11 years agoadding missing import to notes.models
Charles Holbrow [Fri, 18 Jan 2013 18:53:57 +0000 (13:53 -0500)]
adding missing import to notes.models

11 years agoadding BSD license declaration for ajaxuploader app
Seth Woodworth [Thu, 17 Jan 2013 20:10:59 +0000 (15:10 -0500)]
adding BSD license declaration for ajaxuploader app

11 years agoimporting celery tasks from djkarma
Seth Woodworth [Thu, 17 Jan 2013 20:10:27 +0000 (15:10 -0500)]
importing celery tasks from djkarma

11 years agoadding ajaxuploader to installed apps in settings/common.py
Seth Woodworth [Thu, 17 Jan 2013 20:09:44 +0000 (15:09 -0500)]
adding ajaxuploader to installed apps in settings/common.py

11 years agoadding raw note iframe view, route and template
Seth Woodworth [Thu, 17 Jan 2013 20:09:21 +0000 (15:09 -0500)]
adding raw note iframe view, route and template

11 years agotemp escaping variables for gdrive upload
Seth Woodworth [Thu, 17 Jan 2013 20:08:38 +0000 (15:08 -0500)]
temp escaping variables for gdrive upload

11 years agoadding imports for google drive
Seth Woodworth [Thu, 17 Jan 2013 19:48:57 +0000 (14:48 -0500)]
adding imports for google drive

11 years agoadding additional ajaxuploader import files
Seth Woodworth [Thu, 17 Jan 2013 18:39:31 +0000 (13:39 -0500)]
adding additional ajaxuploader import files

11 years agoimport gdrive.py and the ajaxuploader app
Seth Woodworth [Thu, 17 Jan 2013 18:38:52 +0000 (13:38 -0500)]
import gdrive.py and the ajaxuploader app

11 years agoAdded missing env.run to fabfile.py
bobcall [Wed, 16 Jan 2013 12:46:16 +0000 (07:46 -0500)]
Added missing env.run to fabfile.py

11 years agomodify models.Note.get_absolute_url to generate note urls
Seth Woodworth [Tue, 15 Jan 2013 02:16:59 +0000 (21:16 -0500)]
modify models.Note.get_absolute_url to generate note urls

11 years agoadding links from the course_list template to the course_detail page
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

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 15 Jan 2013 01:15:14 +0000 (20:15 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoimporting much of Lucian's fabfile.py from django-startproject
Seth Woodworth [Tue, 15 Jan 2013 00:59:01 +0000 (19:59 -0500)]
importing much of Lucian's fabfile.py from django-startproject

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 14 Jan 2013 23:53:36 +0000 (18:53 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoAdding sorter arrows for course list. #37 Next: filtering
Charles Holbrow [Mon, 14 Jan 2013 23:53:31 +0000 (18:53 -0500)]
Adding sorter arrows for course list. #37 Next: filtering

11 years agoadding karmaworld/static to gitignore
Seth Woodworth [Mon, 14 Jan 2013 23:47:34 +0000 (18:47 -0500)]
adding karmaworld/static to gitignore

11 years agoadding tablesorter functionality #37
Charles Holbrow [Mon, 14 Jan 2013 23:12:26 +0000 (18:12 -0500)]
adding tablesorter functionality #37

11 years agorename static folder to assets
Charles Holbrow [Mon, 14 Jan 2013 21:55:29 +0000 (16:55 -0500)]
rename static folder to assets

11 years agoDebug Toolbar will no longer interrupt our redirects
Charles Holbrow [Mon, 14 Jan 2013 21:43:38 +0000 (16:43 -0500)]
Debug Toolbar will no longer interrupt our redirects

11 years agoadding about page #18
Charles Holbrow [Mon, 14 Jan 2013 21:16:41 +0000 (16:16 -0500)]
adding about page #18

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 14 Jan 2013 19:44:41 +0000 (14:44 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoTags field now optional. fixes #30
Charles Holbrow [Mon, 14 Jan 2013 19:44:35 +0000 (14:44 -0500)]
Tags field now optional. fixes #30

11 years agoMerge pull request #29 from LucianU/master
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

11 years agoset admins + admin emails and set America/New_York timezone (US/Eastern)
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)

11 years agocleaning up shebang, copyright and file encoding for virtualenv
Seth Woodworth [Mon, 14 Jan 2013 19:36:34 +0000 (14:36 -0500)]
cleaning up shebang, copyright and file encoding for virtualenv

11 years agoUsing the production settings as the default in wsgi.py. 29/head
Lucian Ursu [Sat, 12 Jan 2013 10:59:48 +0000 (12:59 +0200)]
Using the production settings as the default in wsgi.py.

11 years agoRemoved the karmaworld/libs directory, because it's not currently used.
Lucian Ursu [Sat, 12 Jan 2013 10:30:22 +0000 (12:30 +0200)]
Removed the karmaworld/libs directory, because it's not currently used.

11 years agoMoved wsgi.py inside the karmaworld package because that's where it belongs.
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.

11 years agoDeleted Procfile because it's heroku specific and requirements.txt because the requir...
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.

11 years agoAdding the 'apps' directory to python path in manage.py, to avoid import problems...
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.

11 years agoforking django-taggit to the FinalsClub repo
Seth Woodworth [Fri, 11 Jan 2013 23:12:01 +0000 (18:12 -0500)]
forking django-taggit to the FinalsClub repo

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 10 Jan 2013 21:08:17 +0000 (16:08 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld