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

36591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rodriguez
0723b98283 AC-452 removing unnecessary and incorrect aria-label 2016-05-03 13:53:35 -04:00
John Eskew
b5ab64505a Merge pull request #11331 from CredoReference/invalid-studio-user-permissions 
Invalid StudioPermissionsService object in API to show/save xblock settings in CMS
 2016-05-03 13:16:43 -04:00
Christina Roberts
04b80f0404 Merge pull request #12326 from edx/christina/delete-old-jasmine-jquery 
Jasmine-jquery was moved to npm.
 2016-05-03 12:54:30 -04:00
Nimisha Asthagiri
0b6da4cd5a Merge pull request #12267 from edx/tnl/refactor_courseware_index 
Refactor courseware index
 2016-05-03 11:22:17 -04:00
Christina Roberts
f0f0645007 Merge pull request #12278 from edx/christina/cohort-messages 
Add messaging when verified track content MVP is enabled.
 2016-05-03 10:14:15 -04:00
Nimisha Asthagiri
c6954902e3 Create courseware/views folder 2016-05-03 09:02:45 -04:00
Nimisha Asthagiri
2f581448da Refactor Courseware Index 
MA-2189
 2016-05-03 09:02:44 -04:00
cahrens
0f8b24523c Remove second page tag. 2016-05-02 16:56:52 -04:00
Robert Raposa
b1313671e3 Merge pull request #12319 from edx/robrap/linter-move-mako 
Move MakoTemplateLinter.
 2016-05-02 15:42:47 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
clrux
15fc53c779 Merge pull request #12279 from edx/clrux/ac-448 
AC-448 removing tabindex from canvas elements
 2016-05-02 14:20:36 -04:00
Ned Batchelder
a03ab9944c Merge pull request #12328 from edx/ned/openedx-is-an-adjective 
Reduce the use of 'Open edX' as a noun
 2016-05-02 14:10:41 -04:00
Douglas Hall
1fc703805a Merge pull request #12332 from edx/merge_patch-2016-05-02_into_master 
Merge patch 2016 05 02 into master
 2016-05-02 13:55:43 -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
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
M. Rehan
bc28df903a Merge pull request #12261 from edx/jibsheet/html-escape-email-settings-edx-dashboard 
TNL-4396 Apply same fix to edx dashboard
 2016-04-29 18:10:53 +05:00
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting 
When using RequireJS load spec files one by one.
 2016-04-29 17:09:57 +05:00
AlasdairSwan
294e1782f6 ECOM-3968 updated program card link alt text 2016-04-29 08:03:40 -04:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
Usman Khalid
6c26715a14 Make hashes unique so that they do not conflict with hashes from module_edit_spec.coffee. 2016-04-29 15:54:48 +05:00
Usman Khalid
8f79d8013f Turn off global ajaxError handler in afterEach in teams tab factory specs. 2016-04-29 15:54:48 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-04-29 15:54:47 +05:00
Kevin Falcone
ea522a1797 Merge pull request #12288 from edx/jibsheet/paver-migrate-multiple-dbs 
Switch to using the standard edxapp-migrate-(lms|cms) tools
 2016-04-28 21:50:41 -04:00
Robert Raposa
1dfe0e8a4e Merge pull request #12254 from edx/robrap/linter-javascript-context 
TNL-4427: Add additional JavaScript context tags
 2016-04-28 18:00:20 -04:00