Commit Graph

42 Commits

Author SHA1 Message Date
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
Jason Bau
7f1b60b286 Implement user service to return currently-logged-in user
returns XBlockuser with 2 data layers
2015-01-16 11:40:06 -05:00
cahrens
5de170ff59 Short-circuit group_access check if only user_partitions are split_test partitions. 2015-01-15 10:33:48 -05:00
Brian Wilson
2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock.
Fix extracted from https://github.com/edx/edx-platform/pull/6035.
2014-12-19 09:00:32 -05:00
Andy Armstrong
eced849db0 Add group_access field to all xblocks
TNL-670
2014-12-05 09:55:00 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations
TNL-649
2014-12-05 09:52:26 -05:00
stv
41390f0239 Fix PEP8: E222 multiple spaces after operator 2014-11-10 19:30:18 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page.
TNL-683
2014-11-06 15:48:55 -05:00
ichuang
38c7832f75 fix tracking log entry key child-id -> child_id 2014-10-12 13:40:54 -04:00
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
Calen Pennington
483e2a6a5d split create_item and create_child out as separate methods 2014-07-18 21:11:37 -04:00
Mathew Peterson
06ef306f7f more split_draft methods 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
7efd0cb49e converge Split APIs with Mixed and Draft 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Andy Armstrong
afb311ff51 Fix user handling bug in split test module
STUD-1948
2014-07-08 15:01:22 -04:00
Andy Armstrong
5f11aa9aee Revert "First attempt to fix split test"
This reverts commit a16f5487bc.
2014-07-07 16:49:11 -04:00
Andy Armstrong
a16f5487bc First attempt to fix split test 2014-07-07 16:40:17 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes
STUD-1658
2014-06-20 11:41:23 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations
STUD-1658
2014-06-20 11:41:22 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
Diana Huang
0df7037650 Send the serialized string to the track_function in split_test_module. 2014-06-10 17:02:53 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module.
STUD-1529
2014-06-05 12:16:16 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules
STUD-1312
2014-05-29 14:02:45 -04:00
Sarina Canelake
1919df71a2 Fix split test child id 2014-05-16 13:52:42 -04:00
Calen Pennington
7e55d5eb5c Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 2014-05-14 10:00:16 -04:00
Andy Armstrong
4adc608f48 Specify that split_test_modules support children. 2014-05-13 12:36:45 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Calen Pennington
d654798856 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/lib/xmodule.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-08 20:28:53 -04:00
cahrens
1e92a6c884 Do not show "View in Studio" links for child verticals of verticals.
STUD-1558
2014-05-02 13:36:44 -04:00
Diana Huang
6f7c73cd4f Fix split_test import and export.
LMS-2405
2014-03-18 14:15:13 -04:00
Andy Armstrong
58483c0649 Fix split_test xblock so that it can render in Studio
This change addresses STUD-1403 where split_test modules could not render in Studio.
It changes Studio to pass a new parameter 'runtime-type' of 'studio' when rendering
 an xblock. In split_test, this will then cause all of the children to be rendered,
 rather than just the one that matches the conditional.
2014-03-12 17:21:04 -04:00
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Calen Pennington
2d5c37b2a0 Track renders of split_test children
[LMS-2098]
2014-03-05 13:45:08 -05:00
Victor Shnayder
281ad63d2b split testing support in the LMS.
Adds a split_test_module XModule, that can choose one of its children
to display, based on a get_condition_for_user API added to the runtime.

To test, add something like this to an xml course, or make equivalent
 tweaks in mongo.

 <vertical url_name="split_test_vert">
    <split_test url_name="split1" experiment_id="0" condition_id_to_child='{"0": "i4x://MITx/6.00x/html/split_test_cond0", "1": "i4x://MITx/6.00x/html/split_test_cond1"}'>
       <html url_name="split_test_cond0">condition 0</html>
       <html url_name="split_test_cond1">condition 1</html>
    </split_test>
  </vertical>

Also needs an experiment configured in the course policy json: e.g.

        "user_partitions": [{"id": 0,
                                      "name": "Experiment 0",
                                      "description": "Unicorns?",
                                      "version": 1,
                                      "groups": [{"id": 0,
                                                        "name": "group 0",
                                                        "version": 1},
                                                        {"id": 1,
                                                        "name": "group 1",
                                                        "version": 1}]}]

(This particular snippet will work inside a course with org MITx
 and course name 6.00x)

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Diana Huang <diana@edx.org>
Co-Author: Calen Pennington <cale@edx.org>

[LMS-2095]
2014-03-05 13:45:08 -05:00