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

35567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Gaylard
2fe0bf5a98 Fix TNL-3429. 2016-03-04 13:38:20 -06:00
Douglas Hall
2b880d2d83 Merge pull request #11753 from edx/douglashall/release_edx_proctoring_0_12_12 
Fixed edx-proctoring requirement
 2016-03-04 12:51:17 -05:00
Robert Raposa
674f8eab8e Merge pull request #11638 from edx/robrap/markup 
Use markup HTML helper with Text
 2016-03-04 12:32:00 -05:00
Douglas Hall
86cd089ff6 Fixed edx-proctoring requirement 2016-03-04 11:33:40 -05:00
Douglas Hall
db47e4357d Merge pull request #11678 from edx/douglashall/release_edx_proctoring_0_12_12 
Incremented edx-proctoring version for 0.12.12 release
 2016-03-04 11:20:43 -05:00
John Eskew
d398f50786 Merge pull request #11490 from edx/jeskew/PLAT_736_fix_content_lib_export_import 
Fix content library export with empty problems.
 2016-03-04 11:03:27 -05:00
John Eskew
561950aafc Merge pull request #11717 from edx/jeskew/django_upgrade_1_8_10 
Going head with the bump to Django version 1.8.10 - hopefully, 1.8.11 will show up soon and we'll be able to remove this monkeypatch.
 2016-03-04 10:57:20 -05:00
Robert Raposa
8e1e4a4715 Use markup HTML helper with Text 
TNL-4160
 2016-03-04 10:44:41 -05:00
Peter Desjardins
66ae31f556 Merge pull request #11747 from edx/pdesjardins/DOC-2250 
Fix minor typographical errors in the platform API documentation
 2016-03-04 10:43:39 -05:00
Ned Batchelder
57d2d62335 Merge pull request #11741 from edx/ned/flaky-SOL-1654 
Mark a flaky test, SOL-1654
 2016-03-04 10:11:39 -05:00
Ned Batchelder
6071d4f363 Merge pull request #11742 from edx/ned/flaky-TNL-4190-4191 
Mark two tests flaky. TNL-4190 TNL-4191
 2016-03-04 10:11:02 -05:00
John Eskew
80fc91bf1a - Add test content library XML. 
- Ensure that only a course import is saved to the draft branch and then
published. A content library has only a single 'library' branch.
- Add a fields parameter to the create_library call so the call has the
correct number of parameters.
- Add tests which import content libraries using different test methods
and with different branch settings.
- Add test which imports a content library and then exports it.
- Use XBlock module version that supports XML-serialized String of None.
- Add re-import of content library and equality comparison to test.
- Allow get_items to be called on LibraryLocators.
 2016-03-04 09:53:27 -05:00
Ned Batchelder
b785690619 Merge pull request #11739 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-03 22:07:25 -05:00
Kevin Falcone
e64a107218 Merge pull request #11745 from edx/jibsheet/ensure-student_module_history-is-indexed 
Despite db_index=True, Django didn't generate an index
 2016-03-03 21:48:38 -05:00
Peter Desjardins
6650cffd7f Fix typo in REST path. 2016-03-03 17:32:07 -05:00
Peter Desjardins
1429a8d4fe Merge pull request #11744 from edx/pdesjardins/DOC-2638-02 
Adding the -n option to the Sphinx build invocation
 2016-03-03 17:27:50 -05:00
John Eskew
ccb07f1c49 Monkey patch django.utils.http.is_safe_url for Django 1.8.10. 2016-03-03 16:53:42 -05:00
Kevin Falcone
3195a5c3fb Merge pull request #11722 from edx/jibsheet/remove-hardcoded-ATOMIC_REQUESTS 
This should not be needed, we specify ATOMIC_REQUESTS on each DB
 2016-03-03 16:05:31 -05:00
Kevin Falcone
304fb68076 Despite db_index=True, Django didn't generate an index 
student_module_id is the primary way into this table, not having an
index is disastrous with real data.
 2016-03-03 15:27:21 -05:00
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
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
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
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
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
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