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

13865 Commits

Author SHA1 Message Date
Chris Rodriguez
df5520bdf9 Video player: adding Dragabilly to closed captions 
* tests for dragging
* icon location reference updates
* pattern library usage
 2016-04-14 15:29:38 -04:00
Zubair Afzal
db9037bc86 Merge pull request #12104 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs 
Updated dashboard UI for empty list of courses and programs
 2016-04-14 18:43:17 +05:00
Tasawer
628843f62c ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-14 10:48:21 +00:00
wajeeha-khalid
86e954f642 version-based mobile app upgrade 2016-04-14 15:43:34 +05:00
wajeeha-khalid
a52cafcc9e Merge pull request #10973 from edx/jia/MA-1815 
jia/MA-1815 retrieve count for child comments
 2016-04-14 13:25:35 +05:00
Clinton Blackburn
7ec71f2d43 Merge pull request #12138 from edx/clintonb/oauth-client-credentials-update 
Improved OAuth client credentials support
 2016-04-14 02:03:47 -04:00
Bill DeRusha
9e548cd83e Merge pull request #12108 from edx/bderusha/api-status-notification 
Email notification
 2016-04-13 16:55:50 -04:00
Clinton Blackburn
b0535def87 Improved OAuth client credentials support 
- Updated django-oauth2-provider libraries
- Added test ensuring issued access tokens have the basic scopes needed to get user info

ECOM-4197
 2016-04-13 16:23:54 -04:00
Bill DeRusha
bf37b4a028 Email notification 2016-04-13 15:59:30 -04:00
wajeeha-khalid
c31164c3ad Merge pull request #11838 from edx/jia/TNL-3818 
TNL-3818: fixed recent activity mapping in thread-list sort
 2016-04-13 20:57:52 +05:00
Vedran Karačić
a533472ae8 Merge pull request #12052 from edx/vkaracic/SOL-1668 
[SOL-1668] Coupon codes application is not available for a user who has just activated his account
 2016-04-13 16:01:49 +02:00
wajeeha-khalid
5b5fb2464d TNL-3818: fixed recent activity mapping in thread-list sort for Forums Web 2016-04-13 17:47:31 +05:00
Vedran Karacic
02c5e7f939 Redirect to ecommerce checkout on the PayAndVerify view. 
When a user tries to purchase a verified certificate for the first
time or upgrade to verified, if the ecommerce checkout is enabled
redirect the user to the ecommerce checkout basket.
 2016-04-13 10:14:09 +00:00
Omar Khan
6fc4b38ea0 Disallow free verified course modes 
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
 2016-04-12 18:06:16 -07:00
Peter Fogg
56ca0e90f2 Merge pull request #12085 from edx/peter-fogg/improve-api-request-ui 
API request page improvements.
 2016-04-12 15:58:49 -04:00
Peter Fogg
0da55b0f0e Add the real terms of service to our API request page, and improve UI. 
ECOM-4024
 2016-04-12 14:05:31 -04:00
Bound3R
4ddcf31ad8 change css properties for mixins bi-aap in about template 
remove unnecessary parentheses

change css properties for mixins bi-aap in login/register page

change css properties for mixins bi-app in about course page

change css properties for mixins bi-app in the dashboard

change css properties for mixins bi-app in help template

change css properties for mixins bi-app in the home page

change css properties for mixins bi-app in jobs, press and media pages

remove the extra spaces
 2016-04-12 12:59:53 -05: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
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
Vedran Karacic
733f7375f6 Lower padding on header for 320 breakpoint 2016-04-11 13:20:40 +00: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
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
53517df0a7 Add new name for verified track. 2016-04-08 16:02:48 -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
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
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
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
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
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
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
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -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
Syed Hassan Raza
76057fc4d2 semantic task_input for certificate generation ECOM-3505 2016-04-07 09:06:36 -04:00
muzaffaryousaf
03c801255f Safe template for edxnotes. 2016-04-07 15:10:38 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag 
ECOM-4040
 2016-04-06 17:53:40 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00: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