Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,210 Commits 1 Branch 0 Tags
8a9845c26ee5ffac3e428da9dc8e72c8d2d413c6
Commit Graph

36210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
47fdc841c0 Import test course instead of using XML-backed course. 2016-04-12 11:53:50 -04:00
John Eskew
415ef3616f Remove XML-backed course-specific test. 2016-04-12 11:53:50 -04:00
John Eskew
3fb437e533 Import test course instead of using XML-backed course. 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
99ded6c7ee Import test course instead of using XML-backed course. 2016-04-12 11:53:50 -04:00
John Eskew
4221ca6f2a Use ToyCourseFactory instead of the XMLModuleStore-backed toy course. 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
Christina Roberts
bb06e57115 Merge pull request #12099 from edx/christina/fix-default-cohort 
Allow the "Default Group" to be renamed (automatic cohorting)
 2016-04-12 08:03:03 -04:00
Robert Raposa
ff2e6dc1fa Merge pull request #12082 from edx/robrap/linter-mako 
TNL-4324: Enhance linter for HTML() and Text()
 2016-04-11 16:11:43 -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
Robert Raposa
96fe8afbde Enhance linter for HTML() and Text() 
- Add capability to run linter on file or directory
- Add rule for HTML() requiring Text()
- Add rule for HTML() and Text() being closed before format()
- Add rule for Text() unnecessary without HTML()
- Enhance expression parsing
- Add real arg parser for script
- Clean up unit tests
 2016-04-11 13:56:35 -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
Vedran Karačić
4f8bf7a838 Merge pull request #11978 from edx/vkaracic/mobile-header 
Lower padding on header for 320 breakpoint.
 2016-04-11 16:22:42 +02:00
Vedran Karacic
733f7375f6 Lower padding on header for 320 breakpoint 2016-04-11 13:20:40 +00: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
cahrens
28d743e2c8 Allow the "Default Group" to be renamed. 
TNL-4355
 2016-04-08 19:10:41 -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
Diana Huang
c7bc0490d9 Merge pull request #12091 from edx/diana/verified-cohort-naming 
Add configurable name for verified track cohort.
 2016-04-08 17:07:21 -04:00
Diana Huang
53517df0a7 Add new name for verified track. 2016-04-08 16:02:48 -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
clrux
6ef023bac4 Merge pull request #11980 from edx/clrux/testing.rst-i18n-updates 
Adding i18n info for developers
 2016-04-08 15:11:07 -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
Ned Batchelder
46d69eba7a Merge pull request #12088 from edx/ned/remove-unused-imports 
Remove unused imports
 2016-04-08 14:20:31 -04:00
Eric Fischer
29961736db Styling changes for Course Updates errors 2016-04-08 14:07:38 -04:00
Chris Rodriguez
e42520194c Adding i18n info 2016-04-08 13:28:44 -04:00
Kevin Falcone
f2c8582c46 Merge pull request #11909 from edx/jibsheet/html-escape-submission-history 
Submission History safe by default
 2016-04-08 13:00:06 -04:00
Ned Batchelder
fac216c35b Lower the overall pylint count to 4175 2016-04-08 12:05:38 -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
Nimisha Asthagiri
05ffcb0ab8 Merge pull request #12075 from edx/tnl/ccx-fix-MA-2258 
Fix sequence navigation issues for CCX courses
 2016-04-08 09:29:11 -04:00
Douglas Hall
05d0ba7786 Merge pull request #12078 from edx/douglashall/upgrade_xblock_lti_consumer_1_0_5 
Upgraded xblock-lti-consumer to 1.0.5
 2016-04-08 09:23:56 -04:00
Clinton Blackburn
8f4ac178e6 Merge pull request #12079 from edx/clintonb/s3-url-fix 
Stripping auth querystring from S3 URLs
 2016-04-08 09:05:10 -04:00
Asad Iqbal
47102eba1d Merge pull request #12081 from edx/asadiqbal08/WL-409 
asadiqbal08/WL-409 updated ubcpi version
 2016-04-08 17:30:10 +05:00
Muddasser
7680d0b97a Decreased the flakiness of upload_tar function 2016-04-08 12:20:13 +05:00
Muzaffar yousaf
31ca2a637a Merge pull request #12041 from edx/mzfr/fixup-safe-templates 
Safe  template for edxnotes.
 2016-04-08 11:46:59 +05:00
asadiqbal
cffaa3ee6b updated ubcpi version 2016-04-08 11:32:37 +05:00
Ron Mulero
b2a8fb771d Merge pull request #12080 from edx/ron/theme-work 
Add registerd trademarked logo to footer.
 2016-04-07 19:56:36 -04:00
Ron Mulero
12f8edc24f Add registerd trademarked logo to footer of edx.org and edge.edx.org. 2016-04-07 19:55:51 -04:00