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

13900 Commits

Author SHA1 Message Date
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00
Adam
7600d9b03d Merge pull request #12139 from edx/fix-certificate-display-issue 
fix issue where the wrong text appeared for certificate generation hi…
 2016-04-15 09:52:27 -04:00
Ned Batchelder
a2b06dc617 Merge pull request #12159 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-15 09:41:51 -04:00
Adam
f1a9f81efa Merge pull request #12148 from edx/add-logging-to-certs 
Add logging to certs
 2016-04-15 08:38:31 -04:00
tasawernawaz
00d2d6d20d Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 13:08:24 +05:00
tasawernawaz
ba6ba40e2e ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 06:50:03 +00:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master 
Manually merge release into master
 2016-04-15 00:47:54 -04:00
Andy Armstrong
60fab86f01 Reconcile double reverts 
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
 2016-04-14 23:28:55 -04:00
Christina Roberts
08a8164201 Merge pull request #12155 from edx/christina/allow-multiple-random-cohorts 
Allow multiple random cohorts.
 2016-04-14 17:49:37 -04:00
clrux
0c9f9d4682 Merge pull request #11438 from edx/clrux/ac-329 
AC-329 making closed-captions draggable
 2016-04-14 17:20:36 -04:00
Ned Batchelder
958795d5cb Update translations (autogenerated message) 2016-04-14 16:44:22 -04:00
cahrens
1cd54d5fb7 Rename "is_default_cohort" method. 2016-04-14 16:38:34 -04:00
Simon Chen
582debcd58 Merge pull request #12135 from edx/schen/ECOM-3195 
ECOM-3195 Edit the navigation header on dashboard to expose program listing page
 2016-04-14 15:51:19 -04:00
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
Simon Chen
75951b5936 ECOM-3195 Edit the navigation header on dashboard to expose program listing page 2016-04-14 14:44:40 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
AlasdairSwan
1c3868ef59 Update program listing page's sidebar implementation to move to more self-contained subviews 
s/our/your
 2016-04-14 13:50:17 -04:00
cahrens
ce6ffe6d61 Allow multiple random cohorts. 2016-04-14 13:17:24 -04:00
tasawernawaz
e962a39ef7 Revert "ECOM-3201" 
This reverts commit 628843f62c.
 2016-04-14 14:23:41 +00:00
Adam Palay
18474b2d18 raise 404 if non-int user is passed to cert view 2016-04-14 09:43:56 -04:00
Adam Palay
883712b25b add logging for when the cert view doesn't render (ECOM-4202) 2016-04-14 09:43:43 -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
Adam Palay
f985169225 fix issue where the wrong text appeared for certificate generation history (ECOM-4201) 2016-04-13 16:55:10 -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
Amir Qayyum Khan
0d8237680c Fixed exception related to course not found for ccx 2016-04-13 21:48:12 +05: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
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -04: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
Matt Drayer
9a362d9033 Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming 
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
 2016-04-12 10:55:04 -04:00
Diana Huang
fa61c04894 Revert "Make it impossible to click "final check" without selecting a choice" 
This reverts commit 4c83a2f0de.
 2016-04-12 10:11:15 -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
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -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
Clinton Blackburn
8f25c81a85 Added AWS_S3_CUSTOM_DOMAIN 
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
 2016-04-11 15:34:29 -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
Nimisha Asthagiri
e343fbe99c Merge pull request #12115 from edx/naa/fix-dashboard-xss 
Fix dashboard safe template issues
 2016-04-11 13:08:34 -04:00