Commit Graph

2257 Commits

Author SHA1 Message Date
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children
Enable pure XBlocks to use children in edx-platform
2014-10-16 10:23:35 -04:00
Calen Pennington
47a3172bf1 Enable parent/child tests using the acid XBlock.
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
2014-10-16 09:08:54 -04:00
Daniel Friedman
e9292fb5a5 Add coverage for cohort view's showSection link
TNL-550
2014-10-14 14:31:43 -04:00
Andy Armstrong
03b41032ae Merge pull request #5501 from edx/andya/disable-cohorts-ui-bug
Don't show cohort information when disabled
2014-10-09 12:55:07 -04:00
Andy Armstrong
3af9eb25b2 Minor cleanups 2014-10-08 15:14:17 -04:00
Andy Armstrong
6114cf05f4 Don't show cohort information when disabled
TNL-552
2014-10-08 15:14:16 -04:00
Oleg Marshev
031b3581df Add LMS Performance tests (TNL-484). 2014-10-08 17:08:12 +03:00
Nimisha Asthagiri
d7f850a764 Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/features/data_download.py
2014-10-07 16:23:28 -04:00
Greg Price
183d688129 Add events for cohort modifications
This includes cohort creation/deletion and membership changes.
2014-10-03 11:32:43 -04:00
Jesse Zoldak
8b95cb4840 Merge pull request #5459 from edx/zoldak/quiet-stevedore
Quiet stevedore.extension logging in bok-choy tests
2014-10-02 09:24:21 -04:00
Adam
db82d45681 Merge pull request #5461 from edx/release
Release
2014-10-01 13:14:20 -04:00
Jesse Zoldak
1c08f81c60 Quiet stevedore.extension logging in bok-choy tests 2014-10-01 12:14:51 -04:00
Usman Khalid
b4caf38815 Disabled failing test test_video_end_time_with_default_start_time. 2014-10-01 19:16:08 +05:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard
TNL-162
2014-10-01 09:22:32 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard.
TNL-163
2014-10-01 09:22:31 -04:00
Nimisha Asthagiri
b4c826e747 TNL-329 Client-side work for displaying cohort description. 2014-10-01 09:22:30 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance
Improve performance of split-mongo import/export performance
2014-09-30 15:44:04 -04:00
Calen Pennington
d60117d7c2 Make Studio CoursePage objects generate the correct CourseLocator based on whether the DEFAULT_STORE is set or not 2014-09-29 11:56:40 -04:00
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test.
TNL-353
2014-09-29 13:12:06 +05:00
Andy Armstrong
0ed3a95d3a Merge branch 'release'
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
2014-09-25 16:25:45 -04:00
Jesse Zoldak
6d5e65c0bd Add explanation and small optimizations to languagetest 2014-09-24 12:36:52 -04:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order"
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
2014-09-23 18:45:59 -04:00
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
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -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
Christine Lytwynec
1be81109e5 enable auto-capturing of hars in bok-choy tests 2014-09-15 12:14:47 -04:00
Jesse Zoldak
a1eb44d9c6 skip intermittently failing test TNL-392 2014-09-15 12:13:06 -04:00
Don Mitchell
935d5dee34 LMS-11331, LMS-11345 Make auth check branch agnostic; fix deserialize keys 2014-09-11 10:53:05 -04:00
Nimisha Asthagiri
3a772752de LMS-11286 Paver Bokchoy support for Split; default store set to Split. 2014-09-11 10:48:09 -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
27c29d0dfd Merge pull request #5140 from edx/zub/bugfix/plat-101-playercontrolsnotvisible
show video controls for all youtube videos
2014-09-11 17:35:49 +05:00
zubair-arbi
e3f499a757 show video controls for all youtube videos
TNL-184
2014-09-11 17:02:27 +05:00
Daniel Friedman
4d9517b456 Ensure LMS passes correct group_id when querying content 2014-09-10 16:43:06 -04: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
cahrens
a96b2bd734 Move tests into appropriate directory structure. 2014-09-02 16:36:08 -04:00
muhammad-ammar
94c90556c2 Split Bok-Choy Tests into 3 shards
TE-447
2014-09-02 08:36:33 -04: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