Charles Connell [Thu, 13 Mar 2014 23:12:48 +0000 (19:12 -0400)]
Try to get existing tests working
Bryan [Thu, 13 Mar 2014 07:20:54 +0000 (03:20 -0400)]
Replace explicit Prof/Course model with ManyToMany relationship.
Bryan [Wed, 12 Mar 2014 08:06:51 +0000 (04:06 -0400)]
abstracted Course-Department relationship and applied it\r\rto ProfessorTaught-Professor-Course-Department relationship. super button\rworks but does not forward. template not updated. need to use ManyToMany in\rcourse instead of ProfessorAffiliation.\r\r# Please enter the commit message for your changes. Lines starting\r# with '#' will be ignored, and an empty message aborts the commit.\r# On branch feature_course_add_with_dept\r# Your branch is ahead of 'origin/feature_course_add_with_dept' by 1 commit.\r#\r# Changes to be committed:\r# (use "git reset HEAD^1 <file>..." to unstage)\r#\r# modified: forms.py\r# modified: models.py\r# modified: views.py\r# modified: ../../templates/courses/course_detail.html\r# modified: ../../templates/courses/course_list_entry.html\r# modified: ../../templates/partial/add_course.html\r# modified: ../../templates/user_profile.html\r# new file: ../../utils/forms.py\r#
Bryan [Tue, 4 Mar 2014 09:49:51 +0000 (04:49 -0500)]
CourseListView cleanup in preparation for #294
Bryan [Mon, 3 Mar 2014 03:22:57 +0000 (03:22 +0000)]
using simpler django-ajax-selects-cascade, create dept when not found.
Bryan [Wed, 26 Feb 2014 08:13:27 +0000 (03:13 -0500)]
updated Django form with honeypot from master and styled form errors.
Bryan [Wed, 26 Feb 2014 08:10:25 +0000 (03:10 -0500)]
Adding Department to Admin interface
Bryan [Wed, 26 Feb 2014 06:24:11 +0000 (01:24 -0500)]
consolidating psycopg2 requirement and mirroring commit
c7dcc25de from dev.txt onto vmdev.txt
Bryan [Wed, 26 Feb 2014 06:12:05 +0000 (01:12 -0500)]
merging old commit with current master
Bryan [Wed, 26 Feb 2014 01:58:36 +0000 (20:58 -0500)]
actual fix for #346, accidently pushed broken code in previous commit
Bryan [Wed, 26 Feb 2014 01:57:20 +0000 (20:57 -0500)]
conditionally check honeypot errors, closes #346
Charles Connell [Tue, 25 Feb 2014 22:19:20 +0000 (17:19 -0500)]
Fuck it
Bryan Bonvallet [Tue, 25 Feb 2014 20:59:56 +0000 (15:59 -0500)]
Merge pull request #345 from FinalsClub/266-tablified-course-detail-fix-scope-issues
Remove scope issue for js variables in course_detail.html by moving dataTable call in course-detail.js
Jacob Hilker [Tue, 25 Feb 2014 19:15:42 +0000 (14:15 -0500)]
Remove scope issue for js variables in course_detail.html by moving dataTable call in course-detail.js
Bryan [Tue, 25 Feb 2014 05:53:31 +0000 (00:53 -0500)]
Merge branch 'feature_honeypot'
Bryan [Tue, 25 Feb 2014 05:53:16 +0000 (00:53 -0500)]
honeypot working for #210 and cleaned up the form error handling.
Bryan [Tue, 25 Feb 2014 01:02:58 +0000 (20:02 -0500)]
reverting previous optimization as it didn't optimize and it did obfuscate.
Bryan [Tue, 25 Feb 2014 00:35:13 +0000 (19:35 -0500)]
attempted speed enhancement for #342
Bryan [Mon, 24 Feb 2014 23:26:11 +0000 (18:26 -0500)]
Aggregate thanks over courses closes #342 . Cleaned up some DataTable code.
Bryan [Sun, 23 Feb 2014 04:16:41 +0000 (23:16 -0500)]
failed attempt to check for a blank honeypot, form doesn't clean()
Bryan [Sat, 22 Feb 2014 21:22:24 +0000 (16:22 -0500)]
hotfix from prod to upload MIT courses in a more reliable manner.
Bryan [Sat, 22 Feb 2014 21:20:58 +0000 (16:20 -0500)]
removing mixed content so video is no longer blocked.
Bryan [Sat, 22 Feb 2014 21:17:11 +0000 (16:17 -0500)]
removing school from course URL, using reverse for Course.get_absolute_url for #325
Bryan [Fri, 21 Feb 2014 06:46:10 +0000 (01:46 -0500)]
Renaming course_list_table.css to reflect more general nature.
Bryan [Fri, 21 Feb 2014 06:43:34 +0000 (01:43 -0500)]
for #266 : tablified course detail and note search results, cleaned up DataTable javascript a bit, then copy pasted it all over, cleaned up CSS.
Bryan [Thu, 20 Feb 2014 10:39:13 +0000 (05:39 -0500)]
making fabric better for VM deployment and btw #335
Bryan Bonvallet [Wed, 19 Feb 2014 20:47:46 +0000 (15:47 -0500)]
Need to use remote user not local user.
Bryan Bonvallet [Wed, 19 Feb 2014 20:46:05 +0000 (15:46 -0500)]
Making better use of the ssh-config output
Bryan Bonvallet [Wed, 19 Feb 2014 20:21:57 +0000 (15:21 -0500)]
Clarifying Vagrant SSH config for fabric
Jacob Hilker [Tue, 18 Feb 2014 23:34:54 +0000 (18:34 -0500)]
Remove a command
Jacob Hilker [Tue, 18 Feb 2014 23:34:04 +0000 (18:34 -0500)]
Fix README for setting up pdf2htmlEX
Charles Connell [Tue, 18 Feb 2014 23:04:03 +0000 (18:04 -0500)]
Remove PDFView #317
Charles Connell [Mon, 17 Feb 2014 21:02:29 +0000 (16:02 -0500)]
Oops
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
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
Jacob Hilker [Tue, 11 Feb 2014 22:28:57 +0000 (17:28 -0500)]
add sorting by length of School.name
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
Jacob Hilker [Tue, 11 Feb 2014 14:36:12 +0000 (09:36 -0500)]
require login for edit endpoint
Jacob Hilker [Tue, 11 Feb 2014 04:24:29 +0000 (23:24 -0500)]
Add ability to edit tags on notes
Bryan [Mon, 10 Feb 2014 09:21:48 +0000 (04:21 -0500)]
for #294 : replaced manual school_list JSON with module, moved template to Django Form, added Department to Add Course with autocomplete dependent upon school.
Charles Connell [Sat, 8 Feb 2014 21:18:12 +0000 (16:18 -0500)]
All developers are using psql locally now
Charles Connell [Sat, 8 Feb 2014 21:12:52 +0000 (16:12 -0500)]
Set canonical links in note contents #309
Charles Connell [Sat, 8 Feb 2014 15:59:00 +0000 (10:59 -0500)]
Another way to ensure that we serve static files locally
Bryan [Sat, 8 Feb 2014 00:16:27 +0000 (19:16 -0500)]
forgot semicolon
Bryan [Sat, 8 Feb 2014 00:08:16 +0000 (19:08 -0500)]
updating nginx for SSL-only operation. closes #319
Charles Connell [Fri, 7 Feb 2014 21:47:08 +0000 (16:47 -0500)]
Remove SSLRedirect #319
Charles Connell [Tue, 4 Feb 2014 22:21:42 +0000 (17:21 -0500)]
Pull out filepicker JS code #312
Bryan [Fri, 7 Feb 2014 07:10:55 +0000 (02:10 -0500)]
Make use of FilepickerFile to retrieve Download URL, closes #316
Bryan [Fri, 7 Feb 2014 07:10:29 +0000 (02:10 -0500)]
additional support for Django CSRF verification.
Bryan [Fri, 7 Feb 2014 07:09:06 +0000 (02:09 -0500)]
Reworking logic of redirection, closes #320
Bryan [Fri, 7 Feb 2014 07:07:51 +0000 (02:07 -0500)]
Pass from nginx to Django, closes #324
Bryan [Fri, 7 Feb 2014 07:06:36 +0000 (02:06 -0500)]
pass HTTPS status from nginx to Django, closes #322
Bryan [Fri, 7 Feb 2014 07:04:06 +0000 (02:04 -0500)]
adding SSL to VM, closes #318
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
Jacob Hilker [Tue, 4 Feb 2014 21:28:54 +0000 (16:28 -0500)]
require points to edit courses
Charles Connell [Tue, 4 Feb 2014 21:27:17 +0000 (16:27 -0500)]
Slightly improved edit icon
Jacob Hilker [Tue, 4 Feb 2014 21:00:51 +0000 (16:00 -0500)]
fix name of reversion in common.txt
Bryan [Tue, 4 Feb 2014 06:16:20 +0000 (01:16 -0500)]
upstream modifications obviate the need for this hack
Charles Connell [Mon, 3 Feb 2014 20:27:14 +0000 (15:27 -0500)]
Redirect authenticated users to HTTPS pages
Charles Connell [Sun, 2 Feb 2014 23:14:54 +0000 (18:14 -0500)]
Note text in noscript tag #309
Jacob Hilker [Sun, 2 Feb 2014 23:14:11 +0000 (18:14 -0500)]
minor cleanup
Jacob Hilker [Sun, 2 Feb 2014 22:06:41 +0000 (17:06 -0500)]
add reversion handler to admin site for courses
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
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
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 18:52:31 +0000 (13:52 -0500)]
Save flag and thank events on users now, not sessions
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