Commit Graph

106 Commits

Author SHA1 Message Date
Matjaz Gregoric
d403e5f8b1 Introduce LMS_INTERNAL_ROOT_URL.
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.

Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.

This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.

The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
2017-11-23 08:17:38 +01:00
sandroroux
98233c0a84 New management command for setting up a test environment. The command creates a ScheduleConfig and schedules if they don't exist (the schedule starts three days before the time the command is run). If a schedule already exists, the command updates the schedule's start time and upgrade deadline. The values set by the command will allow send_recurring_nudge to send three-day nudges. 2017-11-21 14:25:55 -05:00
Eric Fischer
3fc342e6e8 Webpack config prod/dev split
EDUCATOR-1448

Modifies paver webpack task to use production configuration in all
non-devstack environments, and a development config in devstack.
2017-10-26 14:03:53 -04:00
bmedx
21791ccb58 Change Django settings from tuples to lists to prep for 1.11 upgrade 2017-10-17 12:53:02 -04:00
Jesse Shapiro
c4767e253b Add middleware classes dynamically from configuration and switch MIDDLEWARE_CLASSES to use a list 2017-10-11 09:16:41 -04:00
Omar Al-Ithawi
d0c7a532ad Make the platform name translatable 2017-08-29 12:43:36 -04:00
Michael Roytman
54f4a9dee1 remove is_ajax condition and JQUERY initialization from lms/cms devstack env files
Please enter the commit message for your changes. Lines starting
2017-08-02 15:12:13 -04:00
John Eskew
f1b13595c0 Only display debug toolbar on non-ajax requests. 2017-07-27 16:59:08 -04:00
Jeremy Bowman
70c0b7bd3d PLAT-1590 Fixes for Docker Devstack e2e tests 2017-07-26 15:07:57 -04:00
Kevin Falcone
585d85ea96 ANALYTICS_API_KEY and ANALYTICS_SERVER_URL aren't used
ANALYTICS_API_KEY was used to make direct requests to the
ANALYTICS_SERVER_URL which was our original original analytics effort.
2017-07-21 17:06:05 -04:00
Jillian Vogel
0fcdcb02bb Use ORA2 django storage on openstack and devstack.
Default ORA2 storage settings use AWS, so no change required to aws envs.
2017-07-14 11:23:15 -04:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Clinton Blackburn
800bcd8e20 Updated CredentialsApiConfig to pull URLs from settings
Pulling URLs from settings allows us to rely on site configuration overrides in order to support multi-tenancy.

LEARNER-1103
2017-05-25 13:30:43 -04:00
Matt Drayer
a7f6e6a56b Consider waffle switch when selecting ecommerce workflow 2017-05-22 12:25:05 -04:00
Robert Raposa
59522311ef Revert: Default unified_course_view on in devstack. 2017-05-09 10:08:58 -04:00
Robert Raposa
e185d886d4 Default unified_course_view on in devstack. 2017-05-08 11:45:24 -04:00
Clinton Blackburn
2b4817b102 Added OpenID Connect discovery endpoint
Although we are phasing out our support of OIDC, this particular feature will allow us to eliminate many of the settings we
share across services. Instead of reading various endpoints and secret keys from settings or hardcoded values, services
with the proper authentication backend can simply read (and cache) the information from this endpoint.

ECOM-3629
2017-04-26 10:02:27 -04:00
Brandon DeRosier
48fe4ad10b Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set 2017-03-01 15:48:25 -05:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Renzo Lucioni
29672370b9 Configure JWT auth when running Studio in devstack
An important step towards being able to use Studio's program editor out of the box. Part of ECOM-4638.
2016-07-25 13:37:20 -04: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
0cf3e39c31 Replace bulk email settings with admin config models
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
2016-05-16 11:09:39 -04:00
Bill DeRusha
ffdacc9129 Use asymmetric key for signing JWTs 2016-05-02 11:17:32 -04:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder."
This reverts commit 266f593d2d.
2016-04-12 16:22:34 -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
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
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
Ben Patterson
ffa089a9c6 Remove ruby reference in pipeline arguments. 2016-02-08 18:18:37 -05:00
Matjaz Gregoric
266f593d2d Remove ThemingAware storage mixins and ComprehensiveThemeFinder.
Collectstatic failed in production when comprehensive theme contained custom css files.
This patch fixes that problem by removing ComprehensiveThemeFinder from STATICFILES_FINDERS
and ComprehensiveThemingAware mixin from STATICFILES_STORAGE.

Comprehensive theme static dirs are added to the top of the STATICFILES_DIRS entry,
which means that the default django FilesystemFinder will find theme static files,
and since the theme folder is at the top of STATICFILES_DIRS, theme files will take
precedence over default LMS/CMS static files.

This change means that theme static file URLs are no longer prefixed with themes/<theme-name>/,
but since we currently only support one comprehensive theme at a time, that shouldn't be a problem.
If/when we want to make the choice of a theme dynamic per-request (microsites?), we will have to
bring custom theme finders and storage mixins back, but for now, we don't need them.
2016-01-29 08:28:18 +01:00
Ahsan Ulhaq
bcb8afb2c4 Add jwt auth in LMS
ECOM-3419
2016-01-22 13:00:36 +05:00
Matt Drayer
4d7be021e5 Merge pull request #11140 from edx/saleem-latif/SOL-1431
SOL-1431: Remove no-op translations from devstack.py
2016-01-07 10:40:20 -05:00
swdanielli
ac66b4a8cd Add setting for pyfs xblock service 2016-01-05 23:09:09 +00:00
Saleem Latif
e3edb4e9f5 remove no-op translations from devstack.py 2016-01-05 13:33:51 +05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Clinton Blackburn
7c6a30f16d Failing startup if private settings fail to load
Squashing private settings import errors leads to wasted developer time when developers expect settings to be in place, and they aren't. This change only loads private settings if the private.py file exists. If there is an error during the import of that file, the application will not start.

ECOM-2653
2015-10-24 17:22:16 -04:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles.
TNL-3137
2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3.
TNL-3137
2015-10-06 19:52:38 +05:00
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Usman Khalid
158bdf4d09 Use django.contrib.staticfiles instead of django-staticfiles.
TNL-3137
2015-09-22 20:39:44 +05:00
Usman Khalid
1e799eb508 Upgrade to django-pipeline v.1.5.3.
TNL-3137
2015-09-22 20:39:43 +05:00
Andy Armstrong
a08fe9fb06 Merge pull request #9059 from edx/andya/faster-update-assets
Don't package or optimize assets on devstack
2015-09-08 16:48:11 -04:00
Marko Jevtic
080a44b663 (SOL-1105) Requirement for enabling search in devstack 2015-09-04 10:50:40 +00:00
Andy Armstrong
fb19d32815 Don't package or optimize assets on devstack 2015-09-03 13:28:26 -04:00
Ned Batchelder
2c8ab7db4b Quiet some devstack log messages 2015-08-13 17:26:47 -04:00
Kevin Falcone
891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https
Deactivate HTTPS on devstack
2015-08-10 17:29:05 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
2015-08-10 10:29:45 -04:00
Albert Liang
46434582c8 Deactivate HTTPS on dev and devstack
When running locally, XBlocks which access third-party software no longer
cause server errors.

Because devstack inherits from aws, the HTTPS flag was implicitly set to 'on'.
This meant that XBlocks attempted to use SSL when dealing with third-party
components like LTI.  Since SSL is not enabled on devstack, this caused server
errors whenever these features ran.
2015-07-30 13:22:33 -07:00
jsa
ba239125f1 disable course discovery feature by default in devstack. 2015-07-29 17:40:57 -04:00