Commit Graph

141 Commits

Author SHA1 Message Date
Jesse Zoldak
405c92f4f4 Fix flaky library container test TE-745 2015-02-11 12:47:02 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash
Bok Choy test now passes
2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
Martyn James
9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20
Merge feature SOL-20
2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Frances Botsford
6398af715a Make group config styles generic 2015-01-15 10:37:25 -05:00
cahrens
66375b8541 Bok choy test for editing of content groups on Group Configuration page. 2015-01-15 10:37:24 -05:00
Daniel Friedman
fff84928fa Create and edit content groups in Studio 2015-01-15 10:37:24 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware
TNL-652
2015-01-15 10:33:45 -05:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
Matjaz Gregoric
ccc392893e Update tests.
Most of the updates are related to the My Courses -> Studio Home change.
2015-01-12 13:41:45 +03:00
Braden MacDonald
55fb45fb24 Acceptance test 2015-01-12 13:41:02 +03:00
E. Kolpakov
2b45e10f34 Bok choy acceptance tests 2015-01-12 13:40:59 +03:00
Braden MacDonald
d38e69c69a Acceptance & Jasmine tests for library permissions editor 2015-01-12 13:37:59 +03:00
Braden MacDonald
76b6d33b80 Refresh children automatically when library setting is changed 2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1 Move update link to the validation area 2015-01-12 13:37:57 +03:00
E. Kolpakov
d25673ec72 LibraryContent bok choy acceptance tests 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
074e4cfa22 Addressed further review notes for Library Pagination 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
ed3b972078 Added tests for Library pagination. 2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2 Studio support for creating and editing libraries (PR 6046)
SOL-1, SOL-2, SOL-3
2015-01-12 13:37:50 +03:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
2015-01-06 15:24:12 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05: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
zubair-arbi
dd71ca0f8a fix click event for actual target
TNL-138
2014-11-03 09:37:02 -05:00
Jesse Zoldak
7ca78d6e43 Merge pull request #5724 from edx/zoldak/improve-rerun-test
Improve rerun test
2014-10-30 16:27:29 -04:00
Jesse Zoldak
74b65ddb1e Improve rerun test
for troubleshooting TNL-692
2014-10-24 16:12:11 -04:00
Jesse Zoldak
af3d911a7f Fix test page definition for course group configurations page
TNL-685
2014-10-24 14:30:31 -04:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view.
TNL-399

Content and settings are no longer saved when Studio view is rendered.
2014-10-17 09:29:32 -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
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
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
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
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
muhammad-ammar
20d6221364 Fix Video Transcript Test
TE-460
2014-09-05 10:33:37 +00: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