Commit Graph

214 Commits

Author SHA1 Message Date
Alex Dusenbery
6dfa47b2fc EDUCATOR-565 | Add POLICY_CHANGE_GRADES_ROUTING_KEY, fix errors in compute_all_grades_for_course circuitry. 2017-07-11 14:01:38 -04:00
Christina Roberts
8fb8647473 Merge pull request #15360 from open-craft/replaceafill/aws_with_filesystem_storage_tested
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
2017-07-06 12:36:56 -04:00
Muhammad Ammar
dca12d65c2 Save or update course video image - TNL-6762 2017-07-06 12:35:00 +05:00
Aamish Baloch
ac45850d15 YONK-691: Configurable profile image sizes 2017-07-05 18:50:01 +05:00
Douglas Cerna
c567add628 Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module 2017-06-25 19:47:39 -06:00
Adam Palay
51abe89a80 respond to comments 2017-06-12 11:55:58 -04:00
Adam Palay
69d76b69d7 write courses to neo4j in background tasks (EDUCATOR-583)
move tasks into tasks.py

add more logging
2017-06-12 10:44:27 -04:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app
Use a new external app for help tokens
2017-05-03 18:08:27 -04:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542"
This reverts commit 65f13ddec4.
2017-04-27 09:25:02 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542"
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
2017-04-26 11:29:56 -04:00
Calen Pennington
f8b050a5d8 Put LANGUAGE_COOKIE into settings 2017-04-24 13:03:17 -04:00
Jeremy Bowman
d3b873c7e9 PLAT-1104 Import courses asynchronously 2017-02-22 15:06:34 -05:00
syed-awais-ali
65d4b76d9b ttl removed from yaml config and default value addedto aws 2017-02-09 16:47:48 +05:00
syed-awais-ali
95c6edd187 added ttl setting 2017-02-09 00:39:45 +05:00
Jesse Shapiro
9d5db5ae24 Adds OpenStack settings to CMS environment
and a comment and explaining why we import aws.* in the openstack settings.
2017-02-02 09:27:22 +10:30
Jesse Zoldak
83a451dc0b Revert "PLAT-1104 Import courses asynchronously" 2017-01-30 19:21:43 -05:00
Jeremy Bowman
831cd4b85b PLAT-1104 Import courses asynchronously 2017-01-30 12:19:33 -05: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
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
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
cahrens
d4cc7b8ffd Support level support for Studio xblock creation.
TNL-4670
2016-07-21 15:44:59 -04:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation
Unify JWT generation code
2016-07-11 15:37:14 -04:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
2016-07-07 16:38:39 -04: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
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
d7af2f119d SES should use the non-smtp endpoint 2016-05-31 09:46:20 -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
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates
Updating cookies settings
2016-04-22 07:25:09 -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
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
2be2b52f63 apply the setting to the CMS too 2016-04-08 06:09:03 -04:00
Fred Smith
5eb586674d Merge pull request #11641 from eduNEXT/fmo/read_elasticsearch_config_from_json
Read ELASTIC_SEARCH_CONFIG setting from the cms.env.json file
2016-03-31 14:27:22 -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
Renzo Lucioni
cd9986b662 Override field data within the XBlock runtime
Resolves an issue preventing students in self-paced courses from seeing all available discussion modules. ECOM-3733.
2016-03-18 17:15:00 -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
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
M. Rehan
11c0094f07 Merge pull request #11679 from edx/code-jail-configs-cms-demo
TNL-4140 – Configure code jail for Studio
2016-03-05 02:00:50 +05:00
Kevin Falcone
a561367515 This should not be needed, we specify ATOMIC_REQUESTS on each DB
There is one DB where we do not want it specified since transactions
on the CSMHE table when we aren't atomic across databases isn't a win.
2016-03-01 14:00:13 -05:00
Qubad786
55ab52ea9f Configure code jail for cms 2016-02-29 15:22:52 +05:00
Felipe Montoya
5fe1a114ea Enable the changes to the ELASTIC_SEARCH_CONFIG setting to be read from cms.env.json or yaml as it is for the lms. 2016-02-23 16:50:28 -05:00