oweals/karmaworld.git
10 years agoIf we can't test search indexing properly, let's not test it at all
Charles Connell [Mon, 17 Feb 2014 20:53:23 +0000 (15:53 -0500)]
If we can't test search indexing properly, let's not test it at all

10 years agoMerge pull request #330 from FinalsClub/131-add-sorting-by-school-name
Charles Connell [Tue, 11 Feb 2014 22:30:01 +0000 (17:30 -0500)]
Merge pull request #330 from FinalsClub/131-add-sorting-by-school-name

add sorting by length of School.name

10 years agoadd sorting by length of School.name 330/head
Jacob Hilker [Tue, 11 Feb 2014 22:28:57 +0000 (17:28 -0500)]
add sorting by length of School.name

10 years agoMerge pull request #329 from FinalsClub/315-editable-note-tags
Charles Connell [Tue, 11 Feb 2014 22:14:11 +0000 (17:14 -0500)]
Merge pull request #329 from FinalsClub/315-editable-note-tags

Add ability to edit tags on notes

10 years agorequire login for edit endpoint 329/head
Jacob Hilker [Tue, 11 Feb 2014 14:36:12 +0000 (09:36 -0500)]
require login for edit endpoint

10 years agoAdd ability to edit tags on notes
Jacob Hilker [Tue, 11 Feb 2014 04:24:29 +0000 (23:24 -0500)]
Add ability to edit tags on notes

10 years agoAll developers are using psql locally now
Charles Connell [Sat, 8 Feb 2014 21:18:12 +0000 (16:18 -0500)]
All developers are using psql locally now

10 years agoSet canonical links in note contents #309
Charles Connell [Sat, 8 Feb 2014 21:12:52 +0000 (16:12 -0500)]
Set canonical links in note contents #309

10 years agoAnother way to ensure that we serve static files locally
Charles Connell [Sat, 8 Feb 2014 15:59:00 +0000 (10:59 -0500)]
Another way to ensure that we serve static files locally

10 years agoforgot semicolon
Bryan [Sat, 8 Feb 2014 00:16:27 +0000 (19:16 -0500)]
forgot semicolon

10 years agoupdating nginx for SSL-only operation. closes #319
Bryan [Sat, 8 Feb 2014 00:08:16 +0000 (19:08 -0500)]
updating nginx for SSL-only operation. closes #319

10 years agoRemove SSLRedirect #319
Charles Connell [Fri, 7 Feb 2014 21:47:08 +0000 (16:47 -0500)]
Remove SSLRedirect #319

10 years agoPull out filepicker JS code #312
Charles Connell [Tue, 4 Feb 2014 22:21:42 +0000 (17:21 -0500)]
Pull out filepicker JS code #312

10 years agoMake use of FilepickerFile to retrieve Download URL, closes #316
Bryan [Fri, 7 Feb 2014 07:10:55 +0000 (02:10 -0500)]
Make use of FilepickerFile to retrieve Download URL, closes #316

10 years agoadditional support for Django CSRF verification.
Bryan [Fri, 7 Feb 2014 07:10:29 +0000 (02:10 -0500)]
additional support for Django CSRF verification.

10 years agoReworking logic of redirection, closes #320
Bryan [Fri, 7 Feb 2014 07:09:06 +0000 (02:09 -0500)]
Reworking logic of redirection, closes #320

10 years agoPass from nginx to Django, closes #324
Bryan [Fri, 7 Feb 2014 07:07:51 +0000 (02:07 -0500)]
Pass  from nginx to Django, closes #324

10 years agopass HTTPS status from nginx to Django, closes #322
Bryan [Fri, 7 Feb 2014 07:06:36 +0000 (02:06 -0500)]
pass HTTPS status from nginx to Django, closes #322

10 years agoadding SSL to VM, closes #318
Bryan [Fri, 7 Feb 2014 07:04:06 +0000 (02:04 -0500)]
adding SSL to VM, closes #318

10 years agoMerge pull request #314 from FinalsClub/208-edit-course-properties-main
Charles Connell [Tue, 4 Feb 2014 21:46:26 +0000 (13:46 -0800)]
Merge pull request #314 from FinalsClub/208-edit-course-properties-main

208 - Edit course properties

10 years agorequire points to edit courses 314/head
Jacob Hilker [Tue, 4 Feb 2014 21:28:54 +0000 (16:28 -0500)]
require points to edit courses

10 years agoSlightly improved edit icon
Charles Connell [Tue, 4 Feb 2014 21:27:17 +0000 (16:27 -0500)]
Slightly improved edit icon

10 years agofix name of reversion in common.txt
Jacob Hilker [Tue, 4 Feb 2014 21:00:51 +0000 (16:00 -0500)]
fix name of reversion in common.txt

10 years agoupstream modifications obviate the need for this hack
Bryan [Tue, 4 Feb 2014 06:16:20 +0000 (01:16 -0500)]
upstream modifications obviate the need for this hack

10 years agoRedirect authenticated users to HTTPS pages
Charles Connell [Mon, 3 Feb 2014 20:27:14 +0000 (15:27 -0500)]
Redirect authenticated users to HTTPS pages

10 years agoNote text in noscript tag #309
Charles Connell [Sun, 2 Feb 2014 23:14:54 +0000 (18:14 -0500)]
Note text in noscript tag #309

10 years agominor cleanup
Jacob Hilker [Sun, 2 Feb 2014 23:14:11 +0000 (18:14 -0500)]
minor cleanup

10 years agoadd reversion handler to admin site for courses
Jacob Hilker [Sun, 2 Feb 2014 22:06:41 +0000 (17:06 -0500)]
add reversion handler to admin site for courses

10 years agoredirect to the new page and update the slug on name changes
Jacob Hilker [Sun, 2 Feb 2014 21:36:24 +0000 (16:36 -0500)]
redirect to the new page and update the slug on name changes

10 years agoadd uniqueness validation on name and school so we dont get a 500 error when this...
Jacob Hilker [Sun, 2 Feb 2014 20:42:29 +0000 (15:42 -0500)]
add uniqueness validation on name and school so we dont get a 500 error when this occurs

10 years agoMerge branch 'master' into 208-edit-course-properties-main
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

10 years agoUse foundations hide class instead
Jacob Hilker [Sun, 2 Feb 2014 19:46:21 +0000 (14:46 -0500)]
Use foundations hide class instead

10 years agoSave flag and thank events on users now, not sessions
Charles Connell [Sun, 2 Feb 2014 18:52:31 +0000 (13:52 -0500)]
Save flag and thank events on users now, not sessions

10 years agoNeed to have disable versions of buttons always present
Charles Connell [Sun, 2 Feb 2014 17:28:08 +0000 (12:28 -0500)]
Need to have disable versions of buttons always present

10 years agoMaking things more convenient for myself
Charles Connell [Sun, 2 Feb 2014 16:36:40 +0000 (11:36 -0500)]
Making things more convenient for myself

10 years agoRequire download to thank and flag a note
Charles Connell [Sun, 2 Feb 2014 16:36:05 +0000 (11:36 -0500)]
Require download to thank and flag a note

10 years agoMake local development of static assets easier, also toss an unused file
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

10 years agouse middleware for revision
Jacob Hilker [Sun, 2 Feb 2014 00:35:03 +0000 (19:35 -0500)]
use middleware for revision

10 years agoadd reversion
Jacob Hilker [Sun, 2 Feb 2014 00:03:13 +0000 (19:03 -0500)]
add reversion

10 years agoadd temp icon for edit; not quite a match
Jacob Hilker [Sat, 1 Feb 2014 22:57:43 +0000 (17:57 -0500)]
add temp icon for edit; not quite a match

10 years agoMerge branch 'master' into 208-edit-course-properties-main
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

10 years agochange spacing for course url
Jacob Hilker [Sat, 1 Feb 2014 21:52:39 +0000 (16:52 -0500)]
change spacing for course url

10 years ago208 - Edit course properties - first pass
Jacob Hilker [Tue, 28 Jan 2014 22:37:43 +0000 (17:37 -0500)]
208 - Edit course properties - first pass

10 years agorefactoring Filepicker usage, closes #308
Bryan [Sat, 1 Feb 2014 02:08:43 +0000 (21:08 -0500)]
refactoring Filepicker usage, closes #308

10 years agoAdding some host-based fab documentation while I was about chasing rabbits down holes.
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.

10 years agoAllow https
Charles Connell [Wed, 29 Jan 2014 04:13:43 +0000 (23:13 -0500)]
Allow https

10 years agoNeed this import
Charles Connell [Tue, 28 Jan 2014 22:11:23 +0000 (17:11 -0500)]
Need this import

10 years agoS3 on dev.py
Charles Connell [Tue, 28 Jan 2014 22:10:55 +0000 (17:10 -0500)]
S3 on dev.py

10 years agoBryan's comments #264
Charles Connell [Tue, 28 Jan 2014 00:26:36 +0000 (19:26 -0500)]
Bryan's comments #264

10 years agoMigration for new unique constraint
Charles Connell [Mon, 27 Jan 2014 20:18:51 +0000 (15:18 -0500)]
Migration for new unique constraint

10 years agoNatural keys for user stuff #264
Charles Connell [Mon, 27 Jan 2014 20:11:54 +0000 (15:11 -0500)]
Natural keys for user stuff #264

10 years agoBump South version to get new features
Charles Connell [Mon, 27 Jan 2014 20:04:39 +0000 (15:04 -0500)]
Bump South version to get new features

10 years agoClean up header on mobile
Charles Connell [Mon, 27 Jan 2014 20:04:21 +0000 (15:04 -0500)]
Clean up header on mobile

10 years agoChange how indexden exceptions are handled #281
Charles Connell [Mon, 27 Jan 2014 19:18:53 +0000 (14:18 -0500)]
Change how indexden exceptions are handled #281

10 years agoRestrict filepicker uploads by extension #275
Charles Connell [Sun, 26 Jan 2014 22:07:26 +0000 (17:07 -0500)]
Restrict filepicker uploads by extension #275

10 years agoRefresh after note upload for authenticated users #304
Charles Connell [Sun, 26 Jan 2014 21:23:42 +0000 (16:23 -0500)]
Refresh after note upload for authenticated users #304

10 years agoRemove link to iframe contents #302
Charles Connell [Sun, 26 Jan 2014 20:59:00 +0000 (15:59 -0500)]
Remove link to iframe contents #302

10 years agoTesting for karma events #306
Charles Connell [Sun, 26 Jan 2014 20:31:38 +0000 (15:31 -0500)]
Testing for karma events #306

10 years agoMake sure note user exists
Charles Connell [Fri, 24 Jan 2014 17:44:19 +0000 (12:44 -0500)]
Make sure note user exists

10 years agoConfirm note download
Charles Connell [Fri, 24 Jan 2014 17:42:45 +0000 (12:42 -0500)]
Confirm note download

10 years agoImproved thank you message #304
Charles Connell [Fri, 24 Jan 2014 14:58:51 +0000 (09:58 -0500)]
Improved thank you message #304

10 years agoRequire login to download a note, shift points around #302
Charles Connell [Fri, 24 Jan 2014 05:35:54 +0000 (00:35 -0500)]
Require login to download a note, shift points around #302

10 years agoAllow users to decide their username on account creation #303
Charles Connell [Fri, 24 Jan 2014 04:34:21 +0000 (23:34 -0500)]
Allow users to decide their username on account creation #303

10 years agoThis is pretty important
Charles Connell [Thu, 23 Jan 2014 22:06:22 +0000 (17:06 -0500)]
This is pretty important

10 years agoRemind users they can get karma by confirming their email
Charles Connell [Thu, 23 Jan 2014 20:59:41 +0000 (15:59 -0500)]
Remind users they can get karma by confirming their email

10 years agoRefactor GenericKarmaEvent
Charles Connell [Thu, 23 Jan 2014 20:59:18 +0000 (15:59 -0500)]
Refactor GenericKarmaEvent

10 years agoReliably associate users with notes and give karma points #305
Charles Connell [Thu, 23 Jan 2014 20:44:27 +0000 (15:44 -0500)]
Reliably associate users with notes and give karma points #305

10 years agoPoints for email address confirm, fix little bug
Charles Connell [Thu, 23 Jan 2014 16:49:52 +0000 (11:49 -0500)]
Points for email address confirm, fix little bug

10 years agoBadges on separate line
Charles Connell [Thu, 23 Jan 2014 16:49:10 +0000 (11:49 -0500)]
Badges on separate line

10 years agoDon't show note uploads on dashboard, it's redundant
Charles Connell [Thu, 23 Jan 2014 15:49:25 +0000 (10:49 -0500)]
Don't show note uploads on dashboard, it's redundant

10 years agoadding AGPL license to karmaworld
Andrew Magliozzi [Thu, 23 Jan 2014 16:46:44 +0000 (11:46 -0500)]
adding AGPL license to karmaworld

10 years agoBadges on user dashboard, refactoring
Charles Connell [Thu, 23 Jan 2014 15:44:21 +0000 (10:44 -0500)]
Badges on user dashboard, refactoring

10 years agoLess hardcoding
Charles Connell [Thu, 23 Jan 2014 00:48:36 +0000 (19:48 -0500)]
Less hardcoding

10 years agoCourses don't have a user
Charles Connell [Thu, 23 Jan 2014 00:47:06 +0000 (19:47 -0500)]
Courses don't have a user

10 years agoRemoving fabric-virtualenv, virtualenvwrapper. fixing secret permissions. closes...
Bryan [Thu, 23 Jan 2014 07:38:17 +0000 (02:38 -0500)]
Removing fabric-virtualenv, virtualenvwrapper. fixing secret permissions. closes #180 closes #300

10 years agoMerge pull request #299 from FinalsClub/284-remove-sanitize-usde-confirmation
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

10 years agoupdate sanitize_usde_schools.py to not require confirmation for sanitization 299/head
Jacob Hilker [Thu, 23 Jan 2014 00:45:49 +0000 (19:45 -0500)]
update sanitize_usde_schools.py to not require confirmation for sanitization

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.