Commit Graph

232 Commits

Author SHA1 Message Date
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00
Calen Pennington
d354571e95 Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses 2014-07-17 10:35:37 -04:00
louyihua
63ef3bd05a i18n: More extractable & localizable strings in xmodules 2014-05-26 15:30:01 +08:00
louyihua
a6bae4d238 i18n: Make static strings in xmodule files extractable
They can now be extracted.
2014-05-23 01:58:19 +08:00
Waheed Ahmed
eaa5b6ed6f Changed wording for setting up ORA question.
ORA-351
2014-04-01 11:12:24 +05:00
Valera Rozuvan
1136336fc4 Converting collapsible module to JavaScript. 2014-03-11 11:28:46 +00:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Chris Rossi
831f907c79 Add individual due dates feature.
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
2014-01-14 10:19:02 -05:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems.
ORA-286
2014-01-06 19:13:28 +05:00
Adam
f7d86bfff5 Merge pull request #1814 from edx/adam/fix-ora-typo
fix typo in ORA template (ORA-136)
2013-12-05 07:37:52 -08:00
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -05:00
Zubair Afzal
5dba3fb47a Disable Peer Track Changes
STUD-1008
2013-12-04 16:43:17 +05:00
Adam Palay
c812c5509a fix typo in ORA template (ORA-136) 2013-12-03 14:35:20 -05:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
2013-11-20 10:15:09 -05:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
Vik Paruchuri
19fb2017be Streamline and test uploading ... remove requirement that uploads be images, can now upload any file. 2013-09-27 17:08:34 -04:00
Jason Bau
7c1a3e1ea1 wording changes for setting help 2013-09-20 14:23:05 -07:00
Jason Bau
9c4ff9ba95 Add setting on combinedopenended to allow peergrading of finished submissions 2013-09-20 14:23:05 -07:00
Vik Paruchuri
d9ce5e073b Implement a save button for open ended responses 2013-09-20 16:35:10 -04:00
Giulio Gratta
fe59a8ce62 Implementing NYT's ICE track changes to Open Ended Assessements
Squashed commits to facilitate cherry-picking.  Committers and
original commit messages are:
- ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
* Refactor peer_grading_problem to lookup track_changes variable by problem location.
* Whitelist ICE insert, delete tags
* Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* Introduction ICE means we need its inline tags to get passed through
  to the feedback target, but we don't want malicious peer feedback
  providers introducing <script>, etc, so we use lxml.html.clean to
  scrub peer grading input.
* Adds feedback URL autoheating.
* Allows ICE <insert> and <delete> tags but not others.

~ add helptext re: EXPERIMENTAL FEATURES

~ address a bunch of @VikParuchuri review comments on ICE for OEE
  ~ remove extraneous code
  ~ change to new xmodule accessors
  ~ refactor filtering

~ fix broken test test_peer_grading_problem

~ Create track_changes.coffee and remove <script> from
  peer_grading_problem.html
~ Remove all reliance on id in favor of local scoping and classes

~ bring up test coverage somewhat

~ remove superflous $.scrollTo

~ TODO: Filtering
2013-09-15 09:49:28 -07:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Vik Paruchuri
3c55a44b6b Address review comments 2013-08-26 10:36:24 -04:00
Vik Paruchuri
3558ce02ae Properly reset state and test it 2013-08-22 17:50:37 -04:00
Vik Paruchuri
21e13e44af Pep8 and pylint fixes 2013-08-22 14:29:39 -04:00
Vik Paruchuri
9211a38374 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
Vik Paruchuri
c9e0d36d16 Merge pull request #621 from edx/fix/vik/oe-issues
Fix/vik/oe issues
2013-08-15 08:27:34 -07:00
Sarina Canelake
f438922a88 Fix error seen in combinedopenended modules 2013-08-14 16:36:33 -04:00
Vik Paruchuri
5c9538a9a1 Address review comments 2013-08-09 16:46:25 -04:00
Vik Paruchuri
e4bcfa5c21 Fix indents and copy behavior 2013-08-08 19:31:34 -04:00
Vik Paruchuri
4b5aba29ca Fix defaults 2013-08-08 09:52:13 -04:00
Vik Paruchuri
1be6ce3ee3 Add in and route control options 2013-08-08 08:34:08 -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
Calen Pennington
0a38e490e3 Fix pep8/pylint errors 2013-07-16 14:33:59 -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
Vik Paruchuri
2246944594 Set a default weight 2013-06-28 15:09:19 -04:00
Vik Paruchuri
8930e753e4 Set default weights 2013-06-28 14:59:39 -04:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions
Refactor a bit modx_dispatch
2013-06-25 13:38:57 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock
Fixes JIRA LMS-203
2013-06-17 13:38:57 -04:00
Christina Roberts
9e0997d3c8 Merge pull request #111 from edx/feature/christina/unify-fields
Move "stringy" functionality into xblock fields
2013-06-13 13:49:14 -07:00
Calen Pennington
e791e84ea7 Remove the stores_state field from XModule
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
2013-06-13 14:38:59 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
cahrens
b2fe7f5c01 Update documentation (per Toddi). 2013-05-29 17:19:33 -04:00
cahrens
d7a1dda937 Update display name. 2013-05-29 16:23:31 -04:00
cahrens
551a1c1516 pep8 and documentation cleanup. 2013-05-29 15:47:46 -04:00
cahrens
625c6b518c Cleanup, change how we load templates. 2013-05-28 14:07:35 -04:00
cahrens
a195c4f55f Continue merge. 2013-05-27 20:36:10 -04:00