Jacob Hilker [Sun, 2 Feb 2014 20:20:33 +0000 (15:20 -0500)]
Merge branch 'master' into 208-edit-course-properties-main
Conflicts:
karmaworld/templates/courses/course_detail.html
Jacob Hilker [Sun, 2 Feb 2014 19:46:21 +0000 (14:46 -0500)]
Use foundations hide class instead
Charles Connell [Sun, 2 Feb 2014 17:28:08 +0000 (12:28 -0500)]
Need to have disable versions of buttons always present
Charles Connell [Sun, 2 Feb 2014 16:36:40 +0000 (11:36 -0500)]
Making things more convenient for myself
Charles Connell [Sun, 2 Feb 2014 16:36:05 +0000 (11:36 -0500)]
Require download to thank and flag a note
Charles Connell [Sun, 2 Feb 2014 16:34:11 +0000 (11:34 -0500)]
Make local development of static assets easier, also toss an unused file
Jacob Hilker [Sun, 2 Feb 2014 00:35:03 +0000 (19:35 -0500)]
use middleware for revision
Jacob Hilker [Sun, 2 Feb 2014 00:03:13 +0000 (19:03 -0500)]
add reversion
Jacob Hilker [Sat, 1 Feb 2014 22:57:43 +0000 (17:57 -0500)]
add temp icon for edit; not quite a match
Jacob Hilker [Sat, 1 Feb 2014 21:55:08 +0000 (16:55 -0500)]
Merge branch 'master' into 208-edit-course-properties-main
Conflicts:
karmaworld/apps/courses/views.py
Jacob Hilker [Sat, 1 Feb 2014 21:52:39 +0000 (16:52 -0500)]
change spacing for course url
Jacob Hilker [Tue, 28 Jan 2014 22:37:43 +0000 (17:37 -0500)]
208 - Edit course properties - first pass
Bryan [Sat, 1 Feb 2014 02:08:43 +0000 (21:08 -0500)]
refactoring Filepicker usage, closes #308
Bryan [Thu, 30 Jan 2014 08:11:06 +0000 (03:11 -0500)]
Adding some host-based fab documentation while I was about chasing rabbits down holes.
Charles Connell [Wed, 29 Jan 2014 04:13:43 +0000 (23:13 -0500)]
Allow https
Charles Connell [Tue, 28 Jan 2014 22:11:23 +0000 (17:11 -0500)]
Need this import
Charles Connell [Tue, 28 Jan 2014 22:10:55 +0000 (17:10 -0500)]
S3 on dev.py
Charles Connell [Tue, 28 Jan 2014 00:26:36 +0000 (19:26 -0500)]
Bryan's comments #264
Charles Connell [Mon, 27 Jan 2014 20:18:51 +0000 (15:18 -0500)]
Migration for new unique constraint
Charles Connell [Mon, 27 Jan 2014 20:11:54 +0000 (15:11 -0500)]
Natural keys for user stuff #264
Charles Connell [Mon, 27 Jan 2014 20:04:39 +0000 (15:04 -0500)]
Bump South version to get new features
Charles Connell [Mon, 27 Jan 2014 20:04:21 +0000 (15:04 -0500)]
Clean up header on mobile
Charles Connell [Mon, 27 Jan 2014 19:18:53 +0000 (14:18 -0500)]
Change how indexden exceptions are handled #281
Charles Connell [Sun, 26 Jan 2014 22:07:26 +0000 (17:07 -0500)]
Restrict filepicker uploads by extension #275
Charles Connell [Sun, 26 Jan 2014 21:23:42 +0000 (16:23 -0500)]
Refresh after note upload for authenticated users #304
Charles Connell [Sun, 26 Jan 2014 20:59:00 +0000 (15:59 -0500)]
Remove link to iframe contents #302
Charles Connell [Sun, 26 Jan 2014 20:31:38 +0000 (15:31 -0500)]
Testing for karma events #306
Charles Connell [Fri, 24 Jan 2014 17:44:19 +0000 (12:44 -0500)]
Make sure note user exists
Charles Connell [Fri, 24 Jan 2014 17:42:45 +0000 (12:42 -0500)]
Confirm note download
Charles Connell [Fri, 24 Jan 2014 14:58:51 +0000 (09:58 -0500)]
Improved thank you message #304
Charles Connell [Fri, 24 Jan 2014 05:35:54 +0000 (00:35 -0500)]
Require login to download a note, shift points around #302
Charles Connell [Fri, 24 Jan 2014 04:34:21 +0000 (23:34 -0500)]
Allow users to decide their username on account creation #303
Charles Connell [Thu, 23 Jan 2014 22:06:22 +0000 (17:06 -0500)]
This is pretty important
Charles Connell [Thu, 23 Jan 2014 20:59:41 +0000 (15:59 -0500)]
Remind users they can get karma by confirming their email
Charles Connell [Thu, 23 Jan 2014 20:59:18 +0000 (15:59 -0500)]
Refactor GenericKarmaEvent
Charles Connell [Thu, 23 Jan 2014 20:44:27 +0000 (15:44 -0500)]
Reliably associate users with notes and give karma points #305
Charles Connell [Thu, 23 Jan 2014 16:49:52 +0000 (11:49 -0500)]
Points for email address confirm, fix little bug
Charles Connell [Thu, 23 Jan 2014 16:49:10 +0000 (11:49 -0500)]
Badges on separate line
Charles Connell [Thu, 23 Jan 2014 15:49:25 +0000 (10:49 -0500)]
Don't show note uploads on dashboard, it's redundant
Andrew Magliozzi [Thu, 23 Jan 2014 16:46:44 +0000 (11:46 -0500)]
adding AGPL license to karmaworld
Charles Connell [Thu, 23 Jan 2014 15:44:21 +0000 (10:44 -0500)]
Badges on user dashboard, refactoring
Charles Connell [Thu, 23 Jan 2014 00:48:36 +0000 (19:48 -0500)]
Less hardcoding
Charles Connell [Thu, 23 Jan 2014 00:47:06 +0000 (19:47 -0500)]
Courses don't have a user
Bryan [Thu, 23 Jan 2014 07:38:17 +0000 (02:38 -0500)]
Removing fabric-virtualenv, virtualenvwrapper. fixing secret permissions. closes #180 closes #300
Bryan Bonvallet [Thu, 23 Jan 2014 06:04:03 +0000 (22:04 -0800)]
Merge pull request #299 from FinalsClub/284-remove-sanitize-usde-confirmation
Remove confirmation from sanitize_usde_schools
Jacob Hilker [Thu, 23 Jan 2014 00:45:49 +0000 (19:45 -0500)]
update sanitize_usde_schools.py to not require confirmation for sanitization
Charles Connell [Thu, 23 Jan 2014 00:17:39 +0000 (19:17 -0500)]
Reputation system
Charles Connell [Wed, 22 Jan 2014 00:01:19 +0000 (19:01 -0500)]
Fix to note/user association
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
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.
Jacob Hilker [Wed, 22 Jan 2014 04:50:04 +0000 (23:50 -0500)]
fix typo in csv name generation
Jacob Hilker [Wed, 22 Jan 2014 04:48:46 +0000 (23:48 -0500)]
add accreditation.csv to .gitignore
Jacob Hilker [Wed, 22 Jan 2014 04:45:30 +0000 (23:45 -0500)]
Preserve port number in href tag for footer about link
Charles Connell [Tue, 21 Jan 2014 15:55:12 +0000 (10:55 -0500)]
Capture names from 3rd party auth accounts
Charles Connell [Tue, 21 Jan 2014 15:54:29 +0000 (10:54 -0500)]
More pythonic
Charles Connell [Tue, 21 Jan 2014 00:56:34 +0000 (19:56 -0500)]
Load note iframe through JavaScript #287
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
Bryan [Fri, 17 Jan 2014 20:23:07 +0000 (15:23 -0500)]
added pip workaround closes #282; documented what fabric deploy does.
Charles Connell [Fri, 17 Jan 2014 20:14:06 +0000 (15:14 -0500)]
Re-enable search indexing, S3 support for dev environment
Bryan [Fri, 17 Jan 2014 17:35:26 +0000 (12:35 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Bryan [Fri, 17 Jan 2014 17:35:00 +0000 (12:35 -0500)]
workaround because beautifulsoup breaks pdf2html prettifulness
Charles Connell [Thu, 16 Jan 2014 16:55:47 +0000 (11:55 -0500)]
Fix to make user profile display
Bryan [Fri, 17 Jan 2014 05:33:47 +0000 (00:33 -0500)]
Merge remote-tracking branch 'origin' into feature_html_on_s3
Bryan [Fri, 17 Jan 2014 05:31:40 +0000 (00:31 -0500)]
Note HTML uploads to S3 with correct content-type and permissions.
Bryan [Fri, 17 Jan 2014 05:31:06 +0000 (00:31 -0500)]
small fix to debug indicating database no longer stores HTML
Bryan [Fri, 17 Jan 2014 05:30:40 +0000 (00:30 -0500)]
School is deprecated inside Note.
Bryan [Fri, 17 Jan 2014 05:28:32 +0000 (00:28 -0500)]
more copy pasta synchronization
Bryan [Fri, 17 Jan 2014 01:41:56 +0000 (20:41 -0500)]
Setting permissions on uploaded S3 files
Bryan [Fri, 17 Jan 2014 00:39:32 +0000 (19:39 -0500)]
synchronzing vmdev with prod because copypasta.
Charles Connell [Thu, 16 Jan 2014 16:38:19 +0000 (11:38 -0500)]
URL priority problem
Charles Connell [Thu, 16 Jan 2014 15:06:18 +0000 (10:06 -0500)]
Allow trailing slash on course page #129
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.
Bryan [Thu, 16 Jan 2014 04:09:54 +0000 (23:09 -0500)]
weird merge problem?
Bryan [Thu, 16 Jan 2014 03:49:32 +0000 (22:49 -0500)]
refactoring note to self
Bryan [Thu, 16 Jan 2014 03:37:56 +0000 (22:37 -0500)]
Fixed upload to S3, moved into Note, removed copy pasta
Bryan [Tue, 14 Jan 2014 09:25:23 +0000 (04:25 -0500)]
fixing same typo from copy pasta
Bryan [Tue, 14 Jan 2014 09:18:44 +0000 (04:18 -0500)]
fixing typo
Bryan [Tue, 14 Jan 2014 09:18:37 +0000 (04:18 -0500)]
actually have to specify utf-8, not default as advertised
Bryan [Tue, 14 Jan 2014 09:07:01 +0000 (04:07 -0500)]
another html source fix
Bryan [Tue, 14 Jan 2014 09:06:10 +0000 (04:06 -0500)]
getting some mixed codecs, passthrough filters to clean up maybe
Bryan [Tue, 14 Jan 2014 09:01:07 +0000 (04:01 -0500)]
fixing html location and adding prints
Bryan [Tue, 14 Jan 2014 08:59:08 +0000 (03:59 -0500)]
fixing iteration
Bryan [Tue, 14 Jan 2014 08:57:57 +0000 (03:57 -0500)]
temporary action to push note HTML onto S3
Bryan [Tue, 14 Jan 2014 08:45:36 +0000 (03:45 -0500)]
decreased memory footprint
Bryan [Tue, 14 Jan 2014 08:42:57 +0000 (03:42 -0500)]
updated to use static HTML
Bryan [Tue, 14 Jan 2014 08:38:03 +0000 (08:38 +0000)]
migrations for previous commit
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
Charles Connell [Thu, 16 Jan 2014 00:34:11 +0000 (19:34 -0500)]
Small 1.5 compatibility things
Charles Connell [Thu, 16 Jan 2014 00:33:35 +0000 (19:33 -0500)]
Optimize page load
Charles Connell [Wed, 15 Jan 2014 21:08:39 +0000 (16:08 -0500)]
Gracefully handle failure when creating a UserProfile #270
Charles Connell [Tue, 14 Jan 2014 04:21:07 +0000 (23:21 -0500)]
Slightly nicer emails
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
Jacob Hilker [Wed, 15 Jan 2014 15:27:44 +0000 (10:27 -0500)]
Fix link to virtualbox website in README
Bryan [Wed, 15 Jan 2014 05:15:58 +0000 (00:15 -0500)]
FQDN fails, so just use the domain names without trailing period
Bryan [Wed, 15 Jan 2014 03:07:23 +0000 (22:07 -0500)]
Merge branch 'django155' of github.com:FinalsClub/karmaworld into django155
Charles Connell [Wed, 15 Jan 2014 00:07:38 +0000 (19:07 -0500)]
Fix failing test
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.
Bryan [Tue, 14 Jan 2014 23:35:38 +0000 (23:35 +0000)]
fixes and docs for VM to be more friendly for testing.
Bryan [Tue, 14 Jan 2014 22:58:16 +0000 (17:58 -0500)]
updating docs for debugging on prod system, such as a VM
Bryan [Tue, 14 Jan 2014 22:54:31 +0000 (17:54 -0500)]
improved version management; adding vm-specific pip reqs that inherits prod.