Commit Graph

1160 Commits

Author SHA1 Message Date
Douglas Hall
05d0ba7786 Merge pull request #12078 from edx/douglashall/upgrade_xblock_lti_consumer_1_0_5
Upgraded xblock-lti-consumer to 1.0.5
2016-04-08 09:23:56 -04:00
Clinton Blackburn
8f4ac178e6 Merge pull request #12079 from edx/clintonb/s3-url-fix
Stripping auth querystring from S3 URLs
2016-04-08 09:05:10 -04:00
asadiqbal
cffaa3ee6b updated ubcpi version 2016-04-08 11:32:37 +05:00
Clinton Blackburn
d2d38f9b2c Stripping auth querystring from S3 URLs
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
2016-04-07 17:14:18 -04:00
Douglas Hall
fed01b3547 Upgraded xblock-lti-consumer to 1.0.5 2016-04-07 16:00:12 -04:00
Eric Fischer
813b50aed2 Fix conflict, 1.1.3 is correct 2016-04-07 14:45:19 -04:00
Eric Fischer
16d62e551b Bump ora2 version 2016-04-07 12:39:08 -04:00
muzaffaryousaf
2e0a9b2658 Bump version for edx/django-oauth2-provider that includes in-sync migrations.
TNL-4296
2016-04-07 12:26:18 +05:00
Diana Huang
efc1f9683e Bump ORA version. 2016-04-06 15:28:32 -04:00
Omar Khan
66ac9b0185 Merge pull request #11849 from open-craft/omar/watch-assets
Fix paver watch_assets
2016-04-04 22:37:50 +07:00
John Eskew
3e40c9f843 Merge pull request #12019 from edx/jeskew/upgrade_to_django_1_8_12
Upgrade to Django 1.8.12
2016-04-04 10:32:26 -04:00
Omar Khan
53642579ad Fix paver watch_assets
- Update to latest version of watchdog.
- inotify doesn't work on nfs share in devstack. Use polling instead.
- Some editors (vim) do not trigger modify events in their default
  configuration. Rebuild assets on all filesystem changes, and debounce
  when changes happen too quickly.
2016-04-04 12:36:07 +07:00
Clinton Blackburn
320abd7d24 Using edx-ccx-keys from PyPI
ECOM-4016
2016-04-01 16:59:02 -04:00
John Eskew
e29e2f5ad1 Upgrade to Django 1.8.12 2016-04-01 14:27:20 -04:00
Asad Iqbal
9543989e57 Merge pull request #12012 from edx/asadiqbal08/updating-ubcpi-version-edxplatform
asadiqbal08/WL-389: Update ubcpi XBlock version
2016-04-01 18:29:23 +05:00
asadiqbal
177a237485 Wl-389 2016-04-01 13:02:16 +05:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
Matt Drayer
d6385a0c72 mattdrayer/update-xblock-dependency: Bump to 0.4.7 2016-03-31 09:39:55 -04:00
jsa
52657af81d add edx-management-commands dependency. 2016-03-30 14:59:09 -04:00
J. Cliff Dyer
1df040228a Configure LMS to select oauth2 providing library.
Available backends:

* django-oauth-toolkit (DOT)
* django-oauth2-provider (DOP)

* Use provided client ID to select backend for
  * AccessToken requests
  * third party auth-token exchange
* Create adapters to isolate library-dependent functionality
* Handle django-oauth-toolkit tokens in edX DRF authenticator class

MA-1998
MA-2000
2016-03-30 14:21:27 +00:00
cahrens
9dcbce2155 Update Bok Choy to 0.5.1 release. 2016-03-29 10:15:05 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
2016-03-28 14:57:01 -04:00
solashirai
82936a0f7c changed entry in github.txt 2016-03-26 18:03:34 -04:00
solashirai
052655016b added crowdsourcehinter 2016-03-26 18:02:33 -04:00
Douglas Hall
fb6f3ca568 Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes 2016-03-25 09:34:52 -04:00
Douglas Hall
3acc6da98c Merge pull request #11859 from edx/douglashall/edx_proctoring_0_12_15
Updated edx-proctoring requirement to 0.12.15
2016-03-24 13:48:39 -04:00
Mushtaq Ali
1b60f73119 ORA2 version update to 1.1.1. Includes bug fixes for TNL-4268 2016-03-23 00:24:26 +05:00
Eric Fischer
6bb06e5055 Update bok-choy requirement 2016-03-22 10:16:30 -04:00
cahrens
0c9937889b Enabling XSS vulnerability flag for bok choy tests 2016-03-22 10:16:27 -04:00
Douglas Hall
f2707bb480 Updated edx-proctoring requirement to 0.12.15 2016-03-21 10:22:15 -04:00
Braden MacDonald
8aff51bfac Merge pull request #11818 from open-craft/omar/problem-builder
Update problem-builder to version 2.0.3
2016-03-17 10:12:55 -07:00
Toby Lawrence
9b8ff773ee Merge pull request #11824 from edx/release
Merge release back to master.
2016-03-16 21:11:37 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Omar Khan
2a5fce94c8 Update problem-builder to version 2.0.3 2016-03-16 07:23:28 +07:00
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
Sven Marnach
d29dcc1697 Merge pull request #11803 from open-craft/smarnach/update-dndv2-version
Bump the version of the Drag&Drop XBlock to 2.0.4.
2016-03-15 14:14:53 +01:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
2016-03-14 13:42:53 -04:00
Sven Marnach
6d9598f325 Bump the version of the Drag&Drop XBlock to 2.0.4. 2016-03-14 16:07:57 +01: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