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

36605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
da5b97284e Merge pull request #12322 from edx/malikshahzad228/additional_course_fields 
WL-401 Add CourseDetails model to course_about template context
 2016-05-03 17:21:26 -04:00
Robert Raposa
24ad0059f3 Merge pull request #12352 from edx/robrap/linter-false-positives-3 
Fix Python false positives with AST.
 2016-05-03 17:03:32 -04:00
Douglas Hall
e14004599d Merge pull request #12337 from edx/douglashall/SOL-1777/fix_gating_with_library_content 
SOL-1777 Allow content gating to work with library_content blocks
 2016-05-03 16:21:18 -04:00
Robert Raposa
60d11bf2fd Fix Python false positives with AST. 
- Use AST to parse Python.
- Refactor Mako to use Python linting.
- Add optional verbose script argument.
- Skip tests.py files when linting.
 2016-05-03 15:17:09 -04:00
Douglas Hall
f5223a36d3 Merge branch 'master' into malikshahzad228/additional_course_fields 2016-05-03 15:03:46 -04:00
tasawernawaz
6d315a9a50 Merge pull request #12324 from edx/tasawer/story/ecom-3731-update-browse-new-courses-area 
Update browser new course area
 2016-05-04 00:01:42 +05:00
Douglas Hall
c7b2d9870c Allow content gating to work with library_content blocks 2016-05-03 14:54:58 -04:00
Christina Roberts
5b26a2f73f Merge pull request #12350 from edx/christina/instructor-dashboard-xss 
Clean up HTML encoding.
 2016-05-03 14:41:19 -04:00
AlasdairSwan
bd2859977d Merge pull request #12316 from edx/alasdair/ECOM-4315-edx.org-pattern-library-page-footer 
ECOM-4313 Styled footer on pattern library pages
 2016-05-03 14:12:30 -04:00
Malik Shahzad
d64e4b064c Add CourseDetails model to course_about template context. 2016-05-03 14:00:35 -04:00
Christina Roberts
ce53392ae5 Merge pull request #12335 from edx/christina/tnl-4193 
HTML-encode string values in keyword substitution.
 2016-05-03 13:45:31 -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
cahrens
76545ef49c HTML-encode string values in keyword substitution. 
TNL-4193
 2016-05-03 12:36:44 -04:00
cahrens
f0f7cf4d33 Clean up HTML encoding. 2016-05-03 12:32:48 -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
Tasawer
4a18ec8041 ECOM-3731 update browser new course area 2016-05-03 15:14:32 +00:00
AlasdairSwan
2c8f3c8046 Styled footer on pattern library pages 2016-05-03 10:32:35 -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