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

14044 Commits

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
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
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
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
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
Ned Batchelder
1a2ba1a533 Reduce the use of 'Open edX' as a noun 2016-05-02 12:44:28 -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
Ahsan Ulhaq
f995114d11 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-02 13:15:18 +05: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
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
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
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
Ned Batchelder
4cc4e6559c Merge pull request #12295 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-28 12:22:33 -04:00
Ben Patterson
a61707b8e6 Merge pull request #12272 from edx/benp/shard4-lms 
Create a 4th shard for lms unit tests
 2016-04-28 11:18:43 -04:00
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
Ben Patterson
1db84e79df Additional shard balancing changes for unit tests. 2016-04-28 10:09:32 -04:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-04-28 10:09:32 -04:00
AlasdairSwan
61a5cd4d8f Renamed 'programId' to use 'id' 2016-04-28 09:44:08 -04:00
Ayub khan
9376c67360 Merge pull request #12293 from edx/revert-12144-SUST-35-course_key_from_string_or_404 
Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404"
 2016-04-28 18:38:16 +05:00
clrux
1aab751609 Merge pull request #12284 from edx/clrux/removing-outline-from-main 
Removing the focus outline for the main container in LMS
 2016-04-28 07:19:49 -04:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
Waheed Ahmed
b7b4e0b041 Added Kosovo in django country list. 
ECOM-4292
 2016-04-28 00:17:06 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
Chris Rodriguez
746cae2c9a Removing the focus outline for the main container in LMS 2016-04-27 14:32:37 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Brian Jacobel
19b9242986 Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates 
Fix errors in old Django templates / migrate to Mako
 2016-04-27 13:39:54 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix 
Fix Next Button's 404 error
 2016-04-27 13:18:39 -04:00
Brian Jacobel
0f1366a7fb Merge pull request #12251 from edx/bjacobel/use-unminified-assets 
Use unminified picturefill in development
 2016-04-27 12:12:43 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal 
Remove XML modulestore code from most tests.
 2016-04-27 11:20:02 -04:00
Brian Jacobel
12d65f5801 Use unminified picturefill in development 2016-04-27 10:23:07 -04:00
Ahsan Ulhaq
edb356a43a Merge pull request #12273 from edx/ahsan/revert-ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page 
Revert "Add js test for analytics event on LMS receipt page"
 2016-04-27 18:38:45 +05:00