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

35669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Desjardins
afd04658cd Adding the -n option to the Sphinx build invocation so that WARNINGs will be treated as ERRORs. This will cause builds to fail if Sphinx cannot import modules for its autoclass directives. Currently, they fail silently and leave gaps in the published HTML where docstring content should have been. 2016-03-03 14:52:29 -05:00
Ned Batchelder
fd4164de1d Merge pull request #11737 from edx/release 
Release ⇒ master
 2016-03-03 14:51:29 -05:00
Toby Lawrence
4ca2692f5d Rename 'clean_headers' to 'header_control'. 
This is part of adding the ability to forcefully set headers through the
middleware in addition to removing specific headers.
 2016-03-03 14:00:12 -05:00
Ned Batchelder
b653e28e5c Mark two tests flaky. TNL-4190 TNL-4191 2016-03-03 13:14:12 -05:00
Ned Batchelder
e3522d1fae Mark a flaky test, SOL-1654 2016-03-03 12:44:18 -05:00
raeeschachar
ad5cec1046 Merge pull request #11598 from edx/raees/chrome-added-flaky-tests 
Added Flaky decorator to Chrome flaky tests
 2016-03-03 22:10:49 +05:00
John Eskew
516db0d704 Bump the Django version to 1.8.10 2016-03-03 11:35:34 -05:00
Ned Batchelder
09a220cb43 Update translations (autogenerated message) 2016-03-03 16:10:12 +00:00
Simon Chen
1102412603 Merge pull request #11725 from edx/schen/ECOM-3415 
ECOM-3415 - Dashboard should show all XSeries association messages
 2016-03-03 10:00:54 -05:00
raeeschachar
010fb68e6a Added Falky decorator to Chrome flaky tests 2016-03-03 19:55:26 +05:00
Ned Batchelder
00b270c33e Merge pull request #11675 from edx/rc/2016-03-01 
Release Candidate rc/2016-03-01
 2016-03-03 09:49:35 -05:00
Simon Chen
b47a6d592f ECOM-3415 make sure all the xseries programs associated with a course is displayed 2016-03-03 08:42:14 -05:00
Omar Khan
64b01e9e48 Merge pull request #11694 from open-craft/omar/hide-tos 
Registration: don't require terms of service if checkbox is hidden
 2016-03-03 18:05:47 +07:00
Omar Khan
50b6bf27f2 Registration: don't require terms of service if checkbox is hidden 
Fixes test failures in e461374973
 2016-03-03 16:58:58 +07:00
Dmitry Viskov
ca82f143b0 When using in-frame LTI navigation in IE 10 & 11, problems are not rendering properly. 
The problems render properly in IE 10 & 11 when using edX directly, or when opening LTI in a new tab.
This is reproducible in Canvas and D2L
 2016-03-03 12:27:21 +03:00
Awais Jibran
d46ea873d0 Merge pull request #11656 from attiyaIshaque/ai/tnl3848-list-index-out-of-range 
Fix list index out of range in Textbook's chapters.
 2016-03-03 11:41:49 +05:00
Nimisha Asthagiri
a0871900e6 Merge pull request #11734 from edx/security/quiet_safe_sessions 
Quiet the safe sessions logging for expected use cases
 2016-03-02 18:01:15 -05:00
Christina Roberts
315592bb6b Merge pull request #11732 from edx/christina/remove-profile-name 
Remove unused profile name.
 2016-03-02 17:09:58 -05:00
Jesse Zoldak
ec33db5a11 Remove more lettuce tests that are covered already in bok choy tests 2016-03-02 16:18:07 -05:00
Jesse Zoldak
9ebfc49b93 Wait for the Advanced problem tab to be active. Remove the __test__ signifier. 2016-03-02 16:16:45 -05:00
Nimisha Asthagiri
de3fca35be Quiet the safe sessions logging for expected use case 2016-03-02 14:47:44 -05:00
David Ormsbee
637df3ed64 Merge pull request #11733 from edx/ormsbee/revert_pr_11523 
Revert "Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops
 2016-03-02 14:20:59 -05:00
David Ormsbee
19d9920b9f Revert "Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops" 
This reverts commit acf6c1d609, reversing
changes made to c59db6e5fc.
 2016-03-02 13:15:17 -05:00
cahrens
3a06534241 Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used.
 2016-03-02 11:49:33 -05:00
Jesse Zoldak
2c8148c7bc Convert tests for adding advanced problem components from lettuce to bok-choy 
TE-1201
 2016-03-02 11:08:59 -05:00
Brian Beggs
bfdd1883f2 Merge pull request #11546 from mitocw/feature/aq/allow_staff_view_coach_dashboard_mitocw#125 
Allowed staff/admin of course to view ccx coach dashboard
 2016-03-02 09:01:36 -05:00
Ayub khan
b462e632ef Merge pull request #11119 from Ayub-Khan/ayubkhan/TNL-767 
Fix behaviour on empty response to problems
 2016-03-02 13:28:06 +05:00
Attiya Ishaque
99e717fb11 Fix list index out of range in Textbook's chapters. TNL-3848 2016-03-02 10:30:44 +05:00
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include: 
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
 2016-03-02 03:37:13 +03:00
John Eskew
2ab54f315a Merge pull request #11669 from edx/jeskew/fix_django19_warnings 
Add app_label to models to prevent Django1.9 warnings.
 2016-03-01 17:19:55 -05:00
Renzo Lucioni
d481768571 Merge pull request #11691 from edx/jeskew/shared_modulestore_test_case_conversion 
WIP: Lots of Python unittest speedups
 2016-03-01 16:50:27 -05:00
Ayub khan
be7be407cb Merge pull request #11478 from Ayub-Khan/ayubkhan/ECOM-3603 
Fixed progress exception for credit courses
 2016-03-02 01:10:17 +05:00
Renzo Lucioni
b02d1c1205 Merge pull request #11721 from edx/renzo/comment-client-test-speedup 
Speed up comment client tests
 2016-03-01 14:51:02 -05:00
Renzo Lucioni
1f0e61baa9 Speed up comment client tests 
Also accelerates forums UnicodeTestCases
 2016-03-01 14:41:52 -05:00
John Eskew
26f0cd5246 Merge pull request #11716 from edx/jeskew/export_format_conversion_removal 
Remove multiple course export format versions.
 2016-03-01 14:28:53 -05:00
Kevin Falcone
a561367515 This should not be needed, we specify ATOMIC_REQUESTS on each DB 
There is one DB where we do not want it specified since transactions
on the CSMHE table when we aren't atomic across databases isn't a win.
 2016-03-01 14:00:13 -05:00
Kevin Falcone
327cdafccf Merge pull request #11715 from edx/jibsheet/aws_migrate-ignore-read-replica 
Don't hardcode student_module_history
 2016-03-01 13:12:54 -05:00
John Eskew
80ac3fcca2 Remove the concept of having more than one course export format tagged. 2016-03-01 12:59:59 -05:00
John Eskew
7bde238b3f Merge pull request #11711 from edx/jeskew/more_unittest_speedup 
Use SharedModuleStoreTestCase in the courseware navigation tests for speedup.
 2016-03-01 12:50:53 -05:00
Renzo Lucioni
cd84a9e77e Merge pull request #11714 from edx/renzo/sysadmin-xml 
Whittling away at XML modulestore code
 2016-03-01 12:47:00 -05:00
Bill DeRusha
95007a83b1 Merge pull request #11713 from edx/bderusha/git-add-speedup 
Add SharedModuleTestCase to git_import tests
 2016-03-01 12:13:51 -05:00
Kevin Falcone
72b4cf377b Don't hardcode student_module_history 
aws_migrate may be used on boxes where that DB does not yet exist.
 2016-03-01 11:56:11 -05:00
John Eskew
72ce55c8a2 Convert to SharedModuleStoreTestCase 2016-03-01 11:09:18 -05:00
Renzo Lucioni
32a29f4f26 Convert SysadminBaseTestCase to SharedModuleStoreTestCase 2016-03-01 11:02:01 -05:00
John Eskew
f6cdcdf52c Remove sysadmin feature to import course from git into XML modulestore. 2016-03-01 11:00:25 -05:00
Bill DeRusha
d8404ba477 Add SharedModuleTestCase to git_import tests 2016-03-01 10:54:54 -05:00
Muddasser
aaa3d972c6 Merge pull request #11707 from edx/muddasser/bokchoy-test_accepting_redirects 
Check both url and title for the presence of code
 2016-03-01 19:56:37 +05:00
Bill DeRusha
8b28790050 Merge pull request #11699 from edx/bderusha/django-bug-fix-mp 
Monkey patch django.db.models.options for faster cache expiry
 2016-03-01 09:25:01 -05:00
John Eskew
9d74b4d2f3 Merge pull request #11700 from edx/jeskew/my_unittest_speedups 
Unit test speedups - Add context manager to SharedModuleStoreTestCase.
 2016-03-01 09:23:29 -05:00
Ben Patterson
acae281f82 Merge pull request #11677 from edx/benp/tnl-4151-fix2 
Ensuring page is loaded belongs in the page object.
 2016-03-01 08:56:37 -05:00