Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,902 Commits 1 Branch 0 Tags
4d613df60d8a237173965e16b4b7edeb7e3e9bdb
Commit Graph

1197 Commits

Author SHA1 Message Date
Christine Lytwynec
510eaa3c95 Merge pull request #12423 from edx/clytwynec/ac-367 
Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2
 2016-05-12 13:16:19 -04:00
Christine Lytwynec
f68747ec96 Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2 2016-05-12 11:33:58 -04:00
Clinton Blackburn
e53d36b363 Updated edx-organizations 
This latest version uses our custom JwtAuthentication class.

ECOM-4414
 2016-05-11 22:25:43 -04:00
Clinton Blackburn
23e990df1d Replaced all usages of JSONWebTokenAuthentication with JwtAuthentication 
JwtAuthentication knows how to parse our custom claims.

ECOM-4414
 2016-05-11 22:25:35 -04:00
John Eskew
e50c660805 Merge pull request #12346 from edx/jeskew/django_upgrade_1_8_13 
Upgrade to Django 1.8.13
 2016-05-06 15:57:50 -04:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
Edward Zarecor
ce7d4f03ae Merge pull request #12339 from edx/e0d/update-libary 
Bump SAML version.
 2016-05-05 07:45:43 -04:00
Calen Pennington
9986efb9d7 Enable nose-faulthandler to catch segfaults during tests 2016-05-04 14:51:31 -04:00
John Eskew
b73576ada3 Upgrade to Django 1.8.13 2016-05-03 11:11:26 -04:00
Afzal Wali
15b113b657 Bumped the proctoring version. 2016-05-03 17:48:53 +05:00
Jonathan Piacenti
82f43b1135 Bump SAML version. 2016-05-02 20:37:09 -04:00
Bill DeRusha
ffdacc9129 Use asymmetric key for signing JWTs 2016-05-02 11:17:32 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
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
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