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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
f0c1318041 Add XML_COURSE_DIRS back in. 2016-05-02 13:08:58 -04:00
John Eskew
a08f4d3cc3 Remove non-existent import. 2016-05-02 13:08:58 -04:00
John Eskew
2c20ac7c00 Remove comments that refer to XML courses. 2016-05-02 13:08:57 -04:00
John Eskew
23f80d8fc5 Fix PEP8 error 2016-05-02 13:08:57 -04:00
John Eskew
971a198fb9 Remove ModuleStoreEnum.Type.xml 2016-05-02 13:08:57 -04:00
John Eskew
2380fa3c2c Unify usage of a single test mixed modulestore called: 
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
 2016-05-02 13:08:27 -04:00
John Eskew
7aa3ee8df9 Remove unused xml_source_dirs from mixed modulestore config. 2016-05-02 13:08:26 -04:00
John Eskew
39ac2579dc Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
2090f07344 Remove XML-backed course-specific test. 2016-05-02 13:08:26 -04:00
John Eskew
134fb9c269 Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
4106528e1a Fix toy course textbook test - use Mongo-backed test course. 2016-05-02 13:08:26 -04:00
John Eskew
71d7f1c81b Skip test with static tabs - seems broken. 2016-05-02 13:08:25 -04:00
John Eskew
dd159bce12 Import test course instead of using XML-backed course. 2016-05-02 13:08:25 -04:00
John Eskew
775723b98a Use ToyCourseFactory instead of the XMLModuleStore-backed toy course. 2016-05-02 13:08:25 -04:00
John Eskew
14a8314adc Remove include_xml option. 2016-05-02 13:08:25 -04:00
John Eskew
0aa9f9062b Remove more XML modulestore test code. 2016-05-02 13:08:25 -04:00
John Eskew
7987b16a18 Remove XML modulestore code - discovery work 2016-05-02 13:08:25 -04:00
Douglas Hall
735d82ba46 Merge remote-tracking branch 'origin/release' into merge_patch-2016-05-02_into_master 2016-05-02 12:54:51 -04:00
Ned Batchelder
1a2ba1a533 Reduce the use of 'Open edX' as a noun 2016-05-02 12:44:28 -04:00
Douglas Hall
2d6604a00d Merge pull request #12318 from edx/hotfix/2016-05-02 
Patch Release 2016-05-02 WL Studio Course Details Fields
 2016-05-02 12:42:56 -04:00
Usman Khalid
8fef4148a5 Re-enabled videolist_spec, message_manager_spec and file_uploader_spec. 2016-05-02 20:54:59 +05:00
Usman Khalid
68e2414053 Use triggerHandler instead of trigger to bypass Karma's global error handler. 
Karma has a global event handler for events named "error" which
expects the event data to be a string and so fails when this
event is triggered. So we use triggerHandler which only invokes
handlers attached via jQuery.
 2016-05-02 20:54:59 +05:00
Toby Lawrence
bfefde09b6 [PERF-274] [PERF-317] Add NewRelic instrumentation to contentserver. 
This includes the course key/path for a given contentserver request,
 whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests
 are coming into the contentserver to figure out whether or use of
 a CDN in front of these assets is as efficient as effective as it
 could be.
 2016-05-02 11:28:44 -04:00
Bill DeRusha
25df9db6ff WIP django catalog admin 2016-05-02 11:20:31 -04:00
Bill DeRusha
ffdacc9129 Use asymmetric key for signing JWTs 2016-05-02 11:17:32 -04:00
David Ormsbee
f3b33ef14f Merge pull request #12275 from edx/ormsbee/video_state_opt_2 
Remove unnecessary VideoModule save_states.
 2016-05-02 10:54:40 -04:00
cahrens
d9bb206868 Jasmine-jquery was moved to npm. 2016-05-02 10:27:33 -04:00
Ahsan Ulhaq
dde18c7e5f Merge pull request #12290 from edx/zub/ecom-4281-add-receipt-page-analytics-event-js-test 
Add js test for analytics event on LMS receipt page
 2016-05-02 19:14:26 +05:00
Ayub khan
7a6278e69b Merge pull request #12321 from edx/revert-10705-mrehan/SUST-22 
Revert "Implement 'from_string_or_404' in utils"
 2016-05-02 17:25:32 +05:00
Chris Rodriguez
817449c761 AC-448 updating tabindex from 1 to 0 (zero) 2016-05-02 08:03:37 -04:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05:00
Robert Raposa
fb13dc6499 Move MakoLinter. 2016-05-02 05:04:51 -04:00
Ahsan Ulhaq
f995114d11 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-02 13:15:18 +05:00
asadiqbal
59f70cf85d WL-399 Course Details List Fields 2016-05-01 22:20:24 -04:00
Douglas Hall
a6b9ba7d21 Merge pull request #12203 from edx/asadiqbal08/WL-399 
WL-399 Studio Course Details List Fields
 2016-05-01 22:13:52 -04:00
Ibrahim
a13e531042 WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-05-01 20:33:40 -04:00
Ibrahim
357a9f8080 add new text fields to schedule and details settings page 2016-05-01 20:31:07 -04:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Douglas Hall
b34b7cbc6f Merge pull request #12317 from edx/douglashall/decorate_flaky_studio_settings_image_upload_tests 
Fix flaky Studio settings page image upload acceptance tests
 2016-05-01 13:53:00 -04:00
Douglas Hall
c896e491ae Fix flaky Studio settings page image upload acceptance tests 2016-05-01 11:48:44 -04:00
Douglas Hall
f73421863e Merge pull request #12256 from edx/ibrahimahmed443/WL-398-image-fields-in-studio 
WL-398 Add hero image and thumbnail image fields to Studio schedule and details settings page for WL site courses
 2016-04-30 17:06:00 -04:00
Ibrahim
f7f281b65b WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-04-30 15:25:17 -04:00
David Ormsbee
f9d85e650c Remove unnecessary VideoModule save_states. 
Before this commit, roughly half the save_state AJAX calls for the
VideoModule were done at load time, in order to send information about
YouTube availability (the value for which was almost always true).

This commit sends the value for what the LMS already thinks YouTube
availability is for this user, so that the AJAX callback is only
used in the case where the client side sees something different.

[PERF-262]
 2016-04-29 16:32:17 -04:00
Muddasser
c283afccbc Merge pull request #12268 from edx/muddasser/bokchoy/chrome/test_badge_share_modal 
Fixed close button click issue
 2016-04-30 00:42:24 +05:00
clrux
b69fea7233 Merge pull request #12306 from edx/clrux/tnl-4444 
TNL-4444 correcting fullscreen transcript skip links
 2016-04-29 14:16:15 -04:00
Peter Desjardins
61f48de382 Merge pull request #12298 from edx/pdesjardins/DOC-2854 
Mocking some modules that were missing during platform API doc builds.
 2016-04-29 14:00:26 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
Renzo Lucioni
a77e6ea247 Merge pull request #12304 from edx/alasdair/ECOM-3968-program-card-link-alt-text-update 
ECOM-3968 updated program card link alt text
 2016-04-29 10:47:54 -04:00
Chris Rodriguez
b20414bdbc TNL-4444 correcting fullscreen transcript skip links 2016-04-29 10:04:54 -04:00
Eric Fischer
955282f9c7 Merge pull request #12165 from edx/efischer/hide_timed_exams 
TNL-4366 Hide Timed Exams
 2016-04-29 09:28:16 -04:00