Commit Graph

6285 Commits

Author SHA1 Message Date
Don Mitchell
d328c53dff Cached course entry: separate structure from identity
Don't undo inheritance by unsetting course_entry structure
Do finer-grained cache clearing
2013-09-26 12:57:40 -04:00
Don Mitchell
c1789adfd9 Always return a Locator: cases weren't exhaustive. 2013-09-26 12:57:39 -04:00
Don Mitchell
934b3ca7c0 Check has_children before accessing children 2013-09-26 12:57:39 -04:00
Don Mitchell
b4fa316294 Migrate data from old mongo to split mongo
Create location mapping
Create draft and published course with proper content in split.
2013-09-26 12:57:39 -04:00
Don Mitchell
379a147a57 Begin transactional with_version impl
Change create_item to optionally add the item to the head version and not create a new version.
2013-09-23 11:35:53 -04:00
Don Mitchell
bd56ee21d2 split get_item uses loc_mapper to decode old style Locations 2013-09-23 11:35:53 -04:00
Don Mitchell
40d11c73cf location mapper maturation
richer exceptions, add_map return course_id, fix a bug, filter out unwanted kwargs in init
2013-09-23 11:35:53 -04:00
Don Mitchell
b9a7c7f752 Create new structure allows override of usage id and category 2013-09-20 10:58:17 -04:00
Don Mitchell
2c90dc73cd Don't access kvs directly but use x_module and field_data mechanisms 2013-09-19 14:45:06 -04: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
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
Jason Bau
7668ef6f31 fix bug with anonymous access to / with future start courses 2013-09-12 11:43:21 -07:00
Frances Botsford
896ffd4e77 adjusting wording on choice expand block 2013-09-12 14:43:01 -04:00
cahrens
988833ded9 pylint/pep8 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
cahrens
08d9942993 Allow custom formatting of due date strings.
STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.
2013-09-12 14:30:00 -04:00
Chris Dodge
bd69db4410 switch to using get() rather than get_or_create(). Also add a test case with a different casing on the courseId 2013-09-12 14:27:57 -04:00
Chris Dodge
41be20a000 define a unseeding forums permissions and call into it from delete_course
define a unseeding forums permissions and call into it from delete_course

define a unseeding forums permissions and call into it from delete_course
2013-09-12 14:27:57 -04:00
Will Daly
2677598a53 Merge pull request #938 from rocha/mock-mongo-on-event-tracking-tests
Mock mongo event tracking backend during tests
2013-09-12 11:27:22 -07:00
Carlos Andrés Rocha
6a64b404a1 Mock mongo event tracking backend during tests 2013-09-12 13:36:49 -04:00
Carlos Andrés Rocha
979ec89f0e Fix error encoding datetime objects in the event track logger backend
The function json.dumps was being called with incorrect arguments,
causing an infinite recursion when serializing an event containing
datetime objects
2013-09-12 12:21:08 -04:00
Julian Arni
238899faac Make default parser keep comments 2013-09-12 10:59:56 -04:00
Christina Roberts
784115ac79 Merge pull request #901 from edx/christina/dont_import_checklists
Do not store expanded action URLs.
2013-09-12 07:54:25 -07:00
cahrens
cda45cd77a Add a checklist example to test course for import/export roundtrip. 2013-09-12 09:58:07 -04:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd
Remove dogstatsd-python in favor of dogapi
2013-09-12 06:53:02 -07:00
cahrens
1184a97b0b Do not store expanded action URLs.
They are not portable. STUD-681.

Minor updates.
2013-09-12 09:47:30 -04:00
Valera Rozuvan
b858810aa4 Updating LTI Jasmine tests.
Due to the fact that by default the LTI settings have "http://www.example.com"
set as the default form action (launch_url), tests were updated to reflect the
fact that when setting is in default state, form is not submited, even when
the form action is not empty.
2013-09-12 11:07:07 +03:00