Charles Connell [Wed, 9 Apr 2014 23:53:49 +0000 (19:53 -0400)]
Keyword cleanup
Charles Connell [Wed, 9 Apr 2014 15:00:20 +0000 (11:00 -0400)]
Fix mimetype selector
Charles Connell [Tue, 8 Apr 2014 22:29:23 +0000 (18:29 -0400)]
Keyword on note page
Charles Connell [Tue, 8 Apr 2014 21:33:29 +0000 (17:33 -0400)]
Merge branch 'master' into redesign
Conflicts:
karmaworld/assets/js/course-detail.js
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/notes/note_list_entry.html
karmaworld/templates/notes/search_results.html
Charles Connell [Tue, 8 Apr 2014 21:28:48 +0000 (17:28 -0400)]
Spacing tweak
Charles Connell [Tue, 8 Apr 2014 21:24:26 +0000 (17:24 -0400)]
Sort notes by date by default
Charles Connell [Tue, 8 Apr 2014 21:24:10 +0000 (17:24 -0400)]
Wait longer for google drive conversion
Charles Connell [Sun, 6 Apr 2014 22:10:17 +0000 (18:10 -0400)]
Annotations in PDFs
Charles Connell [Sat, 5 Apr 2014 20:10:21 +0000 (16:10 -0400)]
Annotations
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 15:04:46 +0000 (11:04 -0400)]
Revert some of William's changes
Charles Connell [Wed, 26 Mar 2014 14:48:08 +0000 (10:48 -0400)]
Note search
williambratches [Tue, 25 Mar 2014 21:41:38 +0000 (17:41 -0400)]
sorting should now function properly in moderator panel
williambratches [Tue, 25 Mar 2014 21:37:59 +0000 (17:37 -0400)]
change view for department and professor panels now work
Charles Connell [Tue, 25 Mar 2014 21:24:56 +0000 (17:24 -0400)]
Splash text size
williambratches [Tue, 25 Mar 2014 21:15:06 +0000 (17:15 -0400)]
repaired Department and Professor dependencies
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
williambratches [Tue, 25 Mar 2014 20:12:12 +0000 (16:12 -0400)]
Fixed duplicate class in admin.py
williambratches [Tue, 25 Mar 2014 19:27:12 +0000 (15:27 -0400)]
added DepartmentModerator and ProfessorModerator classes to admin.py
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
william-bratches [Sat, 22 Mar 2014 06:11:15 +0000 (02:11 -0400)]
Fix for issue 352, adding dynamic pluralization.
william-bratches [Sat, 22 Mar 2014 06:08:12 +0000 (02:08 -0400)]
Fix for issue 352 - adds dynamic pluralization.
william-bratches [Sat, 22 Mar 2014 06:02:52 +0000 (02:02 -0400)]
Revert "Fix for issue 352 - labels now dynamically pluralize."
This reverts commit
5e7ef1821b6a2c5dfe3d71edb69a4cdf96991bc6.
william-bratches [Sat, 22 Mar 2014 06:02:23 +0000 (02:02 -0400)]
Revert "back and forth between experiments"
This reverts commit
238f9b02275d0d4f51402bc64d71283ce0d38424.
Conflicts:
karmaworld/templates/notes/note_list_entry.html
william-bratches [Sat, 22 Mar 2014 05:47:52 +0000 (01:47 -0400)]
Fix for issue 352 - labels now dynamically pluralize.
william-bratches [Sat, 22 Mar 2014 05:45:32 +0000 (01:45 -0400)]
continuing work of prvious commit.
william-bratches [Sat, 22 Mar 2014 05:44:34 +0000 (01:44 -0400)]
making a frankenstein out of the course entry page to dissect how it works.
william-bratches [Sat, 22 Mar 2014 05:42:36 +0000 (01:42 -0400)]
ignore this
william-bratches [Sat, 22 Mar 2014 05:40:20 +0000 (01:40 -0400)]
test21
william-bratches [Sat, 22 Mar 2014 05:37:01 +0000 (01:37 -0400)]
back and forth between experiments
william-bratches [Sat, 22 Mar 2014 05:30:07 +0000 (01:30 -0400)]
more testing
william-bratches [Sat, 22 Mar 2014 05:28:02 +0000 (01:28 -0400)]
test
william-bratches [Sat, 22 Mar 2014 05:25:29 +0000 (01:25 -0400)]
testing to fix pesky duplication error.
william-bratches [Sat, 22 Mar 2014 05:14:50 +0000 (01:14 -0400)]
fixed the duplicate "thanks" on course detail
william-bratches [Sat, 22 Mar 2014 05:06:08 +0000 (01:06 -0400)]
reversal of pagination changes for testing.
william-bratches [Sat, 22 Mar 2014 04:42:41 +0000 (00:42 -0400)]
fixing the mistake in pluralization
william-bratches [Sat, 22 Mar 2014 04:40:53 +0000 (00:40 -0400)]
removing the bug duplicating thanks messages
william-bratches [Sat, 22 Mar 2014 04:36:22 +0000 (00:36 -0400)]
fix 2
william-bratches [Sat, 22 Mar 2014 04:35:16 +0000 (00:35 -0400)]
fix
william-bratches [Sat, 22 Mar 2014 04:33:05 +0000 (00:33 -0400)]
fix
william-bratches [Sat, 22 Mar 2014 03:02:58 +0000 (23:02 -0400)]
added pluralization for note thanks
william-bratches [Sat, 22 Mar 2014 03:01:53 +0000 (23:01 -0400)]
added pluralization for note lists
william-bratches [Sat, 22 Mar 2014 02:56:02 +0000 (22:56 -0400)]
added plurization for course list
william-bratches [Sat, 22 Mar 2014 02:51:00 +0000 (22:51 -0400)]
added pluraization to course and note lists
william-bratches [Sat, 22 Mar 2014 00:42:36 +0000 (20:42 -0400)]
fix for issue 136
william-bratches [Sat, 22 Mar 2014 00:40:31 +0000 (20:40 -0400)]
Fix for issue 136
william-bratches [Sat, 22 Mar 2014 00:36:21 +0000 (20:36 -0400)]
fix to issue 136
william-bratches [Sat, 22 Mar 2014 00:27:30 +0000 (20:27 -0400)]
Added pagination scrolling fix for issue 136
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
projects / oweals / karmaworld.git / log