oweals/karmaworld.git
11 years agooption to prevent changing of school string field when adding a course. Code is comme...
Charles Holbrow [Thu, 18 Apr 2013 22:01:32 +0000 (18:01 -0400)]
option to prevent changing of school string field when adding a course. Code is commented out -- need to add functionality to change it once you have set it -- and functionality to prevent adding a course until you have chosen a shool #103

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 18 Apr 2013 20:58:28 +0000 (16:58 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoclient side verification of year field in note upload dialog
Charles Holbrow [Thu, 18 Apr 2013 20:58:23 +0000 (16:58 -0400)]
client side verification of year field in note upload dialog

11 years agoOnly overwrite the name of a newly uploaded file iff the user actualy entered a name...
Charles Holbrow [Thu, 18 Apr 2013 18:02:08 +0000 (14:02 -0400)]
Only overwrite the name of a newly uploaded file iff the user actualy entered a name in the name field

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 18 Apr 2013 17:57:40 +0000 (13:57 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 18 Apr 2013 17:37:39 +0000 (13:37 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agocleanup courses.views
Seth Woodworth [Thu, 18 Apr 2013 17:36:13 +0000 (13:36 -0400)]
cleanup courses.views

11 years agocheck if the note has html in note_detail template #105
Charles Holbrow [Thu, 18 Apr 2013 17:25:03 +0000 (13:25 -0400)]
check if the note has html in note_detail template #105

11 years agotweak the inverted_button for upload styling
Seth Woodworth [Thu, 18 Apr 2013 17:14:59 +0000 (13:14 -0400)]
tweak the inverted_button for upload styling

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 18 Apr 2013 17:10:29 +0000 (13:10 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding more spacing to add note partial form, ref #110
Seth Woodworth [Thu, 18 Apr 2013 17:10:05 +0000 (13:10 -0400)]
adding more spacing to add note partial form, ref #110

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 18 Apr 2013 17:08:23 +0000 (13:08 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agonicer browser button in note upload dialog
Charles Holbrow [Thu, 18 Apr 2013 17:08:17 +0000 (13:08 -0400)]
nicer browser button in note upload dialog

11 years agoupdating raw file rendering to class based view #105
Charles Holbrow [Thu, 18 Apr 2013 17:04:21 +0000 (13:04 -0400)]
updating raw file rendering to class based view #105

11 years agosplit note_list_entry out of course_detail into a new template file, fixes #6
Seth Woodworth [Thu, 18 Apr 2013 16:51:34 +0000 (12:51 -0400)]
split note_list_entry out of course_detail into a new template file, fixes #6

11 years agoadding link to course with course url, and css styles, fixes #98
Seth Woodworth [Thu, 18 Apr 2013 16:42:33 +0000 (12:42 -0400)]
adding link to course with course url, and css styles, fixes #98

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 18 Apr 2013 16:14:44 +0000 (12:14 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding .tags to .gitignore
Seth Woodworth [Thu, 18 Apr 2013 16:14:26 +0000 (12:14 -0400)]
adding .tags to .gitignore

11 years agoremoving ListView from urls imports, no longer required
Seth Woodworth [Thu, 18 Apr 2013 16:13:55 +0000 (12:13 -0400)]
removing ListView from urls imports, no longer required

11 years agoUpdates to the readme
Andrew Magliozzi [Tue, 16 Apr 2013 00:12:11 +0000 (21:12 -0300)]
Updates to the readme

Fixed a few of the sections marked TODO.

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 27 Mar 2013 21:51:54 +0000 (17:51 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadd errors to add-course form
Seth Woodworth [Wed, 27 Mar 2013 21:51:37 +0000 (17:51 -0400)]
add errors to add-course form

11 years agoadd javascript to auto-scroll down to form if there are errors
Seth Woodworth [Wed, 27 Mar 2013 21:51:23 +0000 (17:51 -0400)]
add javascript to auto-scroll down to form if there are errors

11 years agocombine home page ListView with the CourseSaveView and fixes form_invalid handling
Seth Woodworth [Wed, 27 Mar 2013 21:50:24 +0000 (17:50 -0400)]
combine home page ListView with the CourseSaveView and fixes form_invalid handling

11 years agoMerge branch 'master' of https://github.com/FinalsClub/karmaworld
Seth Woodworth [Tue, 26 Mar 2013 17:27:01 +0000 (17:27 +0000)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld

11 years agoadd additional handling for ocr-able files: pdf jpg png
Seth Woodworth [Tue, 26 Mar 2013 17:26:41 +0000 (17:26 +0000)]
add additional handling for ocr-able files: pdf jpg png

11 years agoFix errorous animate timer on upload status bar
Charles Holbrow [Tue, 26 Mar 2013 01:06:43 +0000 (21:06 -0400)]
Fix errorous animate timer on upload status bar

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Tue, 26 Mar 2013 00:53:25 +0000 (20:53 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agosave note disabled markup
Charles Holbrow [Tue, 26 Mar 2013 00:53:19 +0000 (20:53 -0400)]
save note disabled markup

11 years agofixing issue with save button not disabling on note-add form
Charles Holbrow [Tue, 26 Mar 2013 00:09:45 +0000 (20:09 -0400)]
fixing issue with save button not disabling on note-add form

11 years agoMerge branch 'master' of https://github.com/FinalsClub/karmaworld
Seth Woodworth [Tue, 26 Mar 2013 00:00:38 +0000 (00:00 +0000)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld

11 years agomodify gdrive to ocr pdf files by default, improved error handling and other warblega...
Seth Woodworth [Tue, 26 Mar 2013 00:00:25 +0000 (00:00 +0000)]
modify gdrive to ocr pdf files by default, improved error handling and other warblegarble fixes

11 years agoset Note.name to filename by default
Seth Woodworth [Mon, 25 Mar 2013 23:58:46 +0000 (23:58 +0000)]
set Note.name to filename by default

11 years agofixing typo in slug regen manage command
Charles Holbrow [Mon, 25 Mar 2013 23:56:35 +0000 (19:56 -0400)]
fixing typo in slug regen manage command

11 years agoadding management command to regenerate note slugs
Charles Holbrow [Mon, 25 Mar 2013 23:51:52 +0000 (19:51 -0400)]
adding management command to regenerate note slugs

11 years agore-ordering columns, prioritizing course name
Charles Holbrow [Mon, 25 Mar 2013 22:11:53 +0000 (18:11 -0400)]
re-ordering columns, prioritizing course name

11 years agofixing bug on import allowing two notes with the same name to create non-unique slugs
Charles Holbrow [Mon, 25 Mar 2013 21:14:54 +0000 (17:14 -0400)]
fixing bug on import allowing two notes with the same name to create non-unique slugs

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 25 Mar 2013 18:04:45 +0000 (14:04 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agonote_detail markup
Charles Holbrow [Mon, 25 Mar 2013 18:04:35 +0000 (14:04 -0400)]
note_detail markup

11 years agomoving the thankyou form to the right place, styling it and hiding it on adding anoth...
Seth Woodworth [Mon, 25 Mar 2013 17:44:40 +0000 (13:44 -0400)]
moving the thankyou form to the right place, styling it and hiding it on adding another note

11 years agoadd course url to partial form and start moving thankyou text
Seth Woodworth [Mon, 25 Mar 2013 17:08:33 +0000 (13:08 -0400)]
add course url to partial form and start moving thankyou text

11 years agoon Note.save, if upload date is greater than course.updated_at time, update course...
Seth Woodworth [Mon, 25 Mar 2013 16:41:09 +0000 (12:41 -0400)]
on Note.save, if upload date is greater than course.updated_at time, update course datetime, fixes #83

11 years agobetter debug messages for note form invalid
Seth Woodworth [Mon, 25 Mar 2013 16:22:58 +0000 (12:22 -0400)]
better debug messages for note form invalid

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 21:34:14 +0000 (17:34 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agohooking up close button on note upload dialog
Charles Holbrow [Thu, 21 Mar 2013 21:30:32 +0000 (17:30 -0400)]
hooking up close button on note upload dialog

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 21:18:56 +0000 (17:18 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoremove cruft from Course.save
Seth Woodworth [Thu, 21 Mar 2013 21:18:41 +0000 (17:18 -0400)]
remove cruft from Course.save

11 years agoremoving deep link functionality when uploading from the course list
Charles Holbrow [Thu, 21 Mar 2013 21:18:13 +0000 (17:18 -0400)]
removing deep link functionality when uploading from the course list

11 years agofinish the add course partial form
Seth Woodworth [Thu, 21 Mar 2013 21:18:05 +0000 (17:18 -0400)]
finish the add course partial form

11 years agofixing filepicker upload behavior - keep upload botton visible when user cancels...
Charles Holbrow [Thu, 21 Mar 2013 21:12:59 +0000 (17:12 -0400)]
fixing filepicker upload behavior - keep upload botton visible when user cancels file picker dialog

11 years agoupload note styling
Charles Holbrow [Thu, 21 Mar 2013 20:42:23 +0000 (16:42 -0400)]
upload note styling

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 19:28:30 +0000 (15:28 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years ago\#add-note fragment functionality four course-detail.html
Charles Holbrow [Thu, 21 Mar 2013 19:27:04 +0000 (15:27 -0400)]
\#add-note fragment functionality four course-detail.html

11 years agojs fixes
Seth Woodworth [Thu, 21 Mar 2013 19:08:25 +0000 (15:08 -0400)]
js fixes

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 19:03:14 +0000 (15:03 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agofix add-note form action and server handling for save
Seth Woodworth [Thu, 21 Mar 2013 19:02:52 +0000 (15:02 -0400)]
fix add-note form action and server handling for save

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 18:29:23 +0000 (14:29 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoremoving remnants of server-side filtering, including school_name field from Course...
Charles Holbrow [Thu, 21 Mar 2013 18:28:36 +0000 (14:28 -0400)]
removing remnants of server-side filtering, including school_name field from Course model

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 18:19:28 +0000 (14:19 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoupdating more js functionality for adding notes
Seth Woodworth [Thu, 21 Mar 2013 18:15:02 +0000 (14:15 -0400)]
updating more js functionality for adding notes

11 years agoprint errors on invalid forms?
Seth Woodworth [Thu, 21 Mar 2013 18:14:29 +0000 (14:14 -0400)]
print errors on invalid forms?

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 16:54:50 +0000 (12:54 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding js script to detect arrival at course-detail page with #add-note fragment
Charles Holbrow [Thu, 21 Mar 2013 16:54:36 +0000 (12:54 -0400)]
adding js script to detect arrival at course-detail page with #add-note fragment

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 16:46:48 +0000 (12:46 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoupdate lightboxupload javascript to work with new add-note partial
Seth Woodworth [Thu, 21 Mar 2013 16:46:03 +0000 (12:46 -0400)]
update lightboxupload javascript to work with new add-note partial

11 years agoadd style for add-note partial
Seth Woodworth [Thu, 21 Mar 2013 16:45:28 +0000 (12:45 -0400)]
add style for add-note partial

11 years agoimprove add-note partial layout
Seth Woodworth [Thu, 21 Mar 2013 16:45:07 +0000 (12:45 -0400)]
improve add-note partial layout

11 years agoadd TODO comment for NoteForm in view handling of invalid forms
Seth Woodworth [Thu, 21 Mar 2013 16:44:46 +0000 (12:44 -0400)]
add TODO comment for NoteForm in view handling of invalid forms

11 years agostyling upload button on course_list - turns orange on :hover instead of drawing...
Charles Holbrow [Wed, 20 Mar 2013 22:03:55 +0000 (18:03 -0400)]
styling upload button on course_list - turns orange on :hover instead of drawing border

11 years agorepositioning upload button, moving next, previous page links for dataTables to the...
Charles Holbrow [Wed, 20 Mar 2013 21:15:41 +0000 (17:15 -0400)]
repositioning upload button, moving next, previous page links for dataTables to the center

11 years agopointing the upload icon to <course-url>#add-note
Charles Holbrow [Wed, 20 Mar 2013 20:38:49 +0000 (16:38 -0400)]
pointing the upload icon to <course-url>#add-note

11 years agoadding upload button. Additional css for course_list
Charles Holbrow [Wed, 20 Mar 2013 20:24:05 +0000 (16:24 -0400)]
adding upload button. Additional css for course_list

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 20 Mar 2013 03:27:58 +0000 (23:27 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agofixing illegal font css shorthand for search bar
Charles Holbrow [Wed, 20 Mar 2013 03:27:51 +0000 (23:27 -0400)]
fixing illegal font css shorthand for search bar

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 20 Mar 2013 02:39:26 +0000 (22:39 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding Note.year for Academic year, not tested, status checkin, writing functionality...
Seth Woodworth [Wed, 20 Mar 2013 02:39:06 +0000 (22:39 -0400)]
adding Note.year for Academic year, not tested, status checkin, writing functionality to test now

11 years agomade new add-note-form and connected buttons to it, and rewrote css to match
Seth Woodworth [Wed, 20 Mar 2013 02:38:25 +0000 (22:38 -0400)]
made new add-note-form and connected buttons to it, and rewrote css to match

11 years agousing css instead of hard spaces to move the placeholder text to the right
Charles Holbrow [Wed, 20 Mar 2013 00:56:50 +0000 (20:56 -0400)]
using css instead of hard spaces to move the placeholder text to the right

11 years agoadding search icon to search bar
Charles Holbrow [Tue, 19 Mar 2013 20:36:39 +0000 (16:36 -0400)]
adding search icon to search bar

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Tue, 19 Mar 2013 17:01:41 +0000 (13:01 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoAdding support for FIltering by Date with the "Updated On" prefix. Also, re-formattin...
Charles Holbrow [Tue, 19 Mar 2013 17:01:29 +0000 (13:01 -0400)]
Adding support for FIltering by Date with the "Updated On" prefix. Also, re-formatting the date to match Nicks spec

11 years agotweak frontpage styling to match design
Seth Woodworth [Tue, 19 Mar 2013 01:06:32 +0000 (21:06 -0400)]
tweak frontpage styling to match design

11 years agofix search placeholder styling
Seth Woodworth [Tue, 19 Mar 2013 01:05:50 +0000 (21:05 -0400)]
fix search placeholder styling

11 years agoadding files noun from -- Pieter J. Smits, from The Noun Project
Seth Woodworth [Tue, 19 Mar 2013 00:21:02 +0000 (20:21 -0400)]
adding files noun from -- Pieter J. Smits, from The Noun Project

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 19 Mar 2013 00:03:20 +0000 (20:03 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agorenaming some css selectors for clarity and standarizing some spaces
Seth Woodworth [Tue, 19 Mar 2013 00:03:07 +0000 (20:03 -0400)]
renaming some css selectors for clarity and standarizing some spaces

11 years agofixing bug for list display -- sort by note count now working
Charles Holbrow [Mon, 18 Mar 2013 22:57:58 +0000 (18:57 -0400)]
fixing bug for list display -- sort by note count now working

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 18 Mar 2013 21:43:15 +0000 (17:43 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoappend "Notes" label to note count in tablesorter
Charles Holbrow [Mon, 18 Mar 2013 21:43:08 +0000 (17:43 -0400)]
append "Notes" label to note count in tablesorter

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 18 Mar 2013 21:32:39 +0000 (17:32 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

Conflicts:
karmaworld/assets/css/global.css

11 years ago90% done with note list styling
Seth Woodworth [Mon, 18 Mar 2013 21:31:04 +0000 (17:31 -0400)]
90% done with note list styling

11 years agoremove HOME from header
Seth Woodworth [Mon, 18 Mar 2013 21:30:38 +0000 (17:30 -0400)]
remove HOME from header

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 18 Mar 2013 20:51:17 +0000 (16:51 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoconverging on Nicks styling for course list
Charles Holbrow [Mon, 18 Mar 2013 20:51:03 +0000 (16:51 -0400)]
converging on Nicks styling for course list

11 years agoadding management command to strip existing Note.html into raw note.text for previews...
Seth Woodworth [Mon, 18 Mar 2013 20:39:12 +0000 (16:39 -0400)]
adding management command to strip existing Note.html into raw note.text for previews and search

11 years agoinclude font-awesome from cdn and restyle upload button
Seth Woodworth [Mon, 18 Mar 2013 17:19:44 +0000 (13:19 -0400)]
include font-awesome from cdn and restyle upload button

11 years agoMerge pull request #100 from LucianU/master
Seth Woodworth [Mon, 18 Mar 2013 16:48:49 +0000 (09:48 -0700)]
Merge pull request #100 from LucianU/master

All the work on the fabric tasks

11 years agocourse_detail a little more clean
Seth Woodworth [Mon, 18 Mar 2013 16:48:06 +0000 (12:48 -0400)]
course_detail a little more clean

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 18 Mar 2013 15:35:06 +0000 (11:35 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding rope to gitignore
Seth Woodworth [Mon, 18 Mar 2013 15:34:53 +0000 (11:34 -0400)]
adding rope to gitignore