Commit Graph

6956 Commits

Author SHA1 Message Date
Jay Zoldak
c3a957b4d2 Improve retry logic for Stale Element Exceptions
Better exception retry logic

Change methods to lambdas
2013-09-17 12:53:19 -04:00
Jay Zoldak
fe71ace529 Improve retry logic for Stale Element Exceptions
Better exception retry logic

Change methods to lambdas
2013-09-17 12:49:46 -04:00
chrisndodge
d3dc9d27a8 Merge pull request #1017 from edx/fix/cdodge/parse-start-stop-times
in XML deserializations, we can get get floats for start/stop times, so ...
2013-09-17 08:09:51 -07:00
Diana Huang
d191847ff5 Merge branch 'release'
Conflicts:
	lms/static/sass/views/_verification.scss
2013-09-17 10:55:22 -04:00
Chris Dodge
5886118afe in XML deserializations, we can get get floats for start/stop times, so we need to be able to parse those
add test video with float-based end-time
2013-09-17 10:38:21 -04:00
Greg Price
9e4b24daa2 Merge pull request #924 from edx/gprice/fix-forum-sidebar-overlap
Fix forums nav sidebar overlapping content
2013-09-17 07:22:40 -07:00
David Ormsbee
135f7e3b80 Make sure audit enrollments are really marked audit. 2013-09-17 10:16:22 -04:00
Calen Pennington
5ec6cd85f2 Merge pull request #929 from cpennington/remove-get-sample-state
Remove unused XModuleDescriptor.get_sample_state method
2013-09-17 07:01:30 -07:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use"
This reverts commit 3b29d6056e.
2013-09-16 20:22:18 -07:00
ichuang
61d5c4efc5 Merge pull request #888 from edx/fix/ichuang/add-capital-greek-to-formulaequationinput
formulaequationinput: add capital greek letters and hbar to calc preview
2013-09-16 15:04:24 -07:00
ichuang
ab203fb649 hbar only add once 2013-09-16 17:37:56 -04:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Brian Talbot
e1d62cb395 Verification: further revises copy per edits/typos noted 2013-09-16 14:13:14 -04:00
Brian Talbot
0c61f194de Verification: revises fee/honor code option-based copy 2013-09-16 13:36:02 -04:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
2013-09-16 10:27:13 -07:00
Will Daly
adabef7256 Disabled broken test in master. 2013-09-16 11:32:24 -04:00
jkarni
fb363fb90b Merge pull request #919 from edx/jkarni/fix/keep-comments
Make default parser keep comments
2013-09-16 07:26:44 -07:00
David Ormsbee
a2034c5bb9 Merge branch 'release' 2013-09-15 16:11:31 -04:00
Jason Bau
ac05b5c28e Merge pull request #956 from edx/giulio/ice-pr
Implementing NYT's ICE track changes to Open Ended Assessements
2013-09-15 10:11:34 -07: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
Vik Paruchuri
6e8c8a647c Remove due date setting 2013-09-15 12:34:46 -04:00
Calen Pennington
33f13846a5 Merge branch 'release' 2013-09-14 07:00:17 -04:00
Ned Batchelder
ed1a07382e Merge pull request #974 from edx/ned/keep-bson-in-mongo-code
keep-bson-in-mongo-code
2013-09-13 14:36:13 -07:00
Diana Huang
47ce9082e4 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
2013-09-13 17:15:44 -04:00
Calen Pennington
ce4c76ef37 Add mixins to XModuleDescriptors as they are loaded during xml parsing 2013-09-13 16:56:33 -04:00
Ned Batchelder
4d99ef7eba Merge pull request #976 from edx/ned/fix-setattr-and-getattr
fix-setattr-and-getattr
2013-09-13 12:50:29 -07:00
John Jarvis
39d441e132 Merge pull request #765 from edx/jarv/grade-dump
Jarv/grade dump
2013-09-13 12:31:25 -07:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -04:00
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Ned Batchelder
37e81007d6 keep-bson-in-mongo-code 2013-09-13 14:29:56 -04:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
2013-09-13 11:24:51 -04:00
Vik Paruchuri
c6e5e67483 Fix linking problem for peer grading, add in a test
Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4 Address review comments 2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5 Fix problem with peer grading list not rendering, test 2013-09-13 11:07:22 -04:00
Vik Paruchuri
009017fe07 Address review comments 2013-09-13 11:06:40 -04:00
chrisndodge
b6761498a3 Merge pull request #954 from edx/fix/cdodge/remove-forum-permissions-on-delete
define a unseeding forums permissions and call into it from delete_cours...
2013-09-13 07:23:14 -07:00
Valera Rozuvan
27015578f2 Removed an inclusion of t-copy-sub1 in SCSS.
This line was not doing anything and simply causing a warning while
SASS was compiling. The following is the warning:

---
WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static
/xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss:
".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header
.component-name" failed to @extend ".t-copy-sub1".

  The selector ".t-copy-sub1" was not found.
  Use "@extend .t-copy-sub1 !optional" if the extend should be able to
    fail.
---
2013-09-13 10:11:45 +03:00
Jason Bau
c86a56e6d9 Merge pull request #959 from edx/jbau/fix/anonymous-index-with-startdate
fix bug with anonymous access to / with future start courses
2013-09-12 17:33:55 -07:00
Felipe Montoya
45a1e551f9 i18n: problem submit buttons. 2013-09-12 18:13:16 -05:00
Diana Huang
90951a7bdb Merge branch 'release'
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
2013-09-12 16:03:39 -04:00
Chris Dodge
481cbfd8a5 consolidate delete role logic 2013-09-12 15:57:13 -04:00
Julian Arni
2aaade0f32 Utility functions for finding courses by id 2013-09-12 15:51:20 -04:00
Julian Arni
3e62c5e29a Cleaner tests 2013-09-12 15:48:00 -04:00
Julian Arni
af64621467 Remove unnecessary encode 2013-09-12 15:48:00 -04:00
Julian Arni
0208506f93 Use upside-down english for unicode text 2013-09-12 15:48:00 -04:00
Julian Arni
d54b197d24 Fix unicode errors on exceptions and logging 2013-09-12 15:47:59 -04:00
Julian Arni
1cfad39f1e Add tests for imports with unicode filenames 2013-09-12 15:47:59 -04:00
Julian Arni
1813b22ab0 Fix import errors with unicode filenames 2013-09-12 15:47:59 -04:00
Jason Bau
7668ef6f31 fix bug with anonymous access to / with future start courses 2013-09-12 11:43:21 -07:00