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
Charles Holbrow [Thu, 21 Mar 2013 19:27:04 +0000 (15:27 -0400)]
\#add-note fragment functionality four course-detail.html
Seth Woodworth [Thu, 21 Mar 2013 19:08:25 +0000 (15:08 -0400)]
js fixes
Seth Woodworth [Thu, 21 Mar 2013 19:03:14 +0000 (15:03 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 19:02:52 +0000 (15:02 -0400)]
fix add-note form action and server handling for save
Charles Holbrow [Thu, 21 Mar 2013 18:29:23 +0000 (14:29 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
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
Seth Woodworth [Thu, 21 Mar 2013 18:19:28 +0000 (14:19 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 18:15:02 +0000 (14:15 -0400)]
updating more js functionality for adding notes
Seth Woodworth [Thu, 21 Mar 2013 18:14:29 +0000 (14:14 -0400)]
print errors on invalid forms?
Charles Holbrow [Thu, 21 Mar 2013 16:54:50 +0000 (12:54 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
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
Seth Woodworth [Thu, 21 Mar 2013 16:46:48 +0000 (12:46 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 16:46:03 +0000 (12:46 -0400)]
update lightboxupload javascript to work with new add-note partial
Seth Woodworth [Thu, 21 Mar 2013 16:45:28 +0000 (12:45 -0400)]
add style for add-note partial
Seth Woodworth [Thu, 21 Mar 2013 16:45:07 +0000 (12:45 -0400)]
improve add-note partial layout
Seth Woodworth [Thu, 21 Mar 2013 16:44:46 +0000 (12:44 -0400)]
add TODO comment for NoteForm in view handling of invalid forms
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
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
Charles Holbrow [Wed, 20 Mar 2013 20:38:49 +0000 (16:38 -0400)]
pointing the upload icon to <course-url>#add-note
Charles Holbrow [Wed, 20 Mar 2013 20:24:05 +0000 (16:24 -0400)]
adding upload button. Additional css for course_list
Charles Holbrow [Wed, 20 Mar 2013 03:27:58 +0000 (23:27 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 20 Mar 2013 03:27:51 +0000 (23:27 -0400)]
fixing illegal font css shorthand for search bar
Seth Woodworth [Wed, 20 Mar 2013 02:39:26 +0000 (22:39 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
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
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
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
Charles Holbrow [Tue, 19 Mar 2013 20:36:39 +0000 (16:36 -0400)]
adding search icon to search bar
Charles Holbrow [Tue, 19 Mar 2013 17:01:41 +0000 (13:01 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
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
Seth Woodworth [Tue, 19 Mar 2013 01:06:32 +0000 (21:06 -0400)]
tweak frontpage styling to match design
Seth Woodworth [Tue, 19 Mar 2013 01:05:50 +0000 (21:05 -0400)]
fix search placeholder styling
Seth Woodworth [Tue, 19 Mar 2013 00:21:02 +0000 (20:21 -0400)]
adding files noun from -- Pieter J. Smits, from The Noun Project
Seth Woodworth [Tue, 19 Mar 2013 00:03:20 +0000 (20:03 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 19 Mar 2013 00:03:07 +0000 (20:03 -0400)]
renaming some css selectors for clarity and standarizing some spaces
Charles Holbrow [Mon, 18 Mar 2013 22:57:58 +0000 (18:57 -0400)]
fixing bug for list display -- sort by note count now working
Charles Holbrow [Mon, 18 Mar 2013 21:43:15 +0000 (17:43 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 18 Mar 2013 21:43:08 +0000 (17:43 -0400)]
append "Notes" label to note count in tablesorter
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
Seth Woodworth [Mon, 18 Mar 2013 21:31:04 +0000 (17:31 -0400)]
90% done with note list styling
Seth Woodworth [Mon, 18 Mar 2013 21:30:38 +0000 (17:30 -0400)]
remove HOME from header
Charles Holbrow [Mon, 18 Mar 2013 20:51:17 +0000 (16:51 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 18 Mar 2013 20:51:03 +0000 (16:51 -0400)]
converging on Nicks styling for course list
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
Seth Woodworth [Mon, 18 Mar 2013 17:19:44 +0000 (13:19 -0400)]
include font-awesome from cdn and restyle upload button
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
Seth Woodworth [Mon, 18 Mar 2013 16:48:06 +0000 (12:48 -0400)]
course_detail a little more clean
Seth Woodworth [Mon, 18 Mar 2013 15:35:06 +0000 (11:35 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 18 Mar 2013 15:34:53 +0000 (11:34 -0400)]
adding rope to gitignore
Seth Woodworth [Mon, 18 Mar 2013 15:34:03 +0000 (11:34 -0400)]
adding mroe to gitingore
Seth Woodworth [Mon, 18 Mar 2013 15:33:27 +0000 (11:33 -0400)]
restyling course page (note index)
Seth Woodworth [Mon, 18 Mar 2013 15:32:43 +0000 (11:32 -0400)]
in progress global restyle
Charles Holbrow [Thu, 14 Mar 2013 23:06:13 +0000 (19:06 -0400)]
style fixes
Charles Holbrow [Thu, 14 Mar 2013 17:45:22 +0000 (13:45 -0400)]
working on Nick\'s style on the main page
Charles Holbrow [Thu, 14 Mar 2013 15:12:40 +0000 (11:12 -0400)]
course add lightbox now dismisses correctly #95
Charles Holbrow [Thu, 14 Mar 2013 14:42:59 +0000 (10:42 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Lucian Ursu [Fri, 8 Mar 2013 13:04:39 +0000 (15:04 +0200)]
Added Install instructions to the README.
Lucian Ursu [Fri, 8 Mar 2013 13:04:10 +0000 (15:04 +0200)]
Made deployment work on local machines.
Seth Woodworth [Wed, 6 Mar 2013 23:15:20 +0000 (18:15 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 6 Mar 2013 23:15:03 +0000 (18:15 -0500)]
add function so a course can return self.updated_at as a formatted string
Charles Holbrow [Fri, 1 Mar 2013 18:51:06 +0000 (13:51 -0500)]
specify number of results in a course List page
Charles Holbrow [Fri, 1 Mar 2013 18:27:25 +0000 (13:27 -0500)]
course list styling
Charles Holbrow [Fri, 1 Mar 2013 18:25:33 +0000 (13:25 -0500)]
course list and and filter styling
Charles Holbrow [Fri, 1 Mar 2013 17:01:24 +0000 (12:01 -0500)]
removing page length drop down selector on course_list, back to client side sorting
Lucian Ursu [Thu, 28 Feb 2013 19:27:32 +0000 (21:27 +0200)]
Added another task that handles the first deploy.
Lucian Ursu [Thu, 28 Feb 2013 19:25:13 +0000 (21:25 +0200)]
Changed the deploy task to only deploy new changes and not handle initial setup.
Lucian Ursu [Thu, 28 Feb 2013 18:46:31 +0000 (20:46 +0200)]
Renamed and fixed a task and added more tasks, all related to supervisor.
Lucian Ursu [Thu, 28 Feb 2013 18:24:25 +0000 (20:24 +0200)]
Small adjustments to the way celeryd and celerybeat are started.
Lucian Ursu [Thu, 28 Feb 2013 18:23:10 +0000 (20:23 +0200)]
Fixed typos in config files.
Lucian Ursu [Thu, 28 Feb 2013 16:36:31 +0000 (18:36 +0200)]
Upgraded Fabric version.
Lucian Ursu [Thu, 28 Feb 2013 15:58:58 +0000 (17:58 +0200)]
Fixed supervisor version in requirements file.
Charles Holbrow [Wed, 27 Feb 2013 23:58:38 +0000 (18:58 -0500)]
Adding redundant school_name field to courses to enable faster server side filtering. requires: for c in Course.objects.all(): c.save()
Charles Holbrow [Wed, 27 Feb 2013 23:23:48 +0000 (18:23 -0500)]
Filtering on the server side
projects / oweals / karmaworld.git / log