Seth Woodworth [Wed, 26 Jun 2013 20:35:10 +0000 (20:35 +0000)]
Merge branch 'ppt-gdrive' of https://github.com/FinalsClub/karmaworld into ppt-gdrive
Conflicts:
karmaworld/apps/notes/gdrive.py
Seth Woodworth [Wed, 26 Jun 2013 20:34:12 +0000 (20:34 +0000)]
refactor functions out of gdrive
Seth Woodworth [Wed, 26 Jun 2013 20:33:00 +0000 (16:33 -0400)]
more tests for gdrive
Seth Woodworth [Wed, 26 Jun 2013 19:52:33 +0000 (15:52 -0400)]
remove ocr for ppt
Seth Woodworth [Wed, 26 Jun 2013 19:46:06 +0000 (15:46 -0400)]
adding some test changes to ppt handling for testing on beta
Seth Woodworth [Wed, 26 Jun 2013 17:15:14 +0000 (13:15 -0400)]
add amazon donation button to about page
Seth Woodworth [Wed, 26 Jun 2013 16:59:04 +0000 (12:59 -0400)]
make fontsizes smaller in school autocomplete to fit more schools
Seth Woodworth [Wed, 26 Jun 2013 16:58:25 +0000 (12:58 -0400)]
modify the autocomplete ajax method to return School.alias matches before name matches
Seth Woodworth [Wed, 26 Jun 2013 16:57:13 +0000 (12:57 -0400)]
add priority and alias models to School model, change default sort to use priority
Seth Woodworth [Sat, 15 Jun 2013 01:07:20 +0000 (21:07 -0400)]
pass a JS variable to viewer.js to load pdf.js workers from
Seth Woodworth [Sat, 15 Jun 2013 00:41:11 +0000 (20:41 -0400)]
simplify and future proof pdf specific template variables
Seth Woodworth [Sat, 15 Jun 2013 00:40:19 +0000 (20:40 -0400)]
update url routes with nicer .format()ing
Seth Woodworth [Sat, 15 Jun 2013 00:39:49 +0000 (20:39 -0400)]
update the pdf view to create the correct path to pdf media
Seth Woodworth [Sat, 15 Jun 2013 00:39:00 +0000 (20:39 -0400)]
add comment to note model
Seth Woodworth [Thu, 13 Jun 2013 19:00:48 +0000 (15:00 -0400)]
add media route for pdf handling
Seth Woodworth [Thu, 13 Jun 2013 19:00:17 +0000 (15:00 -0400)]
fix relative path to pdf worker
Seth Woodworth [Wed, 5 Jun 2013 21:10:18 +0000 (17:10 -0400)]
adding a simple favicon to base.html and an icon to the assets pack
Seth Woodworth [Tue, 4 Jun 2013 03:00:03 +0000 (23:00 -0400)]
rework note html for pdfview/
Seth Woodworth [Tue, 4 Jun 2013 02:59:28 +0000 (22:59 -0400)]
convert PDFView from TemplateView to DetailView
Seth Woodworth [Tue, 4 Jun 2013 02:59:13 +0000 (22:59 -0400)]
move the pdfview url to avoid the hungrier course/slug routes
Seth Woodworth [Tue, 4 Jun 2013 01:34:34 +0000 (21:34 -0400)]
including relevant js to pdfembed html
Seth Woodworth [Tue, 4 Jun 2013 01:34:17 +0000 (21:34 -0400)]
make notes render the pdfview in an iframe for pdfs
Seth Woodworth [Tue, 4 Jun 2013 01:33:51 +0000 (21:33 -0400)]
adding ltf declartion to <html> element for pdf.js
Seth Woodworth [Tue, 4 Jun 2013 01:32:57 +0000 (21:32 -0400)]
add viewer css
Seth Woodworth [Tue, 4 Jun 2013 01:32:38 +0000 (21:32 -0400)]
add a PDFView TemplateVie and a get_context_data value to views for Site/domain
Seth Woodworth [Tue, 4 Jun 2013 01:31:57 +0000 (21:31 -0400)]
rename pdf url
Seth Woodworth [Tue, 4 Jun 2013 01:31:02 +0000 (21:31 -0400)]
adding a url for testing pdfs
Seth Woodworth [Sun, 2 Jun 2013 17:47:11 +0000 (13:47 -0400)]
adding pdf.js toolbar images
Seth Woodworth [Fri, 31 May 2013 22:54:17 +0000 (18:54 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld into pdfjs
Andrew Magliozzi [Tue, 28 May 2013 17:02:33 +0000 (14:02 -0300)]
slight edit
Andrew Magliozzi [Tue, 28 May 2013 17:00:57 +0000 (14:00 -0300)]
slight changes to about page text
Seth Woodworth [Tue, 28 May 2013 05:17:04 +0000 (01:17 -0400)]
removing hero image from terms of service
Seth Woodworth [Tue, 28 May 2013 05:14:50 +0000 (01:14 -0400)]
checking in template additions
Seth Woodworth [Fri, 24 May 2013 01:21:04 +0000 (21:21 -0400)]
adding pdf.js and viewer.js mozilla libraries to a new vendor/js asset heirarchy
Seth Woodworth [Thu, 23 May 2013 22:50:51 +0000 (18:50 -0400)]
cleanup gdrive, closes #99
Seth Woodworth [Thu, 23 May 2013 21:28:33 +0000 (17:28 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 23 May 2013 21:25:57 +0000 (17:25 -0400)]
adding opentip for course_list upload tooltips
Robert Call [Thu, 23 May 2013 21:03:00 +0000 (18:03 -0300)]
Added celeryd tmp documentaiton
Added celeryd temp. documentation. Hope to replace with fabric stuff in the future.
Robert Call [Thu, 23 May 2013 20:38:42 +0000 (17:38 -0300)]
Added modified Zamboni celeryd init script
Seth Woodworth [Thu, 23 May 2013 19:18:14 +0000 (15:18 -0400)]
comment the strip_html management command
Seth Woodworth [Thu, 23 May 2013 19:17:37 +0000 (15:17 -0400)]
remove the photo of the team, replace it with the recut KarmaNotes video on Vimeo
Seth Woodworth [Wed, 22 May 2013 20:43:24 +0000 (16:43 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 22 May 2013 20:43:11 +0000 (16:43 -0400)]
adding note count to homepage intro text
NYNEX [Wed, 22 May 2013 16:52:56 +0000 (12:52 -0400)]
added missing deps. in os-install.rst
Charles Holbrow [Thu, 18 Apr 2013 22:01:43 +0000 (18:01 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
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
Seth Woodworth [Thu, 18 Apr 2013 21:29:09 +0000 (17:29 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 18 Apr 2013 21:28:54 +0000 (17:28 -0400)]
adding model method for sanitize_html
Seth Woodworth [Thu, 18 Apr 2013 21:28:35 +0000 (17:28 -0400)]
process note html for a target=_blank on file upload and adding managment command for old files
Charles Holbrow [Thu, 18 Apr 2013 20:58:28 +0000 (16:58 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 18 Apr 2013 20:58:23 +0000 (16:58 -0400)]
client side verification of year field in note upload dialog
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
Seth Woodworth [Thu, 18 Apr 2013 17:57:40 +0000 (13:57 -0400)]
Merge 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
Seth Woodworth [Thu, 18 Apr 2013 17:36:13 +0000 (13:36 -0400)]
cleanup courses.views
Charles Holbrow [Thu, 18 Apr 2013 17:25:03 +0000 (13:25 -0400)]
check if the note has html in note_detail template #105
Seth Woodworth [Thu, 18 Apr 2013 17:14:59 +0000 (13:14 -0400)]
tweak the inverted_button for upload styling
Seth Woodworth [Thu, 18 Apr 2013 17:10:29 +0000 (13:10 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 18 Apr 2013 17:10:05 +0000 (13:10 -0400)]
adding more spacing to add note partial form, ref #110
Charles Holbrow [Thu, 18 Apr 2013 17:08:23 +0000 (13:08 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 18 Apr 2013 17:08:17 +0000 (13:08 -0400)]
nicer browser button in note upload dialog
Charles Holbrow [Thu, 18 Apr 2013 17:04:21 +0000 (13:04 -0400)]
updating raw file rendering to class based view #105
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
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
Seth Woodworth [Thu, 18 Apr 2013 16:14:44 +0000 (12:14 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 18 Apr 2013 16:14:26 +0000 (12:14 -0400)]
adding .tags to .gitignore
Seth Woodworth [Thu, 18 Apr 2013 16:13:55 +0000 (12:13 -0400)]
removing ListView from urls imports, no longer required
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.
Seth Woodworth [Wed, 27 Mar 2013 21:51:54 +0000 (17:51 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 27 Mar 2013 21:51:37 +0000 (17:51 -0400)]
add errors to add-course form
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
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
Seth Woodworth [Tue, 26 Mar 2013 17:27:01 +0000 (17:27 +0000)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld
Seth Woodworth [Tue, 26 Mar 2013 17:26:41 +0000 (17:26 +0000)]
add additional handling for ocr-able files: pdf jpg png
Charles Holbrow [Tue, 26 Mar 2013 01:06:43 +0000 (21:06 -0400)]
Fix errorous animate timer on upload status bar
Charles Holbrow [Tue, 26 Mar 2013 00:53:25 +0000 (20:53 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Tue, 26 Mar 2013 00:53:19 +0000 (20:53 -0400)]
save note disabled markup
Charles Holbrow [Tue, 26 Mar 2013 00:09:45 +0000 (20:09 -0400)]
fixing issue with save button not disabling on note-add form
Seth Woodworth [Tue, 26 Mar 2013 00:00:38 +0000 (00:00 +0000)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld
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
Seth Woodworth [Mon, 25 Mar 2013 23:58:46 +0000 (23:58 +0000)]
set Note.name to filename by default
Charles Holbrow [Mon, 25 Mar 2013 23:56:35 +0000 (19:56 -0400)]
fixing typo in slug regen manage command
Charles Holbrow [Mon, 25 Mar 2013 23:51:52 +0000 (19:51 -0400)]
adding management command to regenerate note slugs
Charles Holbrow [Mon, 25 Mar 2013 22:11:53 +0000 (18:11 -0400)]
re-ordering columns, prioritizing course name
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
Charles Holbrow [Mon, 25 Mar 2013 18:04:45 +0000 (14:04 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 25 Mar 2013 18:04:35 +0000 (14:04 -0400)]
note_detail markup
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
Seth Woodworth [Mon, 25 Mar 2013 17:08:33 +0000 (13:08 -0400)]
add course url to partial form and start moving thankyou text
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
Seth Woodworth [Mon, 25 Mar 2013 16:22:58 +0000 (12:22 -0400)]
better debug messages for note form invalid
Charles Holbrow [Thu, 21 Mar 2013 21:34:14 +0000 (17:34 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 21:30:32 +0000 (17:30 -0400)]
hooking up close button on note upload dialog
Seth Woodworth [Thu, 21 Mar 2013 21:18:56 +0000 (17:18 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 21:18:41 +0000 (17:18 -0400)]
remove cruft from Course.save
Charles Holbrow [Thu, 21 Mar 2013 21:18:13 +0000 (17:18 -0400)]
removing deep link functionality when uploading from the course list
Seth Woodworth [Thu, 21 Mar 2013 21:18:05 +0000 (17:18 -0400)]
finish the add course partial form
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
Charles Holbrow [Thu, 21 Mar 2013 20:42:23 +0000 (16:42 -0400)]
upload note styling
Charles Holbrow [Thu, 21 Mar 2013 19:28:30 +0000 (15:28 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
projects / oweals / karmaworld.git / log