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

13107 Commits

Author SHA1 Message Date
Usman Khalid
acd392f040 Fix flaky videoplayer bokchoy test. 2016-04-22 13:12:09 +05:00
Ben Patterson
76d3f5d8cb Merge pull request #12196 from edx/muddasser/updated_ff/sel_253/test_edit_raw_html 
Use type_in_codemirror instead of ActionChain to set content.
 2016-04-21 20:17:47 -04:00
Renzo Lucioni
1ffa81f746 Retrofit programs data mixin with factories 
This should make it easier to test programs-related features. Preface to ECOM-3200.
 2016-04-21 15:03:38 -04:00
Muddasser
5aaa045919 Use type_in_codemirror instead of actionchain to set contents in editor 2016-04-21 20:48:36 +05:00
Diana Huang
67c055e23f Merge pull request #12206 from CredoReference/impossible-to-click-check-without-answer 
Make it impossible to click "final check" without selecting a choice
 2016-04-21 11:00:44 -04:00
Dmitry Viskov
61127b613b Make it impossible to click "final check" without selecting a choice 2016-04-21 00:15:20 +03:00
Muddasser
72c058f2a9 Merge pull request #12146 from edx/muddasser/updated_ff/sel_253/test_youtube_id_w_different_local_server_sub 
fixed button click issue while repacing subtitles.
 2016-04-20 22:45:33 +05:00
Adam
96cbc7c50f Merge pull request #12202 from edx/adam/fix-pre-1900-course-setting-date 
fix issue with pre-1900 course setting dates (TNL-4397)
 2016-04-20 11:38:41 -04:00
Adam Palay
26377a5732 fix issue with pre-1900 course setting dates (TNL-4397) 2016-04-20 10:44:13 -04:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Ben Patterson
85453fb059 Merge pull request #12175 from edx/benp/sel-253-ff42-fix-edit-test 
fix flaky condition in education dropdown.
 2016-04-20 08:39:57 -04:00
Adam
95ae255719 fix flaky test for oauth redirects (TNL-4190) (#12187) 2016-04-20 08:39:06 -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
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
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05: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
Ben Patterson
1d57b498be fix flaky condition in education dropdown. 2016-04-15 18:49:44 -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
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
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
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
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
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
tasawernawaz
e962a39ef7 Revert "ECOM-3201" 
This reverts commit 628843f62c.
 2016-04-14 14:23:41 +00:00
Muddasser
e925171361 fixed button click issue while repacing subtitles. 2016-04-14 17:55:19 +05:00
wajeeha-khalid
e020869089 refactored variable name 2016-04-14 16:42:57 +05:00
Ayub-khan
d8464dbfb0 -changed method name from "from_string_or_404" to "course_key_from_string_or_404". 
-Updated method "course_key_from_string_or_404" to raise message too.
-Wrote tests for "course_key_from_string_or_404" when exception message is given.
-Modified existing methods to use "ddt.data".
-Used Splunk logs to find exectly where we were getting "Invalid Key Error"
-Updated Views where we were getting "Invalid Key Error" in splunk logs.
-Wrote tests for those View End points where we were getting "Invalid Key Error"
 2016-04-14 15:57:39 +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
5b5fb2464d TNL-3818: fixed recent activity mapping in thread-list sort for Forums Web 2016-04-13 17:47:31 +05: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
Ned Batchelder
537dd040c8 Merge pull request #12117 from edx/ned/fix-mako-encoding 
Fix encoding of Django-called Mako files to be safe
 2016-04-12 14:21:12 -04: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
16ac76d00b Merge pull request #12121 from edx/diana/revert-final-check 
Revert "Make it impossible to click "final check" without selecting a…
 2016-04-12 10:15:18 -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
Toby Lawrence
95fde6d527 Revert "[PERF-274] Add NewRelic instrumentation to contentserver." 
This reverts commit 09586d8a37.
 2016-04-12 10:05:18 -04:00