Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
39,204 Commits 1 Branch 0 Tags
dc8d020e3080098394a88366c5c16e14906e9a2d
Commit Graph

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
7d43e3994c Fix sequence navigation issues for CCX courses 
MA-2258
 2016-04-11 11:46:12 -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
Feanil Patel
0173642f38 Merge pull request #12098 from edx/feanil/add_migration_dependency 
Update migration to add a dependency.
 2016-04-08 14:58:20 -04:00
Feanil Patel
3592819720 Update migration to add a dependency. 
Because this migration depends on enrollment code and that code relies on a new table.
 2016-04-08 14:51:53 -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
Brian Jacobel
15ea5ece47 Merge pull request #12089 from edx/revert-pattern-lib-css-changes 
Revert "Introduce Pattern Library test pages"
 2016-04-08 14:20:39 -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
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages" 
This reverts commit 845e3708f3.
 2016-04-08 11:41:04 -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
e0d
2be2b52f63 apply the setting to the CMS too 2016-04-08 06:09:03 -04:00
e0d
ae202dd54a fix CR nits 2016-04-08 06:08:41 -04:00
Edward Zarecor
f20f895903 Updating cookies settings 2016-04-08 06:00:31 -04: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
Nimisha Asthagiri
91f63af852 Fix sequence navigation issues for CCX courses 
MA-2258
 2016-04-07 18:41:10 -04:00
Clinton Blackburn
d2d38f9b2c Stripping auth querystring from S3 URLs 
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
 2016-04-07 17:14:18 -04:00
Douglas Hall
fed01b3547 Upgraded xblock-lti-consumer to 1.0.5 2016-04-07 16:00:12 -04:00
Eric Fischer
141be63bea Merge pull request #12077 from edx/efischer/merge-release-to-master 
Efischer/merge release to master
 2016-04-07 15:45:13 -04:00
Eric Fischer
813b50aed2 Fix conflict, 1.1.3 is correct 2016-04-07 14:45:19 -04:00
Eric Fischer
ff2a939878 Merge pull request #12073 from edx/hotfix/2016-04-07 
Bump ora2 version
 2016-04-07 14:30:57 -04:00
Fred Smith
9ff39385c6 clear existing assets before copying new assets 2016-04-07 14:13:47 -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
Eric Fischer
16d62e551b Bump ora2 version 2016-04-07 12:39:08 -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