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

36618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
6ba7133ba7 Merge pull request #12343 from edx/afzaledx/SOL-1780-increased-in-exam-polling-interval 
Bumped the proctoring version.
 2016-05-04 11:14:16 -04:00
clrux
972cee481f Merge pull request #12351 from edx/clrux/ac-452 
AC-452 removing unnecessary and incorrect aria-label
 2016-05-04 10:55:52 -04:00
Toby Lawrence
00cbc291e6 Merge pull request #12283 from edx/PERF-317 
Add NewRelic instrumentation to contentserver.
 2016-05-04 09:57:35 -04:00
Usman Khalid
d99978870a Merge pull request #12312 from edx/usman/tnl4398-fix-tests 
Re-enable spec files that were disabled during the Jasmine upgrade.
 2016-05-04 17:16:58 +05: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
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
Chris Rodriguez
0723b98283 AC-452 removing unnecessary and incorrect aria-label 2016-05-03 13:53: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
Afzal Wali
15b113b657 Bumped the proctoring version. 2016-05-03 17:48:53 +05:00
Usman Khalid
78af4100cd Fixes for course updates date validation. 
If the first date the user selects is invalid it is not set on the
model. This is because jQuery datepicker's getDate returns the
current date when an invalid value is put in the field and the
model's initial value is also the current date. So always update
the date.
 2016-05-03 15:41:22 +05: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
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
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