Commit Graph

1141 Commits

Author SHA1 Message Date
Andy Armstrong
fe6668a550 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
2014-09-23 15:53:10 -04:00
David Ormsbee
4f5d8b30de Basic Mobile API (v0.5) and Video Abstraction Layer integration.
Note that the features in this release are opt-in, and course and video
behavior will remain the same unless a course explicitly opts in.

Major pieces of functionality with this commit:

Allows the listing of a user's enrollments, course videos, and updates. In
order to make a course available for mobile use, course staff must explicitly
set the Course Advanced Setting "Mobile Course Available" to true. Course staff
will always see their own courses through the Mobile API regardless of this
setting, but students will only be allowed to see a course through the Mobile
API if this setting is set to "true". By default, a Course will *not* be
available for mobile use.

This is a Django app for video resource management. It is completely optional,
and is intended to allow video and operations teams to create new encodings of
videos (e.g. low res for mobile) and change CDNs without having to edit course
data directly. Course teams can now use a "EdX Video ID" setting for Videos,
which will leverage VAL. Video units that do not fill in an "EdX Video ID" will
behave exactly as they always have.

* The Mobile API is enabled with the ENABLE_MOBILE_REST_API feature flag.
* VAL is enabled with the ENABLE_VIDEO_ABSTRACTION_LAYER_API feature flag.
* VAL and the Mobile API both require ENABLE_OAUTH2_PROVIDER).
* The Mobile API is a read-only API, but VAL requires database migrations.
* Applications that make use of either the Mobile API or VAL must be registered
  with the OAuth2 provider app in Django Admin.
2014-09-23 12:31:46 -04:00
David Baumgold
9f6454411e Update tests for changed text 2014-09-23 12:02:31 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets
Python zip file importable from an asset
2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
2014-09-18 17:59:12 -04:00
zubair-arbi
eefd9f23a5 Merge pull request #5243 from edx/zub/bugfix/tnl-392-videocontrolstestfailure
wait for notification on adding video component
2014-09-17 19:40:48 +05:00
clytwynec
3f5b829d0e Merge pull request #5147 from edx/clytwynec/auto_capture_har_on_error
enable auto-capturing of hars in bok-choy tests
2014-09-17 09:15:20 -04:00
zubair-arbi
b2b46332f8 wait for notification on adding video component
TNL-392
2014-09-16 17:20:31 +05:00
Waheed Ahmed
8efa9daec1 Fixed bok choy flaky test for studio.
TNL-284
2014-09-16 16:04:08 +05:00
Christine Lytwynec
4b5b72a39d add promise to get around race condition in discussion bok-choy test 2014-09-15 15:28:54 -04:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished.
LMS-6492
2014-09-11 18:35:58 +05:00
zubair-arbi
e3f499a757 show video controls for all youtube videos
TNL-184
2014-09-11 17:02:27 +05:00
Ben Patterson
a8843aa7c7 TE-468 - bok-choy: Fix flakiness in date-picker steps under studio
These were failing on Solano builds because the save button was clicked
before the datepicker was done its work. (The EmptyPromise was still satisfied
because the input field value had been updated, but the datepicker widget
caused issues about 3/4 of the time.)
2014-09-09 10:17:02 -04:00
Jesse Zoldak
98fa457188 Merge pull request #5091 from edx/ammar/fix-video-transcripts-test
Fix Video Transcript Test
2014-09-05 12:02:13 -04:00
Christina Roberts
5fc4e02ff8 Merge pull request #5063 from edx/christina/cohorts-bok-choy
Christina/cohorts bok choy
2014-09-05 10:35:03 -04:00
muhammad-ammar
20d6221364 Fix Video Transcript Test
TE-460
2014-09-05 10:33:37 +00:00
cahrens
bc483ebae8 Bok choy test for cohort group label in post. 2014-09-04 16:19:35 -04:00
muhammad-ammar
da9a01a6c3 Tooltip Acceptance Test 2014-09-04 10:24:55 +00:00
Greg Price
988e4e6da5 Update UI for forum actions
The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>
2014-08-29 15:59:33 -04:00
Greg Price
eaa93bf615 Hide comments in marked answers in forum questions
A link to show the comments appears in their place.
2014-08-29 15:59:33 -04:00
Greg Price
7470e60004 Unify forum thread views (and templates) 2014-08-29 15:59:31 -04:00
Muhammad Ammar
6b2874de2b Bok-Choy Video Transcript tests Batch3 2014-08-28 09:10:13 +00:00
Andy Armstrong
d00bf940ae Merge pull request #4941 from edx/zub/story/tnl56-dragdropintocollapsedunittests
add tests for drag and drop unit into collapsed subsection on course out...
2014-08-26 19:13:26 -04:00
Se Won Jang
11d260910f Implemented Validation for Course Advanced Setting
This commit adds validation for course advanced settings. Currently when course
administrators make invalid changes in the Settings/Advanced Settings tab,
they're not notified through a new modal window of the list of invalid settings
changes.

* Extending CourseMetadata
    - Previously, we only had update_from_json method in CourseMetadata.py,
      and it was only validating one field every POST request.
    - Now we have validate_and_update_from_json method that encapsulates the
      functionality of update_from_json into a validation call
    - To avoid discrepancy of validation standards between modules, validation
      uses the from_json method implemented to each field in xblock.

* Different Response in advanced settings ajax requests
    - After receiving a POST ajax request, course.py calls
      validate_and_update_from_json, and sends a json object of either:
        1) valid course metadata model
        2) error objects

* Error Messages shown in validation-error-modal
    - error objects passed through ajax are shown in a separate modal.
2014-08-26 11:24:38 -07:00
zubair-arbi
2ce1540a9d update/cleanup code + move verify_ordering and drag method to studio utils 2014-08-26 18:19:24 +05:00
zubair-arbi
b6a2330631 add tests for drag and drop unit into collapsed subsection on course outline page 2014-08-26 18:19:23 +05:00
Nimisha Asthagiri
5c6a846784 Merge pull request #4936 from edx/benmcmorran/bokchoy-course-reruns
Add bokchoy tests for course reruns
2014-08-22 19:05:07 -04:00
Ben McMorran
098c1d59cd Add bokchoy tests for course reruns 2014-08-22 17:41:41 -04:00
muhammad-ammar
4815adb641 Merge pull request #4869 from edx/ammar/bok-choy-video-transcript-tests-batch2
Bok-Choy Video Transcript Tests Batch 2
2014-08-22 15:39:27 +05:00
Muhammad Ammar
75a0d52472 Bok-Choy Video Transcript Tests Batch 2 2014-08-22 07:28:48 +00:00
Waheed Ahmed
f686e7d0b9 Passed cls=EdxJSONEncoder on json.dumps to fix save, edit and import.
STUD-2096
2014-08-22 12:23:46 +05:00
Andy Armstrong
d451c3e91d Fix Studio to gracefully handle xblock JavaScript errors
TNL-46

I've changed Studio to catch JavaScript errors when rendering xblocks, log the error, but to then continue as normal. This means that the user is still able to interact with the xblock to delete, duplicate etc. This seems reasonable as the xblock is only rendered as a WYSIWYG representation so if it isn't fully interactive that shouldn't be a big problem.
2014-08-21 17:31:19 -04:00
Tim Babych
a986b46cb1 Merge pull request #4750 from edx/anton/publish-unit-from-course-outline
Publish sections/subsections/units from course outline.
2014-08-21 18:19:14 +03:00
polesye
732bcbdeb6 STUD-1911, STUD-1932: Publish sections, subsections and units from course outline. 2014-08-21 17:34:06 +03:00
Christina Roberts
420ae2da1e Merge pull request #4857 from edx/christina/stud-2093
Add bok choy tests for bad HTML module content.
2014-08-21 09:48:24 -04:00
muhammad-ammar
06842be865 Merge pull request #4859 from edx/ammar/bok-choy-video-transcript-tests
Bok-Choy Video Transcript Tests Batch1
2014-08-21 12:01:04 +05:00
Ben Patterson
ea967148ed Merge pull request #4860 from edx/benp/lint-cleanup
pep8 improvements on bok-choy tests.
2014-08-20 10:08:38 -04:00
Ben Patterson
4343a953a3 pep8 improvement on bok-choy page class. 2014-08-20 09:05:30 -04:00
Ben Patterson
a18660cabd pep8 improvements on bok-choy tests. 2014-08-20 09:05:30 -04:00
Muhammad Ammar
cfeb7102a6 Bok-Choy Video Transcript Tests 2014-08-20 12:11:21 +00:00
muhammad-ammar
ca3bd2f83f Merge pull request #4496 from edx/ammar/bok-choy-cms-video-editor-tests
Bok-Choy CMS Video Editor Tests
2014-08-20 13:19:10 +05:00
cahrens
7130c14f48 Add tests that verify Studio can still render with bad HTML content. 2014-08-19 10:38:19 -04:00
Muhammad Ammar
f93e4f2775 Bok-Choy CMS Video Editor Tests 2014-08-18 15:44:30 +00:00
Muhammad Ammar
ebee3c406e Fix Video Player Pause Issue 2014-08-18 13:18:15 +00:00
Ben McMorran
12a5781725 Add ability to set staff lock from course outline 2014-08-16 15:58:42 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
cahrens
367bdf18c8 Improve stability of test_studio_outline tests.
STUD-2084
2014-08-11 15:13:16 -04:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
Daniel Friedman
4b6035bafb Automatically collect HAR data for performance testing 2014-08-07 12:27:38 -04:00
cahrens
59d44c54b1 Updates after rebase. 2014-08-07 12:27:37 -04:00