Commit Graph

19654 Commits

Author SHA1 Message Date
Vik Paruchuri
1bf548af28 basic parsing for problem and rubric 2012-10-31 17:41:46 -04:00
Don Mitchell
2b5e55b662 Use try/catch to detect undefined globals for canvas 2012-10-31 17:29:19 -04:00
Vik Paruchuri
562dee067c rolling back self assessment module 2012-10-31 17:10:51 -04:00
Don Mitchell
6bbe82b697 Make work w/ ie8. Still complains that HTMLCanvasElement is undefined
but doesn't try to manipulate it.
2012-10-31 17:05:46 -04:00
Tom Giannattasio
ef4b2f044f basic settings framework – wip 2012-10-31 17:03:06 -04:00
Vik Paruchuri
32a8ed7be3 adding in self assessment grader 2012-10-31 16:54:00 -04:00
Vik Paruchuri
b74a484f75 working on self assessment 2012-10-31 16:39:04 -04:00
Calen Pennington
9cb2fbdd2f Remove newline from javascript source tags 2012-10-31 16:26:11 -04:00
Vik Paruchuri
64c791b38a working on self assessment module 2012-10-31 16:18:55 -04:00
Vik Paruchuri
2cb38a2c0f working on new xmodule 2012-10-31 15:37:43 -04:00
Chris Dodge
87dadd40c4 address some of Cale's feedback 2012-10-31 14:11:24 -04:00
JM Van Thong
ca5c33cdf3 Fixed install by adding mysql 2012-10-31 13:46:27 -04:00
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Vik Paruchuri
0f5af40bf5 add self assessment 2012-10-31 13:06:05 -04:00
Calen Pennington
2ca63268d6 Add commands for Studio LMS 2012-10-31 10:39:26 -04:00
Calen Pennington
8d4ee3b05e Add more documentation of development tasks 2012-10-31 10:37:21 -04:00
Victor Shnayder
11fc6e4c51 put back file upload config--needed for new discussion forums 2012-10-30 21:36:15 -04:00
Victor Shnayder
8c27e3a249 Revert overly aggressive killing.
(don't worry--askbot is still dead)
2012-10-30 20:49:10 -04:00
Vik Paruchuri
7fc54dc717 fix docstring 2012-10-30 20:38:33 -04:00
Vik Paruchuri
5586139594 bugfix to self assessment 2012-10-30 20:36:45 -04:00
Vik Paruchuri
62d1f1fe3e update gitignore for pycharm 2012-10-30 20:14:55 -04:00
Vik Paruchuri
188e1c68d7 add self assessment module 2012-10-30 20:13:35 -04:00
Victor Shnayder
01f5f59235 Merge pull request #998 from MITx/feature/rocha/hd-video-player
Add HD control to video player
2012-10-30 17:00:03 -07:00
Victor Shnayder
9281f3c140 add migration to remove askbot columns 2012-10-30 19:54:15 -04:00
Carlos Andrés Rocha
e5b11a9c57 Add HD control to video player 2012-10-30 19:21:17 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Calen Pennington
827f7d5aa3 Merge pull request #988 from MITx/feature/cale/changelogs
Add changelogs for the CMS and LMS
2012-10-30 13:48:57 -07:00
Calen Pennington
d4a6b589f1 Add comment about the target of change log entries 2012-10-30 16:48:47 -04:00
David Ormsbee
5223e9d3ca Merge pull request #995 from MITx/features/rocha/google-analytics-for-course-pages
Add google analytics to course info pages
2012-10-30 13:48:36 -07:00
Calen Pennington
0674d4e74b Only allow django-admin to run in reload mode when browsing jasmine tests, and only kill the whole process group in that case (so as to know kill jenkins) 2012-10-30 16:16:09 -04:00
Carlos Andrés Rocha
8ec2c34ea5 Add google analytics to course info pages 2012-10-30 16:05:06 -04:00
Chris Dodge
34c442a1dc removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering 2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90 addressed Cale's feedback 2012-10-30 16:01:28 -04:00
Calen Pennington
6221baf3e5 Use TEST_ROOT log directory when running jasmine tests 2012-10-30 15:58:59 -04:00
David Ormsbee
9206341817 Merge pull request #969 from MITx/content/rocha/job-page-update
Update Job Page with new positions
2012-10-30 12:58:03 -07:00
Chris Dodge
ba9a03410b remove unneeded debugging traces 2012-10-30 15:56:02 -04:00
Calen Pennington
cd9fbaeb02 Add timeout so that jasmine tests eventually fail if the server doesn't start 2012-10-30 15:51:21 -04:00
Carlos Andrés Rocha
376dcb7982 Correct job description item 2012-10-30 15:44:28 -04:00
Chris Dodge
ee1098c032 remove unused line 2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Carlos Andrés Rocha
f82f4f531d Merge pull request #991 from MITx/feature/dave/open_date
Allow optional advertised_start metadata in Course
2012-10-30 12:10:23 -07:00
Chris Dodge
ded19f761a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-10-30 15:10:06 -04:00
Tom Giannattasio
d68945de33 started adding settings page 2012-10-30 15:04:21 -04:00
Calen Pennington
e6ff0b52d0 Merge pull request #994 from MITx/apenney/requirements
Add MySQL-python to the requirements.
2012-10-30 11:37:47 -07:00
Ashley Penney
ab57c7d759 Add MySQL-python to the requirements. 2012-10-30 14:32:50 -04:00
Calen Pennington
b8dcf0c40c Merge pull request #993 from MITx/bug/cas/tom/long-class-names
added handling for long class names in the header
2012-10-30 09:59:36 -07:00
Tom Giannattasio
ceb17ad411 added handling for long class names in the header 2012-10-30 12:57:47 -04:00
chrisndodge
4c16781808 Merge pull request #992 from MITx/bug/cas/tom/user-not-found
moved error message into form area; tweaked cancel behavior
2012-10-30 08:57:47 -07:00
Chris Dodge
97614d8901 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-10-30 11:52:38 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00