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

35664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muzaffaryousaf
d43f33db31 Properly escape mixed content. text + html. 
TNL-4243
 2016-03-14 19:52:58 +05:00
Clinton Blackburn
6fef56977c Merge pull request #11778 from edx/clintonb/update-requirements 
Replaced Git requirements with PyPI
 2016-03-11 09:53:09 -05:00
Ned Batchelder
0812157039 Merge pull request #11783 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-10 19:44:16 -05:00
Clinton Blackburn
9c90de6507 Replaced Git requirements with PyPI 
Each of the replaced commits can be sourced from PyPI rather than Git. Also, django-pipeline does not need to be editable.

ECOM-3833
 2016-03-10 17:26:32 -05:00
Ned Batchelder
5e7bc8ac11 Update translations (autogenerated message) 2016-03-10 18:15:09 +00:00
Jesse Zoldak
8ab50177de Merge pull request #11777 from edx/zoldak/fix-python-uninstall 
Always uninstall python packages on the uninstall list
 2016-03-10 13:05:48 -05:00
Eric Fischer
62bbea6b23 Merge pull request #11666 from edx/efischer/xblock_binding 
Fix for ORA delete state TNL-4152
 2016-03-10 12:45:37 -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
25e67370cd Unbound xblock method requires user id 
clear_student_state(), a method defined by ORA, requires information
about the user making the request. Since this xblock is not bound,
we must provide that information explicitly.
 2016-03-10 11:13:02 -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
Michael Frey
dbb840c576 Merge pull request #11773 from edx/release 
Hotfix for March 9, 2016.
 2016-03-10 10:23:12 -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
Matjaz Gregoric
6c1f7095a7 Merge pull request #11547 from open-craft/remove-course-about-nav 
Remove course about 'Overview' link/tab.
 2016-03-10 15:45:27 +01:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination 
Notes pagination
 2016-03-10 17:26:54 +05:00
Douglas Hall
656913c716 Merge pull request #11779 from edx/douglashall/SOL-1691/update_edx_proctoring_0_12_13 
SOL-1653 SOL-1691 Upgrading edx-proctoring requirement to 0.12.13
 2016-03-10 07:24:21 -05:00
Douglas Hall
dd0b74f7ee Upgrading edx-proctoring requirement to 0.12.13 2016-03-10 05:58:23 -05:00
Douglas Hall
fd318e05db Merge pull request #11767 from edx/ibrahimahmed443/SOL-1691 
return course end date in credit service and rename flag
 2016-03-10 05:52:06 -05:00
Matjaz Gregoric
3ad0a0073b Remove course about 'Overview' link/tab. 
It looks like in the past there used to be several tabs on the
course about page, but the other tabs have been commented
out years ago.

Having a single tab is pointless and confusing, so remove it.
 2016-03-10 11:05:09 +01:00
Jesse Zoldak
9251a6dc26 Always uninstall python packages on the uninstall list before installing the python requirements 2016-03-09 17:10:11 -05:00
Douglas Hall
2c3b728c08 Merge pull request #11749 from edx/hasnain-naveed/SOL-1654 
SOL-1654 / Testing flakiness
 2016-03-09 16:34:51 -05:00
sanfordstudent
5c0ca8c6ea Merge pull request #11756 from edx/sstudent/MA-2103 
Sstudent/ma 2103
 2016-03-09 11:04:08 -05:00
Peter Fogg
ab8fc07bbd Merge pull request #10645 from CourseTalk/coursetalk_widget 
Integration CourseTalk widgets with OpenEdx.
 2016-03-09 10:41:02 -05:00
Michael Frey
8df8b25f57 Merge pull request #11772 from edx/hotfix/2016-03-09 
Redirect to otto checkout for prof ed courses if enabled
 2016-03-09 10:33:08 -05:00
Hasnain
5e24225cd8 Removing Flaky decorator from lms instructor dashboard test 2016-03-09 10:18:10 -05:00
Michael Frey
abe330ccf0 Redirect to otto checkout for prof ed courses if enabled 2016-03-09 07:25:51 -05:00
erm0l0v
4142438372 add CourseTalk widget 
Move tests to one test class
 2016-03-09 13:32:07 +03: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
Sanford Student
6490551f1b MA-2103 2016-03-08 16:17:01 -05:00
clrux
7f7886be90 Merge pull request #11770 from edx/release 
Weekly release for 08 Mar 2016
 2016-03-08 16:09:46 -05:00
Ned Batchelder
d127fb4bad Merge pull request #11626 from ubc/ubcpi-0.5.1 
Update UBCPI Xblock to 0.5.1
 2016-03-08 15:53:30 -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
clrux
cf5e4c9b59 Merge pull request #11754 from edx/rc/2016-03-08 
Release Candidate rc/2016-03-08
 2016-03-08 14:07:41 -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
23ae5f762f Merge pull request #11743 from edx/PERF-272 
Send 'Vary: Origin' so XHR/CORS requests can work properly.
 2016-03-08 10:16:10 -05:00
Ibrahim
97ef7397ce return course end date in credit service and rename flag 2016-03-08 19:12:19 +05:00
Muzaffar yousaf
e1a13a1493 Merge pull request #11709 from edx/muzaffar/fix-notes-bugs 
Muzaffar/fix notes bugs
 2016-03-08 19:04:49 +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
Waheed Ahmed
ca936a7ff7 Merge pull request #11580 from edx/waheed/ecom-2947-support-entire-password-reset-flow-in-logistration 
Fixed the other half of forgot password flow accourding to logistration.
 2016-03-08 14:43:10 +05:00
Syed Hassan Raza
0d6e0ac779 Add latin1 decoding to HTTP Headers 2016-03-08 12:44:55 +05:00
Waheed Ahmed
178f5a6056 Fixed the other half of forgot password flow accourding to logistration. 
ECOM-2947
 2016-03-08 12:14:24 +05:00
Toby Lawrence
1a3464152f Switch to header_control in contentserver. 2016-03-07 18:51:14 -05:00
Braden MacDonald
5f51db0a61 Merge pull request #11762 from open-craft/smarnach/update-dndv2-version 
Bump the version of the Drag&Drop XBlock to 2.0.3.
 2016-03-07 13:29:19 -08:00
Hassan
fb2998172d Merge pull request #11660 from edx/hassan/dump-course-ids-fix 
Include CCX courses in dump_course_ids.
 2016-03-08 01:45:06 +05:00
Michael Frey
5dcdf9a46b Merge pull request #11755 from edx/SOL-1690 
Redirect to otto checkout for prof ed courses if enabled
 2016-03-07 15:09:23 -05:00
clrux
efa289bac6 Merge pull request #11765 from edx/efischer/ora_bump 
ORA release
 2016-03-07 14:56:55 -05:00