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

36313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Viskov
61127b613b Make it impossible to click "final check" without selecting a choice 2016-04-21 00:15:20 +03:00
Eric Fischer
47e4804b52 Merge pull request #11941 from CredoReference/invalid-order-in-problem-grade-report-csv 
EdX problem grade report doesn't order problems as shown in course
 2016-04-19 18:38:01 -04:00
Jesse Zoldak
15229ce96b Merge pull request #12191 from edx/revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Adding background image for xseries certificates on dashboard side bar panel"
 2016-04-19 11:46:23 -07:00
Jesse Zoldak
270814102f Revert "Adding background image for xseries certificates on dashboard side bar panel" 2016-04-19 13:52:19 -04:00
sanfordstudent
adcf4a98c7 Merge pull request #12038 from edx/sstudent/seq_item_title_ 
Displaying title of item in course sequence tooltip instead of list of item's children
 2016-04-19 13:32:34 -04:00
Calen Pennington
b2dace8069 Merge pull request #11808 from CredoReference/adapt-asides-to-be-exported-to-xml 
Adaptation asides to be exported to the XML
 2016-04-19 11:31:41 -04:00
Renzo Lucioni
c643bdf719 Merge pull request #12173 from edx/renzo/upgrade-management-commands 
Upgrade edx-management-commands to 0.1.1
 2016-04-19 11:05:49 -04:00
Sanford Student
bbcec0cf40 displaying title of sequence item in tooltip instead of children 2016-04-19 10:28:47 -04:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
 2016-04-19 18:44:13 +05:00
Adam
e896359846 fix flaky oauth test (#12168) 2016-04-19 09:09:35 -04:00
Ayub-khan
66f52ba6e9 -fixed Tests. 2016-04-19 16:04:39 +05:00
Awais Qureshi
298770e51b Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view 
Adding background image for xseries certificates on dashboard side bar panel
 2016-04-18 16:22:11 +05:00
tasawernawaz
75c0ec6149 Merge pull request #12178 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-18 15:55:30 +05:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00
Awais
54058f6e58 Adding background image for xseries certificates on programs dashboard side bar panel. 
ECOM-3199
 2016-04-18 12:50:08 +05:00
Ayub-khan
9e3f68c0a0 -Addressed wrong course id comment. 2016-04-18 12:03:46 +05:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05:00
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
Dmitry Viskov
0e7a837e11 The problem Grade Report (from the Data Downloads page) must show the problems in the order they occur within the course. 2016-04-17 02:45:02 +03: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
Dmitry Viskov
0151a149b0 Asides can be exported with the rest of courseware through the Export function within CMS 2016-04-16 03:48:23 +03:00
Renzo Lucioni
8304c96808 Upgrade edx-management-commands to 0.1.1 2016-04-15 17:43:56 -04: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
Ayub-khan
ef70d017c8 -fixed failing tests 
-Adressed all comments
 2016-04-15 15:40:21 +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