Seth Woodworth [Wed, 6 Mar 2013 23:15:03 +0000 (18:15 -0500)]
add function so a course can return self.updated_at as a formatted string
Charles Holbrow [Wed, 27 Feb 2013 23:23:48 +0000 (18:23 -0500)]
Filtering on the server side
Seth Woodworth [Wed, 27 Feb 2013 19:38:11 +0000 (14:38 -0500)]
initial broken serverside datatables config
Charles Holbrow [Wed, 27 Feb 2013 18:23:03 +0000 (13:23 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 27 Feb 2013 18:22:57 +0000 (13:22 -0500)]
adding sublime text project to .gitignore
bobcall [Wed, 27 Feb 2013 17:29:18 +0000 (12:29 -0500)]
Fixed missing {
bobcall [Wed, 27 Feb 2013 17:26:21 +0000 (12:26 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
bobcall [Wed, 27 Feb 2013 17:26:02 +0000 (12:26 -0500)]
Added Bup-DB script
Charles Holbrow [Fri, 22 Feb 2013 20:29:18 +0000 (15:29 -0500)]
Setting Column Widths in tablesorter
Charles Holbrow [Wed, 20 Feb 2013 20:30:35 +0000 (15:30 -0500)]
removing tablesorter css jpg and img in favor of DataTabeles
Charles Holbrow [Wed, 20 Feb 2013 20:06:34 +0000 (15:06 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 20 Feb 2013 19:58:29 +0000 (14:58 -0500)]
modifying css and image links to support our altered folder structure
Charles Holbrow [Wed, 20 Feb 2013 19:34:14 +0000 (14:34 -0500)]
adding datatables files
Seth Woodworth [Tue, 19 Feb 2013 21:11:20 +0000 (16:11 -0500)]
Merge remote-tracking branch 'origin/test'
Charles Holbrow [Tue, 19 Feb 2013 18:23:54 +0000 (13:23 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Tue, 19 Feb 2013 18:23:49 +0000 (13:23 -0500)]
tablesorter options #83
bobcall [Tue, 19 Feb 2013 15:31:24 +0000 (10:31 -0500)]
Pushed some of the newer os-install docs (still merging 2 copies)
Seth Woodworth [Wed, 13 Feb 2013 19:23:23 +0000 (14:23 -0500)]
adding first batch of tests for notes.models
Seth Woodworth [Wed, 13 Feb 2013 19:23:08 +0000 (14:23 -0500)]
adding django-nose testing framework to dev settings
Seth Woodworth [Wed, 13 Feb 2013 19:22:38 +0000 (14:22 -0500)]
fixing subtle bugs in notes.models based on tests
Charles Holbrow [Wed, 13 Feb 2013 04:58:55 +0000 (23:58 -0500)]
Pagnination working, but ugly #59 -- client side sort and filter
Seth Woodworth [Tue, 12 Feb 2013 00:23:37 +0000 (19:23 -0500)]
adding django-nose and coverage to dev requirements
Charles Holbrow [Mon, 11 Feb 2013 22:11:12 +0000 (17:11 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Conflicts:
karmaworld/templates/courses/course_list.html
Charles Holbrow [Mon, 11 Feb 2013 21:51:38 +0000 (16:51 -0500)]
Clarifying comment
Seth Woodworth [Mon, 11 Feb 2013 19:06:29 +0000 (14:06 -0500)]
move add-course lightbox js into file, closes #74
Seth Woodworth [Mon, 11 Feb 2013 18:57:09 +0000 (13:57 -0500)]
move course_list tablesorter javascript configuration out to sort-table.js file
Seth Woodworth [Mon, 11 Feb 2013 18:56:17 +0000 (13:56 -0500)]
cleanin up imports in base template
Seth Woodworth [Thu, 7 Feb 2013 22:04:58 +0000 (17:04 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 7 Feb 2013 22:01:36 +0000 (17:01 -0500)]
moving qq.FileUploader to lightboxupload, #74
Charles Holbrow [Thu, 7 Feb 2013 21:19:24 +0000 (16:19 -0500)]
adding documentation for dump_json manage command
Charles Holbrow [Thu, 7 Feb 2013 21:08:42 +0000 (16:08 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 7 Feb 2013 21:08:22 +0000 (16:08 -0500)]
adding documentaiton for import_json manage command
Seth Woodworth [Thu, 7 Feb 2013 21:03:18 +0000 (16:03 -0500)]
moving js from note_detail to note-iframe.js, for issue #74
Seth Woodworth [Thu, 7 Feb 2013 20:21:07 +0000 (15:21 -0500)]
minor formatting cleanup of the os-install.rst doc
Seth Woodworth [Thu, 7 Feb 2013 20:15:44 +0000 (15:15 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 7 Feb 2013 19:51:10 +0000 (14:51 -0500)]
adding django-extensions helpers to manage.py
bobcall [Wed, 6 Feb 2013 17:38:28 +0000 (12:38 -0500)]
Merged other documentation to os-install.rst (Still a WIP)
bobcall [Wed, 6 Feb 2013 17:15:48 +0000 (12:15 -0500)]
Fixed a few formatting issues in os-install.rst
bobcall [Wed, 6 Feb 2013 17:09:17 +0000 (12:09 -0500)]
Fixed a few formatting issues in os-install.rst
bobcall [Wed, 6 Feb 2013 17:06:06 +0000 (12:06 -0500)]
Rolled out first write of os-install.rst (more testing / documentation needed)
Seth Woodworth [Tue, 5 Feb 2013 22:02:48 +0000 (17:02 -0500)]
documenting how to install rabbitmq-server on ubuntu server for production
Seth Woodworth [Tue, 5 Feb 2013 21:54:11 +0000 (16:54 -0500)]
finish documenting the secrets folder, closes #50
Seth Woodworth [Tue, 5 Feb 2013 01:26:49 +0000 (20:26 -0500)]
adding intial documentation on the /secrets/ folder, for #50
Seth Woodworth [Tue, 5 Feb 2013 01:14:33 +0000 (20:14 -0500)]
setting up grapelli autocomplete for Note >> Course relation, closes #60
Seth Woodworth [Mon, 4 Feb 2013 23:25:46 +0000 (18:25 -0500)]
fixing absolute path for url() in global.css, for #71
Seth Woodworth [Mon, 4 Feb 2013 23:20:32 +0000 (18:20 -0500)]
use relative imports in table_sort.css to work with s3, for #71
Seth Woodworth [Mon, 4 Feb 2013 23:15:08 +0000 (18:15 -0500)]
removing unused bin folder executables in favor of the management command that does the same thing
Seth Woodworth [Mon, 4 Feb 2013 23:06:16 +0000 (18:06 -0500)]
update one-liner on front page
Seth Woodworth [Mon, 4 Feb 2013 23:02:09 +0000 (18:02 -0500)]
update survey link and thank you text
Seth Woodworth [Mon, 4 Feb 2013 22:48:10 +0000 (17:48 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 4 Feb 2013 22:47:48 +0000 (17:47 -0500)]
set file uploads to use local server file hosting instead of DEFAULT_STORAGE \n which is s3 in production
Charles Holbrow [Mon, 4 Feb 2013 22:12:28 +0000 (17:12 -0500)]
import_json command re-generates school, course and note and id primary key fields
Seth Woodworth [Fri, 1 Feb 2013 22:03:38 +0000 (17:03 -0500)]
adding gunicorn to production INSTALLED_APPS
Seth Woodworth [Fri, 1 Feb 2013 21:26:51 +0000 (16:26 -0500)]
adding amqplib to production requirements
Charles Holbrow [Fri, 1 Feb 2013 21:14:59 +0000 (16:14 -0500)]
setting max values slug fields for schools and notes
Charles Holbrow [Fri, 1 Feb 2013 21:02:26 +0000 (16:02 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Fri, 1 Feb 2013 21:02:10 +0000 (16:02 -0500)]
setting max length of school slug
Seth Woodworth [Fri, 1 Feb 2013 20:47:02 +0000 (15:47 -0500)]
invert notes defaute sorting
Seth Woodworth [Fri, 1 Feb 2013 20:46:43 +0000 (15:46 -0500)]
on file upload success, redirect back to course page, with thank you message and link to file
Seth Woodworth [Fri, 1 Feb 2013 20:45:13 +0000 (15:45 -0500)]
removing caching from development settings
Seth Woodworth [Fri, 1 Feb 2013 20:02:37 +0000 (15:02 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Fri, 1 Feb 2013 20:02:23 +0000 (15:02 -0500)]
adding the CourseForm modelform
bobcall [Fri, 1 Feb 2013 19:39:27 +0000 (19:39 +0000)]
remove dup. reqs/prod.txt
Robert Call [Fri, 1 Feb 2013 19:36:26 +0000 (19:36 +0000)]
Removed AWS var., see secret/static_s3
Robert Call [Fri, 1 Feb 2013 19:32:06 +0000 (19:32 +0000)]
Fixed common.py and dev.py
Charles Holbrow [Fri, 1 Feb 2013 18:48:55 +0000 (18:48 +0000)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld into pylibmc
bobcall [Fri, 1 Feb 2013 18:45:54 +0000 (13:45 -0500)]
Added s3 buckets / DB secrets file imports to /karmaworld/settings/prod.py
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