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

1123 Commits

Author SHA1 Message Date
Clinton Blackburn
ae0a128966 Reverted rfc6266 change 
The fork actually does include a commit that is not in the PyPI version.

ECOM-3833
 2016-03-15 15:37:21 -04: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
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
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
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
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
Douglas Hall
dd0b74f7ee Upgrading edx-proctoring requirement to 0.12.13 2016-03-10 05:58:23 -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
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
Eric Fischer
c35f5ba9d6 ORA release 2016-03-07 13:52:44 -05:00
Sven Marnach
b026038574 Bump the version of the Drag&Drop XBlock to 2.0.3. 2016-03-07 18:10:04 +01:00
Douglas Hall
467913a450 Fixed edx-proctoring requirement 2016-03-04 13:07:22 -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
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
516db0d704 Bump the Django version to 1.8.10 2016-03-03 11:35:34 -05:00
Douglas Hall
58e1047a3e Incremented edx-proctoring version for 0.12.12 release 2016-02-27 16:53:42 -05:00
Eric Fischer
9d0ce13884 Merge pull request #11667 from edx/efischer/ora_release 
Weekly ORA release
 2016-02-26 12:16:44 -05:00
Eric Fischer
78c879341f Weekly ORA release 
Now installing without `-e`, and moving to a fully released 1.0.0 version
Also includes updating edx-submissions to a 1.0.0 release.
 2016-02-26 11:19:50 -05:00
Ned Batchelder
c913734a47 Merge pull request #11610 from edx/ned/edx-lint-0.4.2 
Upgrade edx-lint to 0.4.2
 2016-02-25 13:40:23 -05:00
Ned Batchelder
3fa573d795 Use edx-lint 0.4.2 2016-02-25 10:41:24 -05:00
Douglas Hall
ba992214a5 Incremented edx-proctoring version to 0.12.11 2016-02-25 09:40:57 -05:00
Braden MacDonald
f6d7068319 Use latest version of drag and drop xblock 2016-02-23 10:02:44 -08:00
Pan Luo
4c7e3fd2e3 Update UBCPI Xblock to 0.5.1 2016-02-22 15:12:41 -08:00
Renzo Lucioni
5094fec6dc Merge pull request #11559 from edx/renzo/update-organizations 
Bump edx-organizations version to 0.4.0
 2016-02-22 18:08:41 -05:00
Renzo Lucioni
79a4d6ce47 Bump edx-organizations version to 0.4.0 
Also install djangorestframework-oauth 1.1.0 from PyPI
 2016-02-22 15:19:31 -05:00
Douglas Hall
4a246dd134 Upgraded edx-proctoring to 0.12.10 2016-02-18 21:06:14 -05:00
Eric Fischer
920cc3d222 Inform openassessment to clear submission 
The openassessment xblock stores some information that assumes
a given student module is never cleared, it needs to be informed of
this operation.
 2016-02-18 15:41:13 -05:00
Jonathan Piacenti
97593f1966 Add Drag-and-drop XBlock to requirements. 2016-02-15 16:28:34 -06:00
Hasnain
d06edc680b Added two fields in credit API 2016-02-11 10:13:37 +00:00
Clinton Blackburn
e92802b382 Updated django-oauth2-provider 
New package includes support for client credentials grant.
 2016-02-08 21:48:22 -05:00
Ben Patterson
5415f66d46 Upgrade diff-cover. 2016-02-08 09:17:21 -05:00
Christina Roberts
481f3227dd Merge pull request #11429 from edx/christina/ora-release 
Bump ORA version to 0.2.7.
 2016-02-05 11:14:55 -05:00
cahrens
4c938358f6 Bump ORA version to 0.2.7. 2016-02-05 09:31:37 -05:00
Jesse Zoldak
d23b021df6 Bump the version of edx-search 2016-02-05 09:15:32 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Kelketek
1934ef1d11 Merge pull request #11312 from edx/kelketek/bump-pb 
Bump hash for problem builder
 2016-02-04 17:46:27 -06:00
John Eskew
e5bd60fac0 Merge pull request #11128 from edx/jeskew/upgrade_django_to_1.8.8 
Upgrade Django from 1.8.7 to 1.8.9
 2016-02-04 17:06:58 -05:00
Jonathan Piacenti
b4918f7f41 Bump problem builder hash. 2016-02-04 15:55:18 -06:00
Afzal Wali
79dd597557 Bump edx-proctoring to 0.12.8 2016-02-03 10:47:56 -05:00
Kevin Falcone
19843f5a14 Bump requirements on two external apps that also use using() 2016-02-02 12:35:22 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files 
Complete static i18n PR
 2016-02-01 17:13:43 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
John Eskew
1e460e72b1 Upgrade Django from 1.8.7 to 1.8.9 2016-02-01 15:22:28 -05:00
Andy Armstrong
30b5cebccd Merge pull request #11110 from edx/ormsbee/libsass 
Speed up Sass compilation with libsass
 2016-01-29 14:26:15 -05:00
Douglas Hall
a075ad86e1 Updating edx-milestones dependency to fix edx-opaque-keys install 2016-01-29 13:05:04 -05:00