oweals/karmaworld.git
10 years agoDelete Vagrant related things, and supervisord related things. Update README
Charles Connell [Thu, 15 May 2014 23:34:18 +0000 (19:34 -0400)]
Delete Vagrant related things, and supervisord related things. Update README

10 years agodummy commit
Charles Connell [Thu, 15 May 2014 22:32:30 +0000 (18:32 -0400)]
dummy commit

10 years agodummy commit
Charles Connell [Thu, 15 May 2014 22:21:01 +0000 (18:21 -0400)]
dummy commit

10 years agoDoes it not like dashes?
Charles Connell [Thu, 15 May 2014 18:37:24 +0000 (14:37 -0400)]
Does it not like dashes?

10 years agodummy commit
Charles Connell [Thu, 15 May 2014 18:24:22 +0000 (14:24 -0400)]
dummy commit

10 years agodummy commit
Charles Connell [Thu, 15 May 2014 18:17:10 +0000 (14:17 -0400)]
dummy commit

10 years agoAdd celery beat
Charles Connell [Thu, 15 May 2014 18:12:26 +0000 (14:12 -0400)]
Add celery beat

10 years agoTrying adding a pdf2htmlex binary
Charles Connell [Wed, 14 May 2014 23:24:54 +0000 (19:24 -0400)]
Trying adding a pdf2htmlex binary

10 years agoadd celery worker to procfile
Charles Connell [Wed, 14 May 2014 22:23:24 +0000 (18:23 -0400)]
add celery worker to procfile

10 years agobroker pool limit
Charles Connell [Wed, 14 May 2014 22:05:14 +0000 (18:05 -0400)]
broker pool limit

10 years agobeginning heroku documentation
Bryan Bonvallet [Thu, 15 May 2014 03:07:48 +0000 (23:07 -0400)]
beginning heroku documentation

10 years agoexample .env file
Charles Connell [Wed, 14 May 2014 21:58:58 +0000 (17:58 -0400)]
example .env file

10 years agoDrop closure-compiler
Charles Connell [Wed, 14 May 2014 20:57:57 +0000 (16:57 -0400)]
Drop closure-compiler

10 years agoWill this work for a non-java app?
Charles Connell [Wed, 14 May 2014 19:58:54 +0000 (15:58 -0400)]
Will this work for a non-java app?

10 years agoBring closure compiler into repo
Charles Connell [Wed, 14 May 2014 19:49:32 +0000 (15:49 -0400)]
Bring closure compiler into repo

10 years agothis affects heroku after all
Charles Connell [Wed, 14 May 2014 19:45:39 +0000 (15:45 -0400)]
this affects heroku after all

10 years agoProperly enable compression?
Charles Connell [Wed, 14 May 2014 19:39:24 +0000 (15:39 -0400)]
Properly enable compression?

10 years agoMore playing with buildpacks
Charles Connell [Wed, 14 May 2014 18:54:32 +0000 (14:54 -0400)]
More playing with buildpacks

10 years agoplaying with buildpacks
Charles Connell [Wed, 14 May 2014 18:47:14 +0000 (14:47 -0400)]
playing with buildpacks

10 years agoWe need dj-static
Charles Connell [Wed, 14 May 2014 18:35:28 +0000 (14:35 -0400)]
We need dj-static

10 years agothis is not used any more
Charles Connell [Wed, 14 May 2014 18:32:22 +0000 (14:32 -0400)]
this is not used any more

10 years agoMigrate secrets to environment variables
Charles Connell [Wed, 14 May 2014 18:26:21 +0000 (14:26 -0400)]
Migrate secrets to environment variables

10 years agoTry this...
Charles Connell [Wed, 14 May 2014 16:57:53 +0000 (12:57 -0400)]
Try this...

10 years agoAvoid the problem for the moment
Charles Connell [Wed, 14 May 2014 16:48:53 +0000 (12:48 -0400)]
Avoid the problem for the moment

10 years agotry this?
Charles Connell [Wed, 14 May 2014 16:47:22 +0000 (12:47 -0400)]
try this?

10 years agoHeroku conversion step 2
Charles Connell [Wed, 14 May 2014 16:44:58 +0000 (12:44 -0400)]
Heroku conversion step 2

10 years agoheroku conversion step 1
Charles Connell [Wed, 14 May 2014 16:33:20 +0000 (12:33 -0400)]
heroku conversion step 1

10 years agoFix question scoring bugs
Charles Connell [Wed, 14 May 2014 15:26:30 +0000 (11:26 -0400)]
Fix question scoring bugs

10 years agoMatching-style quiz questions
Charles Connell [Wed, 14 May 2014 15:05:04 +0000 (11:05 -0400)]
Matching-style quiz questions

10 years agoFix backup script
Charles Connell [Tue, 13 May 2014 18:57:00 +0000 (14:57 -0400)]
Fix backup script

10 years agoKarma point for creating a new keyword
Charles Connell [Tue, 13 May 2014 18:26:23 +0000 (14:26 -0400)]
Karma point for creating a new keyword

10 years agoMobile chrome renders this off by 1 pixel
Charles Connell [Tue, 13 May 2014 18:21:52 +0000 (14:21 -0400)]
Mobile chrome renders this off by 1 pixel

10 years agoGlacier backup script
Charles Connell [Tue, 13 May 2014 18:09:37 +0000 (14:09 -0400)]
Glacier backup script

10 years agoIssues with quiz creation
Charles Connell [Tue, 13 May 2014 18:09:25 +0000 (14:09 -0400)]
Issues with quiz creation

10 years agoIssues with keyword editing
Charles Connell [Tue, 13 May 2014 18:09:11 +0000 (14:09 -0400)]
Issues with keyword editing

10 years agoRemove old code from before course list was loaded over ajax
Charles Connell [Tue, 13 May 2014 14:52:23 +0000 (10:52 -0400)]
Remove old code from before course list was loaded over ajax

10 years agoDon't blow up if RequesterAnnotation isn't an integer
Charles Connell [Tue, 13 May 2014 14:37:06 +0000 (10:37 -0400)]
Don't blow up if RequesterAnnotation isn't an integer

10 years agoStop using memcached
Charles Connell [Tue, 13 May 2014 14:36:42 +0000 (10:36 -0400)]
Stop using memcached

10 years agoAdd a joyride tip, fix a couple bugs with quiz generation
Charles Connell [Tue, 13 May 2014 14:17:32 +0000 (10:17 -0400)]
Add a joyride tip, fix a couple bugs with quiz generation

10 years agoTrailing comma
Charles Connell [Mon, 12 May 2014 23:32:45 +0000 (19:32 -0400)]
Trailing comma

10 years agoUpgrade datatables, load courses over ajax
Charles Connell [Mon, 12 May 2014 21:55:08 +0000 (17:55 -0400)]
Upgrade datatables, load courses over ajax

10 years agoLower HIT reward
Charles Connell [Sun, 11 May 2014 04:04:21 +0000 (00:04 -0400)]
Lower HIT reward

10 years agoKeywords are not required to have a definition
Charles Connell [Sun, 11 May 2014 04:04:12 +0000 (00:04 -0400)]
Keywords are not required to have a definition

10 years agoMaybe this will invoke celery
Charles Connell [Sat, 10 May 2014 23:13:18 +0000 (19:13 -0400)]
Maybe this will invoke celery

10 years agoClean up how we edit notes and courses -- disable course edit for now until we figure...
Charles Connell [Sat, 10 May 2014 23:12:43 +0000 (19:12 -0400)]
Clean up how we edit notes and courses -- disable course edit for now until we figure out how to make it work

10 years agoFix a bug with tweets
Charles Connell [Sat, 10 May 2014 23:11:51 +0000 (19:11 -0400)]
Fix a bug with tweets

10 years agoUse mechanical turk to get keywords of notes
Charles Connell [Sat, 10 May 2014 19:55:26 +0000 (15:55 -0400)]
Use mechanical turk to get keywords of notes

10 years agoimport error
Charles Connell [Fri, 9 May 2014 15:00:41 +0000 (11:00 -0400)]
import error

10 years agoRemove NLP approach to finding keywords, start on quiz interface
Charles Connell [Fri, 9 May 2014 14:55:41 +0000 (10:55 -0400)]
Remove NLP approach to finding keywords, start on quiz interface

10 years agoMove NLTK download to management command
Charles Connell [Thu, 1 May 2014 19:13:59 +0000 (15:13 -0400)]
Move NLTK download to management command

10 years agoGuess keywords in uploaded notes
Charles Connell [Thu, 1 May 2014 18:59:36 +0000 (14:59 -0400)]
Guess keywords in uploaded notes

10 years agoRemove some old code
Charles Connell [Thu, 1 May 2014 18:59:21 +0000 (14:59 -0400)]
Remove some old code

10 years agoNotes have categories, fixes #367
Charles Connell [Wed, 30 Apr 2014 17:47:01 +0000 (13:47 -0400)]
Notes have categories, fixes #367

10 years agoRemove a bunch of unused fields from Note
Charles Connell [Wed, 30 Apr 2014 16:47:20 +0000 (12:47 -0400)]
Remove a bunch of unused fields from Note

10 years agoRemove old keywords and quizzes code
Charles Connell [Wed, 30 Apr 2014 16:29:02 +0000 (12:29 -0400)]
Remove old keywords and quizzes code

10 years agoRequire authentication to set keywords, fixes #365
Charles Connell [Wed, 30 Apr 2014 16:22:47 +0000 (12:22 -0400)]
Require authentication to set keywords, fixes #365

10 years agoFix two tiny bugs
Charles Connell [Wed, 30 Apr 2014 01:29:00 +0000 (21:29 -0400)]
Fix two tiny bugs

10 years agofix the vimeo video link
Andrew Magliozzi [Tue, 29 Apr 2014 18:25:29 +0000 (14:25 -0400)]
fix the vimeo video link

10 years agoA number of design changes
Charles Connell [Tue, 29 Apr 2014 17:59:56 +0000 (13:59 -0400)]
A number of design changes

10 years agoDesign tweaks
Charles Connell [Mon, 28 Apr 2014 21:15:14 +0000 (17:15 -0400)]
Design tweaks

10 years agoEdit and delete notes
Charles Connell [Mon, 28 Apr 2014 21:14:34 +0000 (17:14 -0400)]
Edit and delete notes

10 years agoRemove annoying app, fix note resize
Charles Connell [Sun, 27 Apr 2014 13:58:57 +0000 (09:58 -0400)]
Remove annoying app, fix note resize

10 years agoAssorted design fixes
Charles Connell [Sun, 27 Apr 2014 13:58:10 +0000 (09:58 -0400)]
Assorted design fixes

10 years agoAllauth API change
Charles Connell [Sun, 27 Apr 2014 13:57:04 +0000 (09:57 -0400)]
Allauth API change

10 years agoTry moving trackers to bottom of page
Charles Connell [Sat, 26 Apr 2014 15:58:15 +0000 (11:58 -0400)]
Try moving trackers to bottom of page

10 years agoFlush memcache when deploying
Charles Connell [Sat, 26 Apr 2014 13:01:41 +0000 (09:01 -0400)]
Flush memcache when deploying

10 years agoHad too many slashes
Charles Connell [Sat, 26 Apr 2014 03:29:47 +0000 (23:29 -0400)]
Had too many slashes

10 years agoBetter paths on S3
Charles Connell [Sat, 26 Apr 2014 00:53:57 +0000 (20:53 -0400)]
Better paths on S3

10 years agoCache the homepage for anonymous users
Charles Connell [Fri, 25 Apr 2014 20:47:23 +0000 (16:47 -0400)]
Cache the homepage for anonymous users

10 years agoBegin enabling CloudFront
Charles Connell [Fri, 25 Apr 2014 20:06:39 +0000 (16:06 -0400)]
Begin enabling CloudFront

10 years agoTiming instrumentation
Charles Connell [Fri, 25 Apr 2014 14:41:03 +0000 (10:41 -0400)]
Timing instrumentation

10 years agoReduce the number of database queries when loading the homepage
Charles Connell [Fri, 25 Apr 2014 14:05:37 +0000 (10:05 -0400)]
Reduce the number of database queries when loading the homepage

10 years agoKeeping settings/vmdev.py up to speed
Charles Connell [Fri, 25 Apr 2014 14:05:15 +0000 (10:05 -0400)]
Keeping settings/vmdev.py up to speed

10 years agoLengthen validity period for compressed assets
Charles Connell [Fri, 25 Apr 2014 12:23:36 +0000 (08:23 -0400)]
Lengthen validity period for compressed assets

10 years agoChange closure path again
Charles Connell [Thu, 24 Apr 2014 13:22:36 +0000 (09:22 -0400)]
Change closure path again

10 years agoChange closure path
Charles Connell [Thu, 24 Apr 2014 12:51:14 +0000 (08:51 -0400)]
Change closure path

10 years agoFix one more css url
Charles Connell [Thu, 24 Apr 2014 12:48:10 +0000 (08:48 -0400)]
Fix one more css url

10 years agoMore movement toward a better organized static asset pipeline
Charles Connell [Thu, 24 Apr 2014 02:13:29 +0000 (22:13 -0400)]
More movement toward a better organized static asset pipeline

10 years agooops
Charles Connell [Wed, 23 Apr 2014 18:05:48 +0000 (14:05 -0400)]
oops

10 years agoFind fonts correctly, don't load jquery twice
Charles Connell [Wed, 23 Apr 2014 18:02:00 +0000 (14:02 -0400)]
Find fonts correctly, don't load jquery twice

10 years agoAdd compress step to deply
Charles Connell [Wed, 23 Apr 2014 17:38:11 +0000 (13:38 -0400)]
Add compress step to deply

10 years agoMove assets into our control and compress them together
Charles Connell [Wed, 23 Apr 2014 17:36:53 +0000 (13:36 -0400)]
Move assets into our control and compress them together

10 years agoRemove unused CSS files, shrink splash image
Charles Connell [Wed, 23 Apr 2014 16:21:07 +0000 (12:21 -0400)]
Remove unused CSS files, shrink splash image

10 years agoSort by school
Charles Connell [Wed, 23 Apr 2014 15:57:18 +0000 (11:57 -0400)]
Sort by school

10 years agoPut keywords on a separate page
Charles Connell [Tue, 22 Apr 2014 20:15:27 +0000 (16:15 -0400)]
Put keywords on a separate page

10 years agoMake the new version of taggit happy
Charles Connell [Mon, 21 Apr 2014 03:43:55 +0000 (23:43 -0400)]
Make the new version of taggit happy

10 years agoNote upload on mobile
Charles Connell [Mon, 21 Apr 2014 03:35:12 +0000 (23:35 -0400)]
Note upload on mobile

10 years agoCreate courses on mobile
Charles Connell [Mon, 21 Apr 2014 03:08:20 +0000 (23:08 -0400)]
Create courses on mobile

10 years agoPrevent blank professors from being created, while still allowing on-the-fly professo...
Charles Connell [Mon, 21 Apr 2014 03:07:31 +0000 (23:07 -0400)]
Prevent blank professors from being created, while still allowing on-the-fly professor creation

10 years agoPrettier representation of models
Charles Connell [Mon, 14 Apr 2014 22:33:34 +0000 (18:33 -0400)]
Prettier representation of models

10 years agoThis hardcoding is necessary to get layout correct in all cases
Charles Connell [Mon, 14 Apr 2014 22:29:29 +0000 (18:29 -0400)]
This hardcoding is necessary to get layout correct in all cases

10 years agoProfessor name is effectively required, so might as well say so. Also fix how profess...
Charles Connell [Mon, 14 Apr 2014 21:05:20 +0000 (17:05 -0400)]
Professor name is effectively required, so might as well say so. Also fix how professor are shown

10 years agoMerge branch 'feature_course_add_with_dept'
Charles Connell [Mon, 14 Apr 2014 20:08:57 +0000 (16:08 -0400)]
Merge branch 'feature_course_add_with_dept'

10 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Connell [Mon, 14 Apr 2014 20:08:13 +0000 (16:08 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

10 years agoGet tests working, template issues
Charles Connell [Mon, 14 Apr 2014 20:06:01 +0000 (16:06 -0400)]
Get tests working, template issues

10 years agohot fix to update vimeo video link.
Andrew Magliozzi [Mon, 14 Apr 2014 16:14:42 +0000 (12:14 -0400)]
hot fix to update vimeo video link.

10 years agoImprove form layout
Charles Connell [Mon, 14 Apr 2014 15:44:44 +0000 (11:44 -0400)]
Improve form layout

10 years agoMerge branch 'master' into feature_course_add_with_dept
Charles Connell [Sun, 13 Apr 2014 23:17:26 +0000 (19:17 -0400)]
Merge branch 'master' into feature_course_add_with_dept

Conflicts:
karmaworld/apps/courses/views.py
karmaworld/assets/css/global.css
karmaworld/assets/js/add-course.js
karmaworld/templates/courses/course_detail.html
karmaworld/templates/courses/course_list.html
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/partial/add_course.html
karmaworld/templates/user_profile.html

10 years agoTweak where Annotator is applied
Charles Connell [Sun, 13 Apr 2014 21:05:41 +0000 (17:05 -0400)]
Tweak where Annotator is applied

10 years agoNeed https here
Charles Connell [Sun, 13 Apr 2014 17:00:56 +0000 (13:00 -0400)]
Need https here