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

12899 Commits

Author SHA1 Message Date
Qubad786
167efea65c render progress status while problem content rendering 2016-03-15 19:53:30 +05:00
Christine Lytwynec
5b5b4eb4fc Merge pull request #11393 from edx/clytwynec/ac-238 
Improve accessibility for dashboard course settings dropdown
 2016-03-10 12:30:20 -05:00
John Eskew
2c78813380 Merge pull request #11768 from edx/jeskew/upgrade_to_django_1_8_11 
Upgrade to Django 1.8.11.
 2016-03-10 11:31:51 -05:00
Eric Fischer
a647169a90 Merge pull request #11167 from edx/christina/ora-data-download 
WIP: Asynchronous download button for ORA2 data
 2016-03-10 11:09:36 -05:00
Calen Pennington
f092550945 Merge pull request #11562 from CredoReference/tags-selectbox-in-studio-based-on-xblockasides 
XBlockAside improvement. Difficulty selectbox in Studio (based on new XBlockAside functionality)
 2016-03-10 10:32:22 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data 
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
 2016-03-10 09:58:55 -05:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination 
Notes pagination
 2016-03-10 17:26:54 +05:00
Hasnain
5e24225cd8 Removing Flaky decorator from lms instructor dashboard test 2016-03-09 10:18:10 -05:00
Peter Fogg
91fd6dbea2 Merge pull request #11769 from edx/peter-fogg/disable-order-closed-course 
Prevent ordering closed courses, and give a good user message.
 2016-03-08 20:32:25 -05:00
Peter Fogg
fd2f3b69ef Prevent ordering closed courses, and give a good user message. 
When Drupal attempts to enroll a user in a closed course, a 406 will
be returned. This causes the marketing site to redirect to the track
selection page for that course, which will then redirect to the
dashboard with a nice message.

ECOM-2317
 2016-03-08 16:45:49 -05:00
Ned Batchelder
a17eff7795 Merge pull request #11757 from stvstnfrd/debt/ie67 
Remove deprecated IE6/7 polyfill
 2016-03-08 14:45:52 -05:00
John Eskew
812aa6381e Upgrade to Django 1.8.11. Remove monkey patch required for v1.8.10. 2016-03-08 11:41:33 -05:00
Toby Lawrence
5a20f0b589 Merge branch 'master' into PERF-272 2016-03-08 08:53:36 -05:00
muzaffaryousaf
b095651655 Escape html/js with other bug fixes . 
TNL-4164
 2016-03-08 18:07:52 +05:00
Syed Hasan raza
7bdc762ebd Merge pull request #11662 from edx/shr/bug/AN-6713-decoding-errors 
Add latin1 decoding to HTTP Headers
 2016-03-08 16:08:46 +05:00
Syed Hassan Raza
0d6e0ac779 Add latin1 decoding to HTTP Headers 2016-03-08 12:44:55 +05:00
Toby Lawrence
1a3464152f Switch to header_control in contentserver. 2016-03-07 18:51:14 -05:00
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -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
stv
1ff2ec15be Remove deprecated IE6/7 polyfill 
This polyfill was added in late 2012 [1].
The final reference appears to have been removed in mid-2013 [2].

Regardless, we certainly are no longer supporting IE6/7.

[1] bf9f9c1c48
[2] 1388684194
 2016-03-06 13:17:58 -08:00
cahrens
5432ef3b5e Make it clear that the logger methods are used by xblocks. 2016-03-05 17:14:15 -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
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
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
John Eskew
ccb07f1c49 Monkey patch django.utils.http.is_safe_url for Django 1.8.10. 2016-03-03 16:53:42 -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
raeeschachar
010fb68e6a Added Falky decorator to Chrome flaky tests 2016-03-03 19:55:26 +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
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
Jesse Zoldak
9ebfc49b93 Wait for the Advanced problem tab to be active. Remove the __test__ signifier. 2016-03-02 16:16:45 -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
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
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
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
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
John Eskew
80ac3fcca2 Remove the concept of having more than one course export format tagged. 2016-03-01 12:59:59 -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
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