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

36291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
attiyaIshaque
717c36bdd4 Merge pull request #12133 from edx/atiya/TNL-4376-course-export-page 
Course export page will not be opened for course id that does not bel…
 2016-04-18 10:16:13 +05:00
attiyaishaque
4c15dd93ba Course export page will not be opened for course id that does not belong to any course. 2016-04-18 09:12:40 +05:00
Robert Raposa
069e884fdd Merge pull request #12129 from edx/robrap/linter-mako 
TNL-4324: Add check for HTML entities
 2016-04-16 12:36:03 -04:00
Robert Raposa
14abf32b4b Add check for HTML entities 2016-04-16 15:24:56 +00:00
Renzo Lucioni
a406a221b0 Merge pull request #12170 from edx/renzo/program-listing-bokchoy 
Acceptance tests for program listing page
 2016-04-15 17:24:21 -04:00
Renzo Lucioni
182e34f893 Acceptance tests for program listing page 
Includes a11y coverage. ECOM-3980.
 2016-04-15 16:06:41 -04:00
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00
Muzaffar yousaf
181b00b441 Merge pull request #12167 from edx/release 
Merge patch release into master
 2016-04-15 21:34:59 +05:00
Calen Pennington
33af47a72a Merge pull request #11841 from CredoReference/copy_question_should_also_copy_tags 
Duplicate item in Studio should also duplicate related xblock aside
 2016-04-15 12:34:25 -04:00
Muzaffar yousaf
9808b154b3 Merge pull request #12143 from edx/patch/2016-04-14 
Patch/2016-04-15
 2016-04-15 20:38:48 +05: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
wajeeha-khalid
014185eaba Merge pull request #12145 from edx/jia/TNL-3818-refactor 
refactored variable name
 2016-04-15 16:07:32 +05: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
Akiva Leffert
a804d0e961 Merge pull request #12158 from edx/aleffert/formula-response-multi-device 
Enable multi-device for FormulaResponse
 2016-04-14 18:03:00 -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
Akiva Leffert
9f5d46118d Enable multi-device for FormulaResponse 
We've already audited this for responsiveness. Just need to turn it on.

JIRA: https://openedx.atlassian.net/browse/MA-1809
 2016-04-14 16:37:37 -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
AlasdairSwan
4a015f5f43 Merge pull request #12126 from edx/alasdair/ECOM-3986-program-list-page-eventing 
Update the program listing page sidebar approach
 2016-04-14 14:46:23 -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
2429a7c221 Merge pull request #12150 from edx/tasawer/revert-ecom-3201-handle-empty-list-of-courses-and-programs 
Revert "ECOM-3201"
 2016-04-14 20:27:41 +05: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
wajeeha-khalid
5f572dfc67 Merge pull request #11612 from edx/jia/MA-1982 
MA-1982 and MA-1991 version-based mobile app upgrade
 2016-04-14 17:53:29 +05:00
wajeeha-khalid
e020869089 refactored variable name 2016-04-14 16:42:57 +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
c9bf6dc6b5 jia/MA-1815 retrieve count for child comments 2016-04-14 13:33: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
Nimisha Asthagiri
198a46338e Merge pull request #12141 from edx/naa/fix-dashboard-safe 
Fix Dashboard on edx.org theme
 2016-04-13 17:21:37 -04:00
Nimisha Asthagiri
c73a238e57 Fix Dashboard on edx.org theme. 2016-04-13 17:11:53 -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
Renzo Lucioni
0279326d0c Merge pull request #12137 from mitocw/fix/aq/migration_003_issues 
Fixed course not found against ccx issue on migration 0003
 2016-04-13 13:27:02 -04:00