oweals/karmaworld.git
10 years agoReputation system
Charles Connell [Thu, 23 Jan 2014 00:17:39 +0000 (19:17 -0500)]
Reputation system

10 years agoFix to note/user association
Charles Connell [Wed, 22 Jan 2014 00:01:19 +0000 (19:01 -0500)]
Fix to note/user association

10 years agoMerge pull request #297 from FinalsClub/broken-footer-about-link
Bryan Bonvallet [Wed, 22 Jan 2014 05:28:07 +0000 (21:28 -0800)]
Merge pull request #297 from FinalsClub/broken-footer-about-link

Preserve port number in href tag for footer about link

10 years agoMerge pull request #298 from FinalsClub/gitignore-usde-accreditation
Bryan Bonvallet [Wed, 22 Jan 2014 05:02:43 +0000 (21:02 -0800)]
Merge pull request #298 from FinalsClub/gitignore-usde-accreditation

Add cached USDE accreditation to gitignore. Also typo fix.

10 years agofix typo in csv name generation 298/head
Jacob Hilker [Wed, 22 Jan 2014 04:50:04 +0000 (23:50 -0500)]
fix typo in csv name generation

10 years agoadd accreditation.csv to .gitignore
Jacob Hilker [Wed, 22 Jan 2014 04:48:46 +0000 (23:48 -0500)]
add accreditation.csv to .gitignore

10 years agoPreserve port number in href tag for footer about link 297/head
Jacob Hilker [Wed, 22 Jan 2014 04:45:30 +0000 (23:45 -0500)]
Preserve port number in href tag for footer about link

10 years agoCapture names from 3rd party auth accounts
Charles Connell [Tue, 21 Jan 2014 15:55:12 +0000 (10:55 -0500)]
Capture names from 3rd party auth accounts

10 years agoMore pythonic
Charles Connell [Tue, 21 Jan 2014 15:54:29 +0000 (10:54 -0500)]
More pythonic

10 years agoLoad note iframe through JavaScript #287
Charles Connell [Tue, 21 Jan 2014 00:56:34 +0000 (19:56 -0500)]
Load note iframe through JavaScript #287

10 years agobeautifulsoup no longer adds extraneous whitespace, so the formatting is no longer...
Bryan [Sat, 18 Jan 2014 05:07:41 +0000 (00:07 -0500)]
beautifulsoup no longer adds extraneous whitespace, so the formatting is no longer broken on pdf2html files. closes #290

10 years agoadded pip workaround closes #282; documented what fabric deploy does.
Bryan [Fri, 17 Jan 2014 20:23:07 +0000 (15:23 -0500)]
added pip workaround closes #282; documented what fabric deploy does.

10 years agoRe-enable search indexing, S3 support for dev environment
Charles Connell [Fri, 17 Jan 2014 20:14:06 +0000 (15:14 -0500)]
Re-enable search indexing, S3 support for dev environment

10 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Bryan [Fri, 17 Jan 2014 17:35:26 +0000 (12:35 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

10 years agoworkaround because beautifulsoup breaks pdf2html prettifulness
Bryan [Fri, 17 Jan 2014 17:35:00 +0000 (12:35 -0500)]
workaround because beautifulsoup breaks pdf2html prettifulness

10 years agoFix to make user profile display
Charles Connell [Thu, 16 Jan 2014 16:55:47 +0000 (11:55 -0500)]
Fix to make user profile display

10 years agoMerge remote-tracking branch 'origin' into feature_html_on_s3
Bryan [Fri, 17 Jan 2014 05:33:47 +0000 (00:33 -0500)]
Merge remote-tracking branch 'origin' into feature_html_on_s3

10 years agoNote HTML uploads to S3 with correct content-type and permissions.
Bryan [Fri, 17 Jan 2014 05:31:40 +0000 (00:31 -0500)]
Note HTML uploads to S3 with correct content-type and permissions.

10 years agosmall fix to debug indicating database no longer stores HTML
Bryan [Fri, 17 Jan 2014 05:31:06 +0000 (00:31 -0500)]
small fix to debug indicating database no longer stores HTML

10 years agoSchool is deprecated inside Note.
Bryan [Fri, 17 Jan 2014 05:30:40 +0000 (00:30 -0500)]
School is deprecated inside Note.

10 years agomore copy pasta synchronization
Bryan [Fri, 17 Jan 2014 05:28:32 +0000 (00:28 -0500)]
more copy pasta synchronization

10 years agoSetting permissions on uploaded S3 files
Bryan [Fri, 17 Jan 2014 01:41:56 +0000 (20:41 -0500)]
Setting permissions on uploaded S3 files

10 years agosynchronzing vmdev with prod because copypasta.
Bryan [Fri, 17 Jan 2014 00:39:32 +0000 (19:39 -0500)]
synchronzing vmdev with prod because copypasta.

10 years agoURL priority problem
Charles Connell [Thu, 16 Jan 2014 16:38:19 +0000 (11:38 -0500)]
URL priority problem

10 years agoAllow trailing slash on course page #129
Charles Connell [Thu, 16 Jan 2014 15:06:18 +0000 (10:06 -0500)]
Allow trailing slash on course page #129

10 years agoslug must exist now, so this test is moot. it was probably never intended to be a...
Bryan [Thu, 16 Jan 2014 04:15:57 +0000 (23:15 -0500)]
slug must exist now, so this test is moot. it was probably never intended to be a feature worth testing that slug could be blank.

10 years agoweird merge problem?
Bryan [Thu, 16 Jan 2014 04:09:54 +0000 (23:09 -0500)]
weird merge problem?

10 years agorefactoring note to self
Bryan [Thu, 16 Jan 2014 03:49:32 +0000 (22:49 -0500)]
refactoring note to self

10 years agoFixed upload to S3, moved into Note, removed copy pasta
Bryan [Thu, 16 Jan 2014 03:37:56 +0000 (22:37 -0500)]
Fixed upload to S3, moved into Note, removed copy pasta

10 years agofixing same typo from copy pasta
Bryan [Tue, 14 Jan 2014 09:25:23 +0000 (04:25 -0500)]
fixing same typo from copy pasta

10 years agofixing typo
Bryan [Tue, 14 Jan 2014 09:18:44 +0000 (04:18 -0500)]
fixing typo

10 years agoactually have to specify utf-8, not default as advertised
Bryan [Tue, 14 Jan 2014 09:18:37 +0000 (04:18 -0500)]
actually have to specify utf-8, not default as advertised

10 years agoanother html source fix
Bryan [Tue, 14 Jan 2014 09:07:01 +0000 (04:07 -0500)]
another html source fix

10 years agogetting some mixed codecs, passthrough filters to clean up maybe
Bryan [Tue, 14 Jan 2014 09:06:10 +0000 (04:06 -0500)]
getting some mixed codecs, passthrough filters to clean up maybe

10 years agofixing html location and adding prints
Bryan [Tue, 14 Jan 2014 09:01:07 +0000 (04:01 -0500)]
fixing html location and adding prints

10 years agofixing iteration
Bryan [Tue, 14 Jan 2014 08:59:08 +0000 (03:59 -0500)]
fixing iteration

10 years agotemporary action to push note HTML onto S3
Bryan [Tue, 14 Jan 2014 08:57:57 +0000 (03:57 -0500)]
temporary action to push note HTML onto S3

10 years agodecreased memory footprint
Bryan [Tue, 14 Jan 2014 08:45:36 +0000 (03:45 -0500)]
decreased memory footprint

10 years agoupdated to use static HTML
Bryan [Tue, 14 Jan 2014 08:42:57 +0000 (03:42 -0500)]
updated to use static HTML

10 years agomigrations for previous commit
Bryan [Tue, 14 Jan 2014 08:38:03 +0000 (08:38 +0000)]
migrations for previous commit

10 years agoinitial attempt at #273 to replace HTML in database with static file HTML
Bryan [Tue, 14 Jan 2014 08:27:57 +0000 (03:27 -0500)]
initial attempt at #273 to replace HTML in database with static file HTML

10 years agoSmall 1.5 compatibility things
Charles Connell [Thu, 16 Jan 2014 00:34:11 +0000 (19:34 -0500)]
Small 1.5 compatibility things

10 years agoOptimize page load
Charles Connell [Thu, 16 Jan 2014 00:33:35 +0000 (19:33 -0500)]
Optimize page load

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 agofixing same typo from copy pasta
Bryan [Tue, 14 Jan 2014 09:25:23 +0000 (04:25 -0500)]
fixing same typo from copy pasta

10 years agofixing typo
Bryan [Tue, 14 Jan 2014 09:18:44 +0000 (04:18 -0500)]
fixing typo

10 years agoactually have to specify utf-8, not default as advertised
Bryan [Tue, 14 Jan 2014 09:18:37 +0000 (04:18 -0500)]
actually have to specify utf-8, not default as advertised

10 years agoanother html source fix
Bryan [Tue, 14 Jan 2014 09:07:01 +0000 (04:07 -0500)]
another html source fix

10 years agogetting some mixed codecs, passthrough filters to clean up maybe
Bryan [Tue, 14 Jan 2014 09:06:10 +0000 (04:06 -0500)]
getting some mixed codecs, passthrough filters to clean up maybe

10 years agofixing html location and adding prints
Bryan [Tue, 14 Jan 2014 09:01:07 +0000 (04:01 -0500)]
fixing html location and adding prints

10 years agofixing iteration
Bryan [Tue, 14 Jan 2014 08:59:08 +0000 (03:59 -0500)]
fixing iteration

10 years agotemporary action to push note HTML onto S3
Bryan [Tue, 14 Jan 2014 08:57:57 +0000 (03:57 -0500)]
temporary action to push note HTML onto S3

10 years agodecreased memory footprint
Bryan [Tue, 14 Jan 2014 08:45:36 +0000 (03:45 -0500)]
decreased memory footprint

10 years agoupdated to use static HTML
Bryan [Tue, 14 Jan 2014 08:42:57 +0000 (03:42 -0500)]
updated to use static HTML

10 years agomigrations for previous commit
Bryan [Tue, 14 Jan 2014 08:38:03 +0000 (08:38 +0000)]
migrations for previous commit

10 years agoinitial attempt at #273 to replace HTML in database with static file HTML
Bryan [Tue, 14 Jan 2014 08:27:57 +0000 (03:27 -0500)]
initial attempt at #273 to replace HTML in database with static file HTML

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.