Commit Graph

3684 Commits

Author SHA1 Message Date
Eric Fischer
ecfd953e80 Updated edx-proctoring requirement
Contains latest release, changes for TNL-4366
2016-04-28 13:27:18 -04:00
Kevin Falcone
01e0806334 Merge pull request #12282 from edx/jibsheet/upgrade-new-relic
Come up to a newer New Relic version.
2016-04-28 10:23:45 -04:00
John Eskew
625e76a595 Merge pull request #12262 from edx/jeskew/pillow_upgrade
Upgrade pillow.
2016-04-27 14:17:17 -04:00
Kevin Falcone
77f52d4259 Come up to a newer New Relic version.
This supports a number of their new Error features.
2016-04-27 12:32:11 -04:00
Douglas Hall
139524cadb Upgrade xblock_lti_consumer to 1.0.6 2016-04-26 16:08:16 -04:00
John Eskew
71430055e2 Upgrade pillow. 2016-04-26 11:43:42 -04:00
Ben Patterson
54839cb725 Use bok-choy v0.5.2 for various improvements. 2016-04-25 12:09:04 -04:00
Ben Patterson
a6a65217c9 selenium 2.53.1 2016-04-24 08:32:34 -04:00
Ben Patterson
bb7b31619a Update to latest for selenium. 2016-04-24 08:32:33 -04:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms.
TNL-4102
2016-04-22 19:09:27 +05:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367
Clytwynec/ac 367
2016-04-22 09:49:26 -04:00
Clinton Blackburn
8f82192abf Merge pull request #12162 from edx/clintonb/jwt-updates
JWT authentication updates
2016-04-21 12:24:16 -04:00
Mushtaq Ali
8e93c69e6d edx-ora2 release version 1.1.4 update 2016-04-21 11:29:58 +05:00
Clinton Blackburn
5a7bc01986 JWT authentication updates
- Using jwt_decode_handler from edx-drf-extensions
- Updated djangorestframework-jwt
- Removed feature flag around JWT auth

ECOM-4221
2016-04-20 16:25:25 -04:00
Calen Pennington
b2dace8069 Merge pull request #11808 from CredoReference/adapt-asides-to-be-exported-to-xml
Adaptation asides to be exported to the XML
2016-04-19 11:31:41 -04:00
Dmitry Viskov
0151a149b0 Asides can be exported with the rest of courseware through the Export function within CMS 2016-04-16 03:48:23 +03:00
Renzo Lucioni
8304c96808 Upgrade edx-management-commands to 0.1.1 2016-04-15 17:43:56 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
asadiqbal
a185bb3a83 WL-420 2016-04-14 18:22:16 +05:00
Clinton Blackburn
b0535def87 Improved OAuth client credentials support
- Updated django-oauth2-provider libraries
- Added test ensuring issued access tokens have the basic scopes needed to get user info

ECOM-4197
2016-04-13 16:23:54 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
2016-04-12 08:22:14 -04:00
Christine Lytwynec
a14718bb92 Add pa11ycrawler command 2016-04-11 15:47:26 -04:00
Clinton Blackburn
d6ba8839bf 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-11 12:20:37 -04:00
Douglas Hall
2d3a034695 Upgraded xblock-lti-consumer to 1.0.5 2016-04-11 12:04:05 -04:00
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