oweals/karmaworld.git
10 years agoGracefully handle failure when creating a UserProfile #270
Charles Connell [Wed, 15 Jan 2014 21:08:39 +0000 (16:08 -0500)]
Gracefully handle failure when creating a UserProfile #270

10 years agoSlightly nicer emails
Charles Connell [Tue, 14 Jan 2014 04:21:07 +0000 (23:21 -0500)]
Slightly nicer emails

10 years agoMerge pull request #280 from JHilker/patch-1
Charles Connell [Wed, 15 Jan 2014 15:29:37 +0000 (07:29 -0800)]
Merge pull request #280 from JHilker/patch-1

Fix link to virtualbox website in README

10 years agoFix link to virtualbox website in README 280/head
Jacob Hilker [Wed, 15 Jan 2014 15:27:44 +0000 (10:27 -0500)]
Fix link to virtualbox website in README

10 years agoFQDN fails, so just use the domain names without trailing period
Bryan [Wed, 15 Jan 2014 05:15:58 +0000 (00:15 -0500)]
FQDN fails, so just use the domain names without trailing period

10 years agoMerge branch 'django155' of github.com:FinalsClub/karmaworld into django155
Bryan [Wed, 15 Jan 2014 03:07:23 +0000 (22:07 -0500)]
Merge branch 'django155' of github.com:FinalsClub/karmaworld into django155

10 years agoFix failing test
Charles Connell [Wed, 15 Jan 2014 00:07:38 +0000 (19:07 -0500)]
Fix failing test

10 years agoaccidentally commit VM mod; this value should be in a non-tracked settings file with...
Bryan [Tue, 14 Jan 2014 23:38:23 +0000 (18:38 -0500)]
accidentally commit VM mod; this value should be in a non-tracked settings file with a default suggestion of running prod.

10 years agofixes and docs for VM to be more friendly for testing.
Bryan [Tue, 14 Jan 2014 23:35:38 +0000 (23:35 +0000)]
fixes and docs for VM to be more friendly for testing.

10 years agoupdating docs for debugging on prod system, such as a VM
Bryan [Tue, 14 Jan 2014 22:58:16 +0000 (17:58 -0500)]
updating docs for debugging on prod system, such as a VM

10 years agoimproved version management; adding vm-specific pip reqs that inherits prod.
Bryan [Tue, 14 Jan 2014 22:54:31 +0000 (17:54 -0500)]
improved version management; adding vm-specific pip reqs that inherits prod.

10 years agoVM hack to fix #259
Bryan [Tue, 14 Jan 2014 22:42:49 +0000 (17:42 -0500)]
VM hack to fix #259

10 years agoworkaround for #270
Bryan [Tue, 14 Jan 2014 22:26:20 +0000 (17:26 -0500)]
workaround for #270

10 years agoMerge branch 'master' into django155
Bryan [Tue, 14 Jan 2014 22:08:30 +0000 (17:08 -0500)]
Merge branch 'master' into django155

10 years agoMigration fix
Charles Connell [Tue, 14 Jan 2014 21:21:34 +0000 (16:21 -0500)]
Migration fix

10 years agoThis test doesn't make sense any more
Charles Connell [Tue, 14 Jan 2014 21:21:21 +0000 (16:21 -0500)]
This test doesn't make sense any more

10 years agoDjango 1.5 fixes, also turn indexing back on (oops)
Charles Connell [Tue, 14 Jan 2014 16:40:47 +0000 (11:40 -0500)]
Django 1.5 fixes, also turn indexing back on (oops)

10 years agoCorrect pdf2htmlEX build instructions
Charles Connell [Tue, 14 Jan 2014 04:29:32 +0000 (23:29 -0500)]
Correct pdf2htmlEX build instructions

10 years agobatch show/hide notes, closes #269
Bryan [Tue, 14 Jan 2014 04:11:30 +0000 (23:11 -0500)]
batch show/hide notes, closes #269

10 years agoConditionally support email; email host is now a setting rather than hard coded.
Bryan [Tue, 14 Jan 2014 04:08:11 +0000 (23:08 -0500)]
Conditionally support email; email host is now a setting rather than hard coded.

10 years agoinclusion of json_pretty for dumping with better UTF8 handling
Bryan [Tue, 14 Jan 2014 03:36:29 +0000 (03:36 +0000)]
inclusion of json_pretty for dumping with better UTF8 handling

10 years agoNicer profile page
Charles Connell [Tue, 14 Jan 2014 03:35:56 +0000 (22:35 -0500)]
Nicer profile page

10 years agoAddress to send emails from
Charles Connell [Tue, 14 Jan 2014 03:34:41 +0000 (22:34 -0500)]
Address to send emails from

10 years agoRevert change to SITE_NAME
Charles Connell [Tue, 14 Jan 2014 00:07:47 +0000 (19:07 -0500)]
Revert change to SITE_NAME

10 years agoEmail settings
Charles Connell [Mon, 13 Jan 2014 23:59:53 +0000 (18:59 -0500)]
Email settings

10 years agofixing migration dependencies for smoother migration.
Bryan [Sun, 12 Jan 2014 08:36:54 +0000 (08:36 +0000)]
fixing migration dependencies for smoother migration.

10 years agomock package is needed for running tests.
Bryan [Sun, 12 Jan 2014 08:35:04 +0000 (08:35 +0000)]
mock package is needed for running tests.

10 years agoupdating slugify for 1.5.5, not necessary but good practice.
Bryan [Sun, 12 Jan 2014 08:10:35 +0000 (08:10 +0000)]
updating slugify for 1.5.5, not necessary but good practice.

10 years agoupdating for TemplateView changes in 1.5
Bryan [Sun, 12 Jan 2014 06:23:33 +0000 (06:23 +0000)]
updating for TemplateView changes in 1.5

10 years agoALLOWED_HOSTS is now a required field, supporting localhost and the various karmanote...
Bryan [Sun, 12 Jan 2014 05:59:01 +0000 (05:59 +0000)]
ALLOWED_HOSTS is now a required field, supporting localhost and the various karmanotes.org URLs.

10 years agoremoving deprecated direct_to_template
Bryan [Sun, 12 Jan 2014 05:34:06 +0000 (05:34 +0000)]
removing deprecated direct_to_template

10 years agoUpgrading to 1.5.5
Bryan [Sun, 12 Jan 2014 05:32:13 +0000 (05:32 +0000)]
Upgrading to 1.5.5

10 years agoImproving login experience
Charles Connell [Sat, 11 Jan 2014 17:47:53 +0000 (12:47 -0500)]
Improving login experience

10 years agoAlways create a new course when using Course form #267
Charles Connell [Fri, 10 Jan 2014 21:42:29 +0000 (16:42 -0500)]
Always create a new course when using Course form #267

10 years agomodels don't work because they aren't in sync with the migrations; dump the field...
Bryan [Fri, 10 Jan 2014 09:24:13 +0000 (04:24 -0500)]
models don't work because they aren't in sync with the migrations; dump the field and recreate it

10 years agothis should do the trick, somehow clearing Note.user values got lost
Bryan [Fri, 10 Jan 2014 08:59:30 +0000 (03:59 -0500)]
this should do the trick, somehow clearing Note.user values got lost

10 years agoserious hacking to deal with existing FK data in Note ... cont'd
Bryan [Fri, 10 Jan 2014 08:53:44 +0000 (03:53 -0500)]
serious hacking to deal with existing FK data in Note ... cont'd

10 years agoserious hacking to deal with existing FK data in Note.
Bryan [Fri, 10 Jan 2014 08:50:25 +0000 (03:50 -0500)]
serious hacking to deal with existing FK data in Note.

10 years agowoops typo, need app not class
Bryan [Fri, 10 Jan 2014 08:39:50 +0000 (03:39 -0500)]
woops typo, need app not class

10 years agofixing dependencies caused by changing a foreign key.
Bryan [Fri, 10 Jan 2014 08:38:12 +0000 (03:38 -0500)]
fixing dependencies caused by changing a foreign key.

10 years agoRename migration to keep things orderly
Charles Connell [Thu, 9 Jan 2014 23:59:56 +0000 (18:59 -0500)]
Rename migration to keep things orderly

10 years agoFirst go at a user system #240 #255 #256
Charles Connell [Thu, 9 Jan 2014 21:04:51 +0000 (16:04 -0500)]
First go at a user system #240 #255 #256

10 years agoupdating all models with Natural Keys for Django [dump|load]data for #89; adding...
Bryan [Thu, 9 Jan 2014 06:21:13 +0000 (01:21 -0500)]
updating all models with Natural Keys for Django [dump|load]data for #89; adding some relevant unique constraints and cleaning up unicode formatting while I'm at it

10 years agotesting json serialization for #89
Bryan [Thu, 9 Jan 2014 06:19:42 +0000 (01:19 -0500)]
testing json serialization for #89

10 years agofixing courses to be more properly unique when importing ocw data.
Bryan [Thu, 9 Jan 2014 06:19:01 +0000 (01:19 -0500)]
fixing courses to be more properly unique when importing ocw data.

10 years agohandling errors with pdf2htmleX and preventing partial Notes from being stored.
Bryan [Wed, 8 Jan 2014 06:12:20 +0000 (01:12 -0500)]
handling errors with pdf2htmleX and preventing partial Notes from being stored.

10 years agoReverting half-merged commits b6f336c6a13b2a41b2c29b35884277aea9daca50 and 3d4edeb156...
Bryan [Wed, 8 Jan 2014 05:30:39 +0000 (00:30 -0500)]
Reverting half-merged commits b6f336c6a13b2a41b2c29b35884277aea9daca50 and 3d4edeb1565e41f692d0c45f064ce3df13e5f211

10 years agoAdded department, professor models, updated courses as appropriate. OCW importer...
Bryan [Wed, 8 Jan 2014 00:08:04 +0000 (19:08 -0500)]
Added department, professor models, updated courses as appropriate. OCW importer uses new models.

10 years agoneed to include the model location.
Bryan [Tue, 7 Jan 2014 20:56:06 +0000 (15:56 -0500)]
need to include the model location.

10 years agoRemoving School and Department from Course model to prevent circular dependencies...
Bryan [Tue, 7 Jan 2014 20:51:20 +0000 (15:51 -0500)]
Removing School and Department from Course model to prevent circular dependencies between Course, Department, and Professor.

10 years agonotes on fab from host machine.
Bryan [Tue, 7 Jan 2014 20:12:50 +0000 (15:12 -0500)]
notes on fab from host machine.

10 years agoFix broken icons
Charles Connell [Tue, 7 Jan 2014 14:04:16 +0000 (09:04 -0500)]
Fix broken icons

10 years agoRemove unused files
Charles Connell [Tue, 7 Jan 2014 14:03:42 +0000 (09:03 -0500)]
Remove unused files

10 years agoReferences to lightboxes we don't have any more #202
Charles Connell [Mon, 6 Jan 2014 20:54:49 +0000 (15:54 -0500)]
References to lightboxes we don't have any more #202

10 years agoMerge remote-tracking branch 'origin/master'
Bryan [Mon, 6 Jan 2014 23:58:17 +0000 (18:58 -0500)]
Merge remote-tracking branch 'origin/master'

10 years agocloses #253 by removing field, adds backend for #236, and nearly completes #68
Bryan [Mon, 6 Jan 2014 23:56:23 +0000 (18:56 -0500)]
closes #253 by removing field, adds backend for #236, and nearly completes #68

10 years agofor #68, fixing upstream link 'display and uploading to FP by URL works.
Bryan [Mon, 6 Jan 2014 22:42:50 +0000 (17:42 -0500)]
for #68, fixing upstream link 'display and uploading to FP by URL works.

10 years agoEnforce school hashtag uniqueness #239
Charles Connell [Mon, 6 Jan 2014 20:43:11 +0000 (15:43 -0500)]
Enforce school hashtag uniqueness #239

10 years agobuild courses and notes out of OCW scraped JSON, except FP won't get the mimetype...
Bryan [Mon, 6 Jan 2014 08:08:36 +0000 (03:08 -0500)]
build courses and notes out of OCW scraped JSON, except FP won't get the mimetype right

10 years agoClean up bugs
Charles Connell [Sun, 5 Jan 2014 03:28:17 +0000 (22:28 -0500)]
Clean up bugs

10 years agoShow PDF controls for powerpoints too
Charles Connell [Sun, 5 Jan 2014 02:34:31 +0000 (21:34 -0500)]
Show PDF controls for powerpoints too

10 years agoAccess search index through singleton object, more selective index updates
Charles Connell [Sun, 5 Jan 2014 02:34:10 +0000 (21:34 -0500)]
Access search index through singleton object, more selective index updates

10 years agoRemember who thanked or flagged notes by session cookies #250
Charles Connell [Sat, 4 Jan 2014 22:27:10 +0000 (17:27 -0500)]
Remember who thanked or flagged notes by session cookies #250

10 years agoAdd LuckyOrange, only enable trackers on production site #162
Charles Connell [Sat, 4 Jan 2014 17:20:33 +0000 (12:20 -0500)]
Add LuckyOrange, only enable trackers on production site #162

10 years agoLog errors in celery tasks
Charles Connell [Sat, 4 Jan 2014 01:45:53 +0000 (20:45 -0500)]
Log errors in celery tasks

10 years agoA migration we need
Charles Connell [Sat, 4 Jan 2014 01:44:02 +0000 (20:44 -0500)]
A migration we need

10 years agoOrder search results properly, paginate them too
Charles Connell [Fri, 3 Jan 2014 23:03:20 +0000 (18:03 -0500)]
Order search results properly, paginate them too

10 years agoScoring of search results
Charles Connell [Fri, 3 Jan 2014 21:10:02 +0000 (16:10 -0500)]
Scoring of search results

10 years agoTiny little bug
Charles Connell [Fri, 3 Jan 2014 21:01:22 +0000 (16:01 -0500)]
Tiny little bug

10 years agoFix logging
Charles Connell [Fri, 3 Jan 2014 17:37:04 +0000 (12:37 -0500)]
Fix logging

10 years agoUpdate example file
Charles Connell [Fri, 3 Jan 2014 17:35:37 +0000 (12:35 -0500)]
Update example file

10 years agoDocument twitter secrets better
Charles Connell [Fri, 3 Jan 2014 19:39:06 +0000 (14:39 -0500)]
Document twitter secrets better

10 years agoDocument IndexDen dependency #237
Charles Connell [Fri, 3 Jan 2014 17:34:25 +0000 (12:34 -0500)]
Document IndexDen dependency #237

10 years agoGenerate cleaner plaintext
Charles Connell [Fri, 3 Jan 2014 17:14:47 +0000 (12:14 -0500)]
Generate cleaner plaintext

10 years agoTiny search improvements
Charles Connell [Fri, 3 Jan 2014 15:19:50 +0000 (10:19 -0500)]
Tiny search improvements

10 years agoBetter looking tweets
Charles Connell [Fri, 3 Jan 2014 15:18:06 +0000 (10:18 -0500)]
Better looking tweets

10 years agoAdding License tracking, upstream file tracking, and displays.
Bryan [Fri, 3 Jan 2014 16:55:36 +0000 (11:55 -0500)]
Adding License tracking, upstream file tracking, and displays.

10 years agonote about fabbing in venv
Bryan [Fri, 3 Jan 2014 15:57:38 +0000 (10:57 -0500)]
note about fabbing in venv

10 years agoslight change to footer text CC license
Andrew Magliozzi [Fri, 3 Jan 2014 15:21:58 +0000 (10:21 -0500)]
slight change to footer text CC license

10 years agoBetter plain text output
Charles Connell [Thu, 2 Jan 2014 21:17:10 +0000 (16:17 -0500)]
Better plain text output

10 years agoIndex tags correctly
Charles Connell [Thu, 2 Jan 2014 21:16:58 +0000 (16:16 -0500)]
Index tags correctly

10 years agofixes for saving courses in the admin interface
Bryan [Thu, 2 Jan 2014 20:49:56 +0000 (15:49 -0500)]
fixes for saving courses in the admin interface

10 years agofixing typo from Bostonian to proper English
Bryan [Thu, 2 Jan 2014 19:38:39 +0000 (14:38 -0500)]
fixing typo from Bostonian to proper English

10 years agoguessing how to run beat from supervisor. maybe it works?
Bryan [Thu, 2 Jan 2014 19:19:42 +0000 (14:19 -0500)]
guessing how to run beat from supervisor. maybe it works?

10 years agothis should add tags into the database from raw document uploads, closes #150
Bryan [Thu, 2 Jan 2014 19:14:43 +0000 (14:14 -0500)]
this should add tags into the database from raw document uploads, closes #150

10 years agoUI for flagging courses
Charles Connell [Thu, 2 Jan 2014 19:03:50 +0000 (14:03 -0500)]
UI for flagging courses

10 years agoCourse link more explicit
Charles Connell [Thu, 2 Jan 2014 18:24:41 +0000 (13:24 -0500)]
Course link more explicit

10 years agoConfirm note flagging
Charles Connell [Thu, 2 Jan 2014 18:04:09 +0000 (13:04 -0500)]
Confirm note flagging

10 years agoMove to html2text
Charles Connell [Thu, 2 Jan 2014 17:16:39 +0000 (12:16 -0500)]
Move to html2text

10 years agoFlag button working
Charles Connell [Thu, 2 Jan 2014 15:54:41 +0000 (10:54 -0500)]
Flag button working

10 years agoBetter header on mobile
Charles Connell [Thu, 2 Jan 2014 15:34:26 +0000 (10:34 -0500)]
Better header on mobile

10 years agoresolving erroneous merge conflict of search.py
Bryan [Thu, 2 Jan 2014 04:23:21 +0000 (23:23 -0500)]
resolving erroneous merge conflict of search.py

10 years agoremoving note_field and desc from Note model. closes #229
Bryan [Thu, 2 Jan 2014 04:17:39 +0000 (23:17 -0500)]
removing note_field and desc from Note model. closes #229

10 years agoImprovements to search page
Charles Connell [Thu, 2 Jan 2014 03:38:34 +0000 (22:38 -0500)]
Improvements to search page

10 years agopersist the GDrive file link for #230
Bryan [Thu, 2 Jan 2014 03:39:17 +0000 (22:39 -0500)]
persist the GDrive file link for #230

10 years agoThis should allow cascading course deletion over notes, but might lose cache sync
Bryan [Thu, 2 Jan 2014 02:21:16 +0000 (21:21 -0500)]
This should allow cascading course deletion over notes, but might lose cache sync

10 years agoRemoving unused directory
Bryan [Thu, 2 Jan 2014 01:54:16 +0000 (20:54 -0500)]
Removing unused directory

10 years agoRemoving unused code.
Bryan [Thu, 2 Jan 2014 01:52:48 +0000 (20:52 -0500)]
Removing unused code.

10 years agostandardizing virtualenv path to {project_root}/venv/
Bryan [Thu, 2 Jan 2014 01:20:45 +0000 (20:20 -0500)]
standardizing virtualenv path to {project_root}/venv/

10 years agoDon't let one error halt document indexing
Charles Connell [Tue, 31 Dec 2013 04:31:11 +0000 (23:31 -0500)]
Don't let one error halt document indexing