Commit Graph

429 Commits

Author SHA1 Message Date
Sven Marnach
6e801631d8 Merge pull request #14104 from open-craft/smarnach/enterprise-enrollment
Changes required for the Enterprise app enrollment feature.
2016-12-09 16:01:27 +01:00
Sven Marnach
2690a77151 Changes required for the Enterprise app enrollment feature. 2016-12-08 17:53:31 +01:00
Eric Fischer
3994615d2d Merge pull request #14090 from edx/efischer/alt_queues
Get alternate queues from ENV_TOKENS
2016-12-05 12:51:59 -05:00
Brandon DeRosier
097b6417e1 Merge pull request #13958 from edx/bdero/celery-broker-tls
Allow configuring TLS for celery broker
2016-12-03 12:18:25 -05:00
Eric Fischer
b610215e08 Get alternate queues from ENV_TOKENS 2016-12-02 10:32:00 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -05:00
Brandon DeRosier
8c9aa7d3f3 Allow configuring TLS for celery broker 2016-11-09 12:14:42 -05:00
stv
9c5fcfac17 Fallback to default ZENDESK_URL when not in JSON
This line previously departed from the convention of coalescing down to
the original value specified in `lms/envs/common.py`.

Now, the setting can fall back to its default value from `common.py`,
instead of only respecting the value loaded from JSON (or `None` if not
defined).
2016-11-04 16:04:55 -07:00
Eric Fischer
2ca7484c1a Merge pull request #13763 from edx/efischer/use_env_tokens
Allow Celery queue settings to be defined by ENV_TOKENS
2016-10-19 10:02:22 -04:00
Eric Fischer
5df9f20160 Allow Celery queue settings to be defined by ENV_TOKENS
General good-practice cleanup requested by @jibsheet. Also includes some
pylint fixes myh editor flagged during this cleanup.
2016-10-17 11:45:07 -04:00
Eric Fischer
76b3a65259 Use redefined LOW_PRIORITY queue
aws.py redefines the default queues in order to expose cross-environment
work. The new recalculate grades routing key shgould use that value
rather than the default defined in common.py.
2016-10-17 11:32:06 -04:00
Eric Fischer
c4c2875232 Route grading updates to low priority queue 2016-10-14 14:24:08 -04:00
Adam Palay
239867963e set neo4j configuration at the command line 2016-09-28 09:08:04 -04:00
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04:00
Adam Palay
10bd4ef6bf dump item information to neo4j
clear request cache to avoid memory leak

update to use https

delete courses in the same transaction as writing them

python3 compatibility
2016-08-30 14:59:00 -04:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Saleem Latif
6277bd27e6 Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files 2016-07-27 14:53:02 +05:00
Omar Khan
2faab97eea Add OpenStack Swift support
Refactor all S3 code to use the django storage API and add swift
settings for openstack deployments
2016-07-05 17:31:59 +03:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming""
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
2016-06-30 15:19:51 +05:00
Nimisha Asthagiri
d0fcabd407 CCX: Use Modulestore Field Overrides instead of User-specific Overrides 2016-06-23 20:22:32 -04:00
Clinton Blackburn
880493099f Corrected Course Catalog API URL
Retrieving the URL from settings rather than an OAuth client that might not exist.

ECOM-4729
2016-06-16 23:00:45 -04:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689)
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
2016-06-16 18:01:06 -04:00
Fred Smith
8a9df36809 update django-ses 2016-05-25 10:12:50 -04:00
Fred Smith
fe788bc305 override SES email region and endpoint 2016-05-23 10:38:57 -04:00
Peter Fogg
0e66baf41f Add referral tracking for new registrations.
ECOM-4325
2016-05-16 11:17:23 -04:00
Matt Drayer
55cf0fb2c4 mattdrayer/microsite-jwt-auth: Access setting through microsites/theming framework
* mattdrayer: Remove individual JWT settings
* mattdrayer: Add settings defaults to JWT_AUTH calls
2016-05-12 15:04:26 -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
Peter Fogg
268cb2ea17 Correctly pull in API access email config. 2016-05-04 14:23:46 -04:00
Bill DeRusha
ffdacc9129 Use asymmetric key for signing JWTs 2016-05-02 11:17:32 -04:00
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates
Updating cookies settings
2016-04-22 07:25:09 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
wajeeha-khalid
86e954f642 version-based mobile app upgrade 2016-04-14 15:43:34 +05:00
Matt Drayer
9a362d9033 Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
2016-04-12 10:55:04 -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
Clinton Blackburn
8f25c81a85 Added AWS_S3_CUSTOM_DOMAIN
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
2016-04-11 15:34:29 -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
e0d
ae202dd54a fix CR nits 2016-04-08 06:08:41 -04:00
Edward Zarecor
f20f895903 Updating cookies settings 2016-04-08 06:00:31 -04: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
Renzo Lucioni
3cce6c1e46 Merge pull request #12034 from edx/renzo/discussion-topics
Fix discussion category map for self-paced courses
2016-04-05 08:29:49 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request
Request API access.
2016-04-04 22:56:49 -04:00
Renzo Lucioni
0e7247f2a7 Fix discussion category map for self-paced courses
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
2016-04-04 21:15:26 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API.
ECOM-3940
2016-04-04 20:29:19 -04:00
Kelketek
ab0cbfffeb Merge pull request #10556 from edx/feature/badges-v2
Badges V2 Feature Branch
2016-04-01 17:06:26 -05:00
Jonathan Piacenti
112a143589 Refactor badging, move into its own app. 2016-04-01 10:13:08 -05:00
muzaffaryousaf
ce142eb378 Removing check for edx notes for OAUTH token timeout.
TNL-4336
2016-04-01 20:01:46 +05:00
Braden MacDonald
ee444ed67f Enable Azure AD third party auth provider by default 2016-03-29 15:24:00 -07: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
Muzaffar yousaf
73c97f4d75 Merge pull request #11935 from edx/mzfr/rqst-timeout-tnl2444
Setting request timeouts for edx notes.
2016-03-25 18:42:16 +05:00