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

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
16fbad3f56 Add a circle-R to the initial welcome message 2016-05-04 15:13:18 -04:00
Christina Roberts
8127158e2a Merge pull request #12360 from edx/christina/tnl-4238 
Fix incorrect truncation issue.
 2016-05-04 15:02:56 -04:00
Calen Pennington
e97af55eec Add a nicer repr to AccessResponse objects 2016-05-04 14:51:31 -04:00
Calen Pennington
b3880714b9 Assert that caches are being overridden correctly (and being reset in the right order) 2016-05-04 14:51:31 -04:00
Calen Pennington
e87a8a0de3 Make tests run in verbose mode 2016-05-04 14:51:31 -04:00
Calen Pennington
9986efb9d7 Enable nose-faulthandler to catch segfaults during tests 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
Peter Fogg
268cb2ea17 Correctly pull in API access email config. 2016-05-04 14:23:46 -04:00
cahrens
b1f715690a Fix incorrect truncation issue. 
TNL-4238
 2016-05-04 13:28:06 -04:00
Clinton Blackburn
d6f68ca5ff Merge pull request #12307 from edx/rc/2016-05-03 
Release Candidate rc/2016-05-03
 2016-05-04 12:44:10 -04:00
Peter Fogg
85a6954d87 Merge pull request #12265 from edx/peter-fogg/catalog-admin-ui 
Catalog admin UI.
 2016-05-04 12:31:56 -04:00
Brian Jacobel
6055205dd4 Merge pull request #12356 from edx/karma 
JS tests no longer use js-test-tool
 2016-05-04 12:27:23 -04:00
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -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
Brian Jacobel
df32d2a130 Path update for Karma debug runner 2016-05-04 10:34:59 -04:00
Brian Jacobel
1d49dd9d49 JS tests no longer use js-test-tool 2016-05-04 10:28:38 -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
clrux
0bf5a3d7b7 Merge pull request #12355 from edx/clrux/rc-2016-05-03-progress_fix 
Moving main element up higher to not conflict with chart
 2016-05-03 22:28:10 -04:00
Chris Rodriguez
cf0b80984b Moving main element up higher to not conflict with chart 2016-05-03 21:35:27 -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
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
clrux
a5237c1b28 Merge pull request #12349 from edx/clrux/rc-2016-05-03-display_issue 
Overriding display table-cell on instructor dashboard
 2016-05-03 12:40:36 -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
clrux
b4f3398b83 Merge pull request #12348 from edx/clrux/rc-2016-05-03-nav_skip 
Removing nav_skip block from template
 2016-05-03 12:30:08 -04:00
Chris Rodriguez
433a9deff6 Overriding display table-cell on instructor dashboard 2016-05-03 11:50:28 -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
Chris Rodriguez
3b81e73e2e Removing nav_skip block from template 2016-05-03 11:18:41 -04:00
Tasawer
4a18ec8041 ECOM-3731 update browser new course area 2016-05-03 15:14:32 +00:00
John Eskew
b73576ada3 Upgrade to Django 1.8.13 2016-05-03 11:11:26 -04: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