Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,002 Commits 1 Branch 0 Tags
b3f00a672504e70e66a38d9d35f85df48ff70afd
Commit Graph

12002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
b0c2559de8 Switch around template locations 2013-03-01 13:43:01 -05:00
Arthur Barrett
82544f2ae1 start adding jasmine tests to module 2013-03-01 13:39:51 -05:00
Julian Arni
09ff623561 Updated version of JSME. 2013-03-01 13:38:35 -05:00
Arthur Barrett
6dba2394b2 enable studio authoring (raw) for xmodule 2013-03-01 13:32:56 -05:00
Vik Paruchuri
b3d0abbd05 Start to move around templates 2013-03-01 13:31:54 -05:00
VikParuchuri
d186e5d186 Merge pull request #1538 from MITx/diana/fix-import-export 
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
 2013-03-01 09:32:08 -08:00
Calen Pennington
3908ada4ca Merge pull request #1575 from MITx/feature/edz/lock-requirements 
locking django-nose and numpy versions
 2013-03-01 09:20:09 -08:00
e0d
a3ed2d156d locking django-nose and numpy versions 2013-03-01 12:08:20 -05:00
David Ormsbee
d6957f3e7e Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode 
Fix capa save button msgs & add simple capa survey mode
 2013-03-01 08:26:21 -08:00
David Ormsbee
e1fcf4c317 Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries 
Reduce SQL queries in courseware by model caching a User's groups
 2013-03-01 08:24:30 -08:00
Will Daly
f8893e9cc1 Updated custom response documentation 2013-03-01 11:19:39 -05:00
Will Daly
8265181477 If there are multiple inputs, but only one message specified, 
the message is now applied to the entire response.
 2013-03-01 11:17:31 -05:00
Calen Pennington
c581ecd897 Merge pull request #1573 from MITx/feature/edz/lock-capa-deps-versions 
locking deps versions based on pip freeze in production.
 2013-03-01 08:10:56 -08:00
Will Daly
c3da73ed1e Changed title of custom response doc. 
Added custom response doc to index
 2013-03-01 10:57:57 -05:00
John Hess
b400b575d0 Merge pull request #1567 from MITx/jth/admindash 
Improved /admin_dashboard
 2013-03-01 07:56:32 -08:00
David Ormsbee
1d4defd0ea Fix bug where we weren't combining org_staff with built-in staff for group checking 2013-03-01 10:54:57 -05:00
Your Name
8a953241c1 first pass 2013-03-01 10:45:48 -05:00
e0d
4e10eb10e3 locking deps versions based on pip freeze in production. 2013-03-01 10:15:07 -05:00
David Ormsbee
bfe2809a87 Merge branch 'master' into bugfix/dave/too_many_sql_queries 
Conflicts:
	lms/djangoapps/courseware/access.py
 2013-03-01 10:11:35 -05:00
Will Daly
9ac8ef542f Overall message HTMl now correctly renders when multiple HTML tags are 
passed as the message (even when there's no root tag)
 2013-03-01 09:40:38 -05:00
Will Daly
952716af13 Added clean-up code for message HTML. 
If overall message is a parseable XHTML tree,
it is inserted as a tree rather than text.
 2013-03-01 09:40:38 -05:00
Will Daly
68cf4c4535 Added tests for HTMl rendering of problems 
Added support for rendering response messages
 2013-03-01 09:40:38 -05:00
Will Daly
9f6119a19a * Fixed a bug in CorrectMap in which overall_message was not copied 
in the update() method
* Implemented CustomResponse behavior for returning overall_message,
  with unit tests
* Added additional CustomResponse unit tests for exception handling
 2013-03-01 09:40:38 -05:00
Will Daly
3dd49881c3 * Wrote unit tests for correctmap. 
* Fixed potential KeyError in correctmap.get_queue_time_str()
* Modified correctmap.get_npoints() to return 0 if answer is incorrect,
    even when npoints has been set.
* Added overall_message attribute to CorrectMap to allow
messages that apply to the entire question, not just an individual input
 2013-03-01 09:40:38 -05:00
Calen Pennington
32e5f72c16 Remove .redcar folder 2013-03-01 08:15:38 -05:00
VikParuchuri
228e749d23 Merge pull request #1571 from MITx/marketing/faq-and-media 
add a question about account changes to the help page
 2013-02-28 17:47:42 -08:00
Victor Shnayder
86b91e2dc0 add a question about account changes to the help page 2013-02-28 20:44:18 -05:00
VikParuchuri
57ea68b2a8 Merge pull request #1570 from MITx/marketing/faq-and-media 
Marketing/faq and media
 2013-02-28 17:27:05 -08:00
Victor Shnayder
9cde21b591 Update edX media kit (LH #221) 2013-02-28 20:16:19 -05:00
Victor Shnayder
f0a4691914 Update student FAQ (LH #213) 2013-02-28 20:16:06 -05:00
Arthur Barrett
3d4510ab0c fixed sass compiler issue with annotatable xmodule on cms 2013-02-28 18:35:32 -05:00
Victor Shnayder
136946a334 Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule 2013-02-28 18:22:13 -05:00
Arthur Barrett
0461d72884 fixed tag prompt default text 2013-02-28 16:31:15 -05:00
Arthur Barrett
179a4af5e7 fixed failing annotationinput test and refactored response factory 2013-02-28 15:37:14 -05:00
Arthur Barrett
3f40781612 adjusted "incorrect" icon placement when no annotation options submitted. 2013-02-28 14:24:53 -05:00
Arthur Barrett
430449501e deleting test file 2013-02-28 14:06:46 -05:00
Christina Roberts
1b9d105e35 Merge pull request #1568 from MITx/bug/christina/misc 
Don't require text tag around multiple choice/checkbox answers.
 2013-02-28 10:48:08 -08:00
Arthur Barrett
6b74dcf782 adding unit test for annotationinput 2013-02-28 13:38:29 -05:00
cahrens
2be42b8f51 Don't require text tag around multiple choice/checkbox answers. 
https://edx.lighthouseapp.com/projects/102637/tickets/196
 2013-02-28 13:33:04 -05:00
Arthur Barrett
15f6edc2f2 Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-28 13:11:40 -05:00
Arthur Barrett
bc6a085fdf converted annotationinput tests to the new responsetype testing format. 2013-02-28 13:10:37 -05:00
Vasyl Nakvasiuk
e9dacfae09 remove self.contents from ConditionalModule 2013-02-28 20:07:59 +02:00
Christina Roberts
69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor 
Fix latex high-level source editor in current version of cms / studio
 2013-02-28 10:02:09 -08:00
Arthur Barrett
1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master. 2013-02-28 11:22:32 -05:00
John Hess
02e30f5072 Cleaned up admin_dashboard code and template 2013-02-28 11:11:57 -05:00
John Hess
2f5e1b9cc0 Readable admin_dashboard 2013-02-28 10:54:57 -05:00
Christina Roberts
1ebc3b314d Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation 
Fix/cdodge/optimize metadata tree computation
 2013-02-28 07:28:48 -08:00
Diana Huang
9429262ca4 Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests 
Fix/will/capa response unit tests
 2013-02-28 07:05:15 -08:00
David Ormsbee
456972de5c Merge pull request #1562 from MITx/feature/jarv/org-staff-access 
Creating group for organization staff access DO NOT MERGE
 2013-02-28 06:53:56 -08:00
Will Daly
71d0a367aa Fixed an error in the JavascriptResponseTest: coffee files 
were not being compiled before the LoncapaProblem initializer was
called.
 2013-02-28 09:45:27 -05:00