Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
reciproco
c9727a2bbb Fix CRI-57 Bug 
Fix error in instructor dashboard, data download section, when trying to download a csv with the issued certificates in a spanish (es-419) configured edx-platform deployment returns a UnicodeEncodeError: 'ascii' codec can't encode character u'\xf3' in position 16: ordinal not in range(128)
 2016-05-08 22:18:12 +02:00
Carol Tong
26ea2dff56 Merge pull request #12311 from edx/carol/doc/DOC-2862_All 
DOC-2862: Add doc for Courses API
 2016-05-06 17:08:32 -04:00
Carol Tong
a1394e9945 Add documentation for Courses API 2016-05-06 15:40:21 -04:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Calen Pennington
e97af55eec Add a nicer repr to AccessResponse objects 2016-05-04 14:51:31 -04:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests 
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
 2016-05-04 14:51:30 -04:00
Douglas Hall
e97fa49bea Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-04 14:31:26 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp. 
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
 2016-05-04 11:35:55 -04:00
Calen Pennington
39ff841d1f Don't pass arguments to setUp (for UrlResetMixin) 
The TestCase API doesn't accept arguments, so passing arguments for some
TestCase subclasses makes adding new inheritance/mixins tricky. Instead,
prefer configuration via class attributes for TestCases.
 2016-05-04 11:34:51 -04:00
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
f5223a36d3 Merge branch 'master' into malikshahzad228/additional_course_fields 2016-05-03 15:03:46 -04: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
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
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
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -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
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
Usman Khalid
8f79d8013f Turn off global ajaxError handler in afterEach in teams tab factory specs. 2016-04-29 15:54:48 +05: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
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
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
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
John Eskew
8354e6d79c Fix quality issue. 2016-04-27 09:27:36 -04:00
Renzo Lucioni
63b65ab035 Merge pull request #12231 from edx/renzo/program-progress 
Measuring program progress
 2016-04-27 09:24:09 -04:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error 
MA-2305
 2016-04-26 20:21:08 -04:00
Renzo Lucioni
5da6a598dd Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-04-26 13:36:58 -04:00
Clinton Blackburn
3138ff9724 Merge pull request #12194 from edx/clintonb/jwt-oauth-access-token 
Updated access token view to return a JWT as an access token
 2016-04-26 12:35:32 -04:00
Clinton Blackburn
6941fcd766 Updated access token view to return a JWT as an access token 
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).

ECOM-4221
 2016-04-26 09:32:49 -04:00
Waheed Ahmed
61de4ffc71 Fixed celery task. 
ECOM-3437
 2016-04-26 17:37:02 +05:00
Brian Jacobel
e576733608 Mako templates return context in .context_data rather than .context 2016-04-25 15:08:16 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Waheed Ahmed
f246c6bbd6 Automatically enable Self Generating Certificates for Self Paced Courses. 
ECOM-3437
 2016-04-25 17:52:47 +05:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
Giovanni Di Milia
090cefcf44 Added REST API for certificates in LMS (#12055) 2016-04-21 17:15:06 -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
John Eskew
88927c74d9 Fix static tabs test. 2016-04-21 14:39:29 -04:00