Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,657 Commits 1 Branch 0 Tags
2a4976cf8a46046fe411da7c35cb2c7ce01532ef
Commit Graph

5452 Commits

Author SHA1 Message Date
Vik Paruchuri
2a4976cf8a Cleanup how peer grading handles due date 2013-07-18 15:36:42 -04:00
Vik Paruchuri
0b991f9bbd Fix reset and score tests 2013-07-18 15:19:13 -04:00
Vik Paruchuri
84c4b7f139 Test fixes 2013-07-18 15:08:52 -04:00
Vik Paruchuri
480e97a3fd Cleanup and change attribute names 2013-07-18 14:55:59 -04:00
Vik Paruchuri
d17486a9c7 Update default handling 2013-07-18 14:39:52 -04:00
Vik Paruchuri
915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-07-18 11:55:37 -04:00
chrisndodge
8300bb5e67 Merge pull request #425 from edx/fix/cdodge/exporting-video-modules 
Fix/cdodge/exporting video modules
 2013-07-18 08:04:20 -07:00
Chris Dodge
99ff3719cc remove the video from the toy course for now as the import-export-import isn't totally equivalence. 2013-07-18 10:35:50 -04:00
Lyla Fischer
ee01798599 Merge pull request #404 from edx/lyla/templates 
Adding a template for drag-and-drop.
 2013-07-18 07:03:09 -07:00
Chris Dodge
66287d0d99 fix test to use the new create_item method rather than clone_item, which has been deprecated, and thus breaking the test 2013-07-18 09:30:30 -04:00
Calen Pennington
96a9d74190 Merge pull request #422 from edx/release 
Hotfix: 2013-07-17
 2013-07-17 13:12:06 -07:00
Chris Dodge
8325e28a10 add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field 2013-07-17 12:31:33 -04:00
Adam
f0969fca4c Merge pull request #374 from edx/fix/adam/mrev-check 
notify students for NotFoundErrors from capa_module, improve tracking
 2013-07-17 08:26:27 -07:00
Adam Palay
dfa435012b notify students for NotFoundErrors from capa_module, improve error logging 2013-07-17 11:03:47 -04:00
frances botsford
033a36efb9 Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup 
Quick LMS pdfviewer  layout cleanup
 2013-07-17 06:53:10 -07:00
Lyla Fischer
3f8246f032 merge conflict 2013-07-16 18:25:01 -04:00
Lyla Fischer
a47daf26e4 removed uneeded defaults from imageresponse 2013-07-16 18:22:48 -04:00
Calen Pennington
d3993653cf Merge pull request #270 from edx/dhm/non-persisted-studio-templates 
Non-persisted studio templates
 2013-07-16 14:42:57 -07:00
Lyla Fischer
a512337881 removed soon-to-be-universally-fixed defaults 2013-07-16 16:18:27 -04:00
Don Mitchell
be4fbc562e Refactor tests to no longer use templates 
Add boilerplate option to ItemFactory
Minor start date fix to not use microsecs
 2013-07-16 16:00:28 -04:00
Renzo Lucioni
f2898f8cbf Merge pull request #407 from edx/renzo/problem-check-event 
Reinstate problem_check event as Problem Checked event
 2013-07-16 12:20:30 -07:00
Calen Pennington
92391a22fc Don't force field inheritance of default values 2013-07-16 14:33:59 -04:00
Calen Pennington
0a38e490e3 Fix pep8/pylint errors 2013-07-16 14:33:59 -04:00
Calen Pennington
4b53478859 Require markdown to be explicitly set 2013-07-16 14:33:59 -04:00
Calen Pennington
8b5979641b Change default rerandomize and showanswer 
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
 2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions. 
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
 2013-07-16 14:24:41 -04:00
David Ormsbee
35f66f8469 Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194 2013-07-16 09:20:35 -04:00
Don Mitchell
ef8618f7ad Make DraftModuleStore mongo only 
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
 2013-07-16 08:55:26 -04:00
Renzo Lucioni
92ae50d415 Remove unused code and include problem ID of data we send 2013-07-15 15:18:01 -04:00
Renzo Lucioni
c770458e6a Reinstate problem_check event as Problem Checked event 2013-07-15 13:31:56 -04:00
Lyla Fischer
2262ffe4e5 updated imageresponse example to a more universal example (baby animals) 2013-07-15 12:17:43 -04:00
Lyla Fischer
d83d49cac4 drag_and_drop template added 2013-07-15 11:26:03 -04:00
Brian Talbot
388724c485 Studio: updates Sass mixins/extend references based on textbook/Sass cleanup 2013-07-15 10:12:51 -04:00
Brian Talbot
34e9a21da8 Studio: renames and simplifies .cont-trucated Sass extend 2013-07-15 10:12:50 -04:00
Brian Talbot
91a6e34769 Studio: adds further comment/prefix revisions to Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
88d06a16e5 Studio: renames and re-orgs app-wide Sass extends 2013-07-15 10:12:50 -04:00
David Baumgold
7f5aedb215 Merge pull request #380 from edx/db/studio-i18n 
Studio internationalization
 2013-07-13 05:45:50 -07:00
chrisndodge
8f743424ba Merge pull request #387 from edx/fix/cdodge/unescape-quote-strings 
[STUD-406] Fix/cdodge/unescape quote strings
 2013-07-12 15:32:55 -07:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Chris Dodge
ac4e20b4f3 change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps 2013-07-12 15:27:36 -04:00
Jason Bau
e7bb85dee1 Merge pull request #259 from edx/features/jbau/stanford-shib 
Bugfix for stanford shib
 2013-07-12 10:19:58 -07:00
Chris Dodge
958ecdb053 raise a more appropriate Exception 2013-07-12 12:47:51 -04:00
Chris Dodge
547f4633d5 use better syntax for asserting that exception is thrown 2013-07-12 12:47:23 -04:00
Chris Dodge
ab4012cc59 fix up some of the test courses which had hardcoded that quot; escaping 2013-07-12 11:33:46 -04:00
Chris Dodge
5aae3c6971 add new tests for the string literal serialization 2013-07-12 11:14:35 -04:00
Chris Dodge
50bea28d75 Add a 'string literal' serialization method and use it in the lambda function mapping table when the value to xml serialize is of basestring type. Also a couple of drive-by pep8 fixes. 2013-07-12 11:13:59 -04:00
JonahStanley
940113efee Fixed long lines 2013-07-12 10:32:49 -04:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00