Charles Connell [Sat, 5 Apr 2014 13:43:04 +0000 (09:43 -0400)]
File name upload fix
Charles Connell [Tue, 1 Apr 2014 21:28:47 +0000 (17:28 -0400)]
Further mucking with table word breaking
Charles Connell [Tue, 1 Apr 2014 21:22:35 +0000 (17:22 -0400)]
Mucking with table word breaking
Charles Connell [Tue, 1 Apr 2014 21:10:31 +0000 (17:10 -0400)]
Change header library
Charles Connell [Tue, 1 Apr 2014 01:06:51 +0000 (21:06 -0400)]
Account pages, about page, fix note/user associations
Charles Connell [Sun, 30 Mar 2014 16:33:09 +0000 (12:33 -0400)]
Note search page, starting on account pages
Charles Connell [Sat, 29 Mar 2014 21:16:35 +0000 (17:16 -0400)]
Switch to foundation modals
Charles Connell [Wed, 26 Mar 2014 14:48:08 +0000 (10:48 -0400)]
Note search
Charles Connell [Tue, 25 Mar 2014 21:24:56 +0000 (17:24 -0400)]
Splash text size
Charles Connell [Tue, 25 Mar 2014 20:57:59 +0000 (16:57 -0400)]
Oops
Charles Connell [Tue, 25 Mar 2014 20:51:43 +0000 (16:51 -0400)]
Header fixes
Charles Connell [Tue, 25 Mar 2014 20:15:55 +0000 (16:15 -0400)]
Account pages on same template tree
Charles Connell [Tue, 25 Mar 2014 15:32:42 +0000 (11:32 -0400)]
Update allowed hosts
Charles Connell [Tue, 25 Mar 2014 15:23:51 +0000 (11:23 -0400)]
Note page, bump jquery version
Charles Connell [Mon, 24 Mar 2014 19:42:28 +0000 (15:42 -0400)]
Merge branch 'master' into redesign
Conflicts:
karmaworld/templates/courses/course_list.html
karmaworld/templates/courses/course_list_entry.html
Charles Connell [Mon, 24 Mar 2014 19:41:06 +0000 (15:41 -0400)]
Course page, datatables
Charles Connell [Fri, 21 Mar 2014 13:15:19 +0000 (09:15 -0400)]
New fonts, mobile nav
Charles Connell [Wed, 19 Mar 2014 14:18:20 +0000 (10:18 -0400)]
Add control panel template file
Charles Connell [Tue, 18 Mar 2014 21:14:01 +0000 (17:14 -0400)]
Fix sorting on course list
Charles Connell [Mon, 17 Mar 2014 17:01:20 +0000 (13:01 -0400)]
Remove unused js file #340
Karmaworld [Tue, 18 Mar 2014 21:09:06 +0000 (21:09 +0000)]
update script to be more percise to reduce memory usage
Bryan [Sat, 15 Mar 2014 00:24:51 +0000 (20:24 -0400)]
example needed update for scheme agnostic links
Bryan [Sat, 15 Mar 2014 00:24:35 +0000 (20:24 -0400)]
new requirement for crypto libs
Charles Connell [Thu, 13 Mar 2014 04:46:12 +0000 (00:46 -0400)]
File upload now pretty
Charles Connell [Thu, 13 Mar 2014 03:22:24 +0000 (23:22 -0400)]
Merge branch 'master' into redesign
Conflicts:
karmaworld/assets/css/global.css
karmaworld/assets/css/note_course_pages.css
Charles Connell [Thu, 13 Mar 2014 03:12:30 +0000 (23:12 -0400)]
Merge pull request #357 from FinalsClub/quizzes
Quizzes and Keywords
Charles Connell [Thu, 13 Mar 2014 02:57:48 +0000 (22:57 -0400)]
Simpler keyword URL
Charles Connell [Wed, 12 Mar 2014 22:18:20 +0000 (18:18 -0400)]
moving around the filepicker button
Charles Connell [Wed, 12 Mar 2014 22:28:59 +0000 (18:28 -0400)]
Remove keyword link for now
Charles Connell [Wed, 12 Mar 2014 22:28:06 +0000 (18:28 -0400)]
Merge branch 'master' into quizzes
Charles Connell [Wed, 12 Mar 2014 22:27:20 +0000 (18:27 -0400)]
Merge pull request #355 from FinalsClub/332-convert-notes-to-markdown
332 Convert notes to markdown
Charles Connell [Wed, 12 Mar 2014 22:22:40 +0000 (18:22 -0400)]
Remove unreachable condition
Jacob Hilker [Wed, 12 Mar 2014 20:19:59 +0000 (16:19 -0400)]
cleanup conversion script
Jacob Hilker [Wed, 12 Mar 2014 20:15:22 +0000 (16:15 -0400)]
add hack to make code blocks look normal, a fix should be made to html2text, but I couldnt find a quick way of doing so
Charles Connell [Tue, 11 Mar 2014 22:06:03 +0000 (18:06 -0400)]
Rollback fix from yesterday
Charles Connell [Tue, 11 Mar 2014 20:19:59 +0000 (16:19 -0400)]
Little polish
Jacob Hilker [Tue, 11 Mar 2014 20:19:45 +0000 (16:19 -0400)]
remove iframe and noscript if markdown exists
Charles Connell [Tue, 11 Mar 2014 17:20:42 +0000 (13:20 -0400)]
Handle edge case
Charles Connell [Tue, 11 Mar 2014 17:06:40 +0000 (13:06 -0400)]
Add a sanity check
Charles Connell [Tue, 11 Mar 2014 15:49:23 +0000 (11:49 -0400)]
Actually get the note contents uploaded
Charles Connell [Tue, 11 Mar 2014 15:23:45 +0000 (11:23 -0400)]
Management command to upload notes to filepicker that haven't been uploaded already #354
Charles Connell [Tue, 11 Mar 2014 14:36:01 +0000 (10:36 -0400)]
Working through course detail page
Charles Connell [Tue, 11 Mar 2014 00:48:13 +0000 (20:48 -0400)]
Disable download button if we don't have a fp_file field
Charles Connell [Mon, 10 Mar 2014 02:19:09 +0000 (22:19 -0400)]
Starting on the course detail page
Jacob Hilker [Sun, 9 Mar 2014 23:30:28 +0000 (19:30 -0400)]
add ability to view original file
Jacob Hilker [Sun, 9 Mar 2014 23:13:31 +0000 (19:13 -0400)]
Merge remote-tracking branch 'origin/master' into 332-convert-notes-to-markdown
Jacob Hilker [Sun, 9 Mar 2014 23:03:57 +0000 (19:03 -0400)]
only convert non pdfs, add command to convert all non pdf files with static html
Jacob Hilker [Sun, 9 Mar 2014 22:03:04 +0000 (18:03 -0400)]
convert all new notes to markdown, display using marked.js
Charles Connell [Sat, 8 Mar 2014 00:13:29 +0000 (19:13 -0500)]
The home page is pretty close now
Charles Connell [Fri, 7 Mar 2014 02:47:34 +0000 (21:47 -0500)]
More work on the front page
Charles Connell [Wed, 5 Mar 2014 03:35:09 +0000 (22:35 -0500)]
Transitioning to new design, starting with the homepage
Charles Connell [Tue, 4 Mar 2014 21:02:43 +0000 (16:02 -0500)]
More little fixes
williambratches [Tue, 4 Mar 2014 19:01:58 +0000 (14:01 -0500)]
Merge branch 'master' of https://github.com/FinalsClub/karmaworld
Charles Connell [Sat, 1 Mar 2014 15:46:58 +0000 (10:46 -0500)]
Merge branch 'master' into quizzes
Charles Connell [Sat, 1 Mar 2014 15:46:54 +0000 (10:46 -0500)]
Working quiz taking interface
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
williambratches [Tue, 25 Feb 2014 23:48:55 +0000 (18:48 -0500)]
Let users edit account settings #291
Charles Connell [Tue, 25 Feb 2014 22:19:46 +0000 (17:19 -0500)]
Merge branch 'master' into quizzes
Charles Connell [Tue, 25 Feb 2014 22:19:20 +0000 (17:19 -0500)]
Fuck it
Charles Connell [Tue, 25 Feb 2014 21:00:39 +0000 (16:00 -0500)]
Display quiz questions as a form
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.
Charles Connell [Mon, 24 Feb 2014 22:15:40 +0000 (17:15 -0500)]
Create quizzes based on keywords
Charles Connell [Mon, 24 Feb 2014 20:16:18 +0000 (15:16 -0500)]
Merge branch 'master' into quizzes
Conflicts:
karmaworld/urls.py
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 [Mon, 17 Feb 2014 17:21:48 +0000 (12:21 -0500)]
Improve keyword edit form, particularly for mobile
Charles Connell [Mon, 17 Feb 2014 14:55:16 +0000 (09:55 -0500)]
Import keywords from XML
Charles Connell [Mon, 17 Feb 2014 14:44:35 +0000 (09:44 -0500)]
Change URLs, add link to keywords
Charles Connell [Thu, 13 Feb 2014 19:10:25 +0000 (14:10 -0500)]
Merge branch 'master' into quizzes
Charles Connell [Thu, 13 Feb 2014 19:09:44 +0000 (14:09 -0500)]
Keyword entry page
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:25:18 +0000 (17:25 -0500)]
Merge branch 'master' into quizzes
Charles Connell [Tue, 11 Feb 2014 22:25:02 +0000 (17:25 -0500)]
Add keyword/definition models
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
Charles Connell [Tue, 11 Feb 2014 14:45:42 +0000 (09:45 -0500)]
Show true/false questions
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
Charles Connell [Tue, 11 Feb 2014 04:20:32 +0000 (23:20 -0500)]
Quiz import from XML
Charles Connell [Sun, 9 Feb 2014 21:31:36 +0000 (16:31 -0500)]
Merge branch 'master' into quizzes
Conflicts:
karmaworld/settings/dev.py
projects / oweals / karmaworld.git / log