Commit Graph

13062 Commits

Author SHA1 Message Date
John Eskew
d1d449ee1d Remove comments that refer to XML courses. 2016-04-12 11:54:23 -04:00
John Eskew
dce920fa70 Fix PEP8 error 2016-04-12 11:53:51 -04:00
John Eskew
8a9845c26e Remove ModuleStoreEnum.Type.xml 2016-04-12 11:53:51 -04:00
John Eskew
91c94977d5 Unify usage of a single test mixed modulestore called:
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
2016-04-12 11:53:51 -04:00
John Eskew
9cfe31a2f3 Remove unused xml_source_dirs from mixed modulestore config. 2016-04-12 11:53:50 -04:00
John Eskew
74eb70aa12 Fix toy course textbook test - use Mongo-backed test course. 2016-04-12 11:53:50 -04:00
John Eskew
20533de145 Skip test with static tabs - seems broken. 2016-04-12 11:53:50 -04:00
John Eskew
9cc1d4f91d Remove include_xml option. 2016-04-12 11:53:00 -04:00
John Eskew
c4535afb3f Remove more XML modulestore test code. 2016-04-12 11:49:32 -04:00
John Eskew
f9a85c4471 Remove XML modulestore code - discovery work 2016-04-12 11:49:32 -04:00
Peter Fogg
7864ec1c2c Merge pull request #12109 from edx/peter-fogg/course-home-a11y-test
Add a11y test for the course home page.
2016-04-12 10:04:28 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198
ECOM-3198 Add banner image to the program listing program cards
2016-04-11 16:00:03 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Peter Fogg
beb3c19722 Add a11y test for the course home page. 2016-04-11 14:28:06 -04:00
Andy Armstrong
fd3a87a2cf Merge pull request #12102 from edx/andya/pattern-library-test-page-take-2
Introduce Pattern Library test pages (take two)
2016-04-11 10:28:25 -04:00
Ben Patterson
bf66cb767d Merge pull request #12103 from edx/benp/assetindex-flaky
FEDX-88. Marking bok-choy test as flaky.
2016-04-11 07:32:16 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Ben Patterson
61a3b07e99 FEDX-88. Marking bok-choy test as flaky. 2016-04-10 09:28:07 -04:00
Andy Armstrong
807fed392b Merge pull request #12092 from edx/revert-uxpl-asset-changes-in-master
Revert "Introduce Pattern Library test pages"
2016-04-08 18:03:58 -04:00
Eric Fischer
08c3a13f5e Merge pull request #11968 from edx/efischer/refactor_date_utils
Course Updates date validation
2016-04-08 15:23:00 -04:00
Ben Patterson
b6b0d7fd4d Merge pull request #12016 from edx/muddasser/bokchoy/upload_tar_flakiness
Decreased the flakiness of upload_tar function
2016-04-08 14:41:15 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Eric Fischer
2735fdc2d4 Course Updates date validation
TNL-4115. Previously, course updates (which are intended to be posted with
dates, for sorting in the LMS) could be authored in studio with a valid
date, nothing, or a random string as the "date" for the update. As there
is no validation for this in studio, everything succeeded with no warning.

However, the LMS has problems parsing some of these values, and barfs when
loaded by learners.

The fix does two big things:
- gracefully handles invalid dates in LMS. These updates are now treated as
having a date of today, for sorting purposes.
- turns on validation in studio. Now, it is not only impossible to enter
invalid dates in studio, but notifications will draw the course author's
eye if any invalid updates were previously saved.

Test additions for this commit:

Adds:
- unit test for LMS parsing
- Jasmine test to confirm invalid dates cannot be set by the user
    -also adds event to setAndValidate instead of using a global object
- fix for lettuce test
    -It is no longer valid to enter the string "January 1, 2013" as this test
    had been doing. Keyed-in entries must use MM/DD/YY format.
2016-04-08 11:37:40 -04:00
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
Muddasser
7680d0b97a Decreased the flakiness of upload_tar function 2016-04-08 12:20:13 +05:00
Nimisha Asthagiri
91f63af852 Fix sequence navigation issues for CCX courses
MA-2258
2016-04-07 18:41:10 -04:00
clrux
0571103bdb Merge pull request #11369 from edx/clrux/ac-223
AC-223 updating transcript skip links
2016-04-07 13:23:02 -04:00
Adam
810a5a79d1 Merge pull request #12072 from edx/merge-release-into-master
Merge release into master
2016-04-07 13:16:18 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
John Eskew
abba913bee Merge pull request #12053 from mitocw/fix/aq/ccx_creating_issue
Fixed unable to created ccx issue
2016-04-07 12:09:40 -04:00
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
Matt Drayer
c7552db4d5 Merge pull request #11987 from edx/asadiqbal08/xblock_translations
asadiqbal08/WL-388: Add ModuleI18nService for Descriptor System
2016-04-07 10:54:33 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
muzaffaryousaf
c3cd2db384 Moving choices to admin form instead of models.
TNL-4296
2016-04-07 12:26:18 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
muzaffaryousaf
90c670c0ac Unit test to check the migrations are in sync. 2016-04-07 12:26:17 +05:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Awais Jibran
03925474b9 Verification Upgrade Deadline panel on course home page should not show if user is already verified 2016-04-06 12:53:31 -04:00
Awais Jibran
1799634c2e Fix certificate exception view.
ECOM-3910
2016-04-06 12:53:04 -04:00
Braden MacDonald
60f4f1ac77 Enable Azure AD third party auth provider by default 2016-04-06 12:51:22 -04:00
Omar Khan
07892a75f2 Custom icons for third party auth login buttons
- Icon images can be uploaded from the django admin
- Test coverage improved
2016-04-06 12:50:55 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price
Disallow free verified course modes
2016-04-06 12:32:00 -04:00
asadiqbal
7ae40dced8 asadiqbal08/WL-388: ModuleI18nService for Descriptor System
mattdrayer: Default to XBlock class if no unmixed class
2016-04-06 11:53:14 -04:00
Toby Lawrence
fc149abf06 Merge pull request #12007 from edx/PERF-274
[PERF-274] Add NewRelic instrumentation to contentserver.
2016-04-06 11:43:08 -04:00
Toby Lawrence
09586d8a37 [PERF-274] Add NewRelic instrumentation to contentserver.
This includes the course key/path for a given contentserver request,
whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests are
coming into the contentserver to figure out whether or use of a CDN in
front of these assets is as efficient as effective as it could be.
2016-04-06 10:31:02 -04:00
Andy Armstrong
34cecaee77 Merge pull request #11957 from edx/andya/pattern-library-test-page
Introduce Pattern Library test pages
2016-04-05 15:36:11 -04:00
John Eskew
33568cb409 Merge pull request #11988 from mitocw/fix/aq/cas_profile_not_found_mitocw#102
Fixed 500 error in case of user's profile not found when login/logout with CAS.
2016-04-05 15:31:48 -04:00
Amir Qayyum Khan
9220c4d8dd Fixed 500 error in case of user's profile not found when login/logout with CAS 2016-04-05 22:49:05 +05:00
Amir Qayyum Khan
58bde7f301 Excluded admins, staff and coach of master course from max enrollment 2016-04-05 21:31:54 +05:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
2016-04-05 09:22:14 -04:00