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

35584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
e6fcfae994 Merge pull request #11751 from edx/christina/remove-profile-name 
Remove unused profile name.
 2016-03-07 10:44:34 -05:00
Kevin Falcone
ec6eccce7a Merge pull request #11748 from edx/jibsheet/course_overview_0009_on_migrate_from_scratch 
Migrate correctly from scratch also
 2016-03-07 10:30:30 -05:00
cahrens
2f3e3a55bb Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
 2016-03-07 09:37:39 -05:00
Christina Roberts
dbc2b4161e Merge pull request #11752 from edx/christina/remove-hinter 
Delete hinter manager.
 2016-03-07 09:35:56 -05:00
cahrens
5432ef3b5e Make it clear that the logger methods are used by xblocks. 2016-03-05 17:14:15 -05:00
Kelketek
04cadf79bd Merge pull request #11697 from open-craft/agaylard/TNL-3429-D 
TNL-3429: implement display_name_with_default for studio text sanitation
 2016-03-04 17:54:11 -06:00
M. Rehan
11c0094f07 Merge pull request #11679 from edx/code-jail-configs-cms-demo 
TNL-4140 – Configure code jail for Studio
 2016-03-05 02:00:50 +05:00
cahrens
ba06c899de Delete crowdsource_hinter prototype xmodule. 
TNL-4195
 2016-03-04 15:34:48 -05:00
Douglas Hall
56ecc6646d Merge pull request #11607 from CredoReference/invalid-display-courseware-through-lti-iframe 
Invalid display courseware through the LTI iframe in IE 10+
 2016-03-04 15:29:42 -05:00
Jesse Zoldak
01e6fa81af Merge pull request #11654 from edx/zoldak/TE-1201 
Convert tests for adding advanced problem components from lettuce to bok-choy
 2016-03-04 15:14:25 -05:00
Jonathan Piacenti
f1c1c7c146 Fix escaping issue in studio xblock wrapper for display name. 2016-03-04 13:38:20 -06:00
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
Kevin Falcone
631bfc08a3 Migrate correctly from scratch also 
Unfortunately, instrospection.get_table_description runs
select * from course_overview_courseoverview, which of course
does not exist while django is calculating initial migrations, causing
this to fail.  Additionally, sqlite does not support information_schema,
but does not do a select * from the table.

Lift the main part of mysql's get_table_description up to the migration itself
and just inspect it directly.  Continue to call the API for sqlite.
 2016-03-04 11:46:25 -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
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