Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,821 Commits 1 Branch 0 Tags
8570809caeb13fa1dd9dd8753ecd21dea06fb8ea
Commit Graph

2652 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
Calen Pennington
7aa1a3460b Merge pull request #16615 from edx/cale/schedules-admin-improvements 
Cale/schedules admin improvements
 2017-11-21 22:06:37 -05: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
Jeremy Bowman
8b3f81f3b4 PLAT-1413 Remove TEMPLATE_DEBUG setting 2017-11-20 14:39:36 -05:00
John Eskew
ee36534fde Merge pull request #16574 from edx/jeskew/add_request_limits_for_django110 
Add request limits to LMS/CMS Django settings.
 2017-11-16 13:13:46 -05:00
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02:00
John Eskew
1bf74c7d32 Add disabled request limits implemented in Django 1.11 2017-11-15 14:19:31 -05:00
John Eskew
461fadb2b9 Remove unused direct reference to specific course in common settings. 2017-11-15 14:02:26 -05:00
Tasawer Nawaz
a89042ab7c integrate zendesk with new single support form 
LEARNER-2736
 2017-11-14 20:43:08 +05:00
John Eskew
004da0c381 Merge pull request #16449 from edx/jeskew/commerce_to_appconfig 
Add commerce AppConfig and use to register signals.
 2017-11-09 10:25:16 -05:00
Alex Dusenbery
95b47369c4 PLAT-1786 | Add lms/cms analytics_exporter.py settings files. 2017-11-09 10:14:30 -05:00
John Eskew
e30de61e23 Merge pull request #16507 from edx/jeskew/more_apps_signals 
Move ccxcon, credit, and programs Django apps to AppConfig standard.
 2017-11-09 09:26:38 -05:00
John Eskew
6672f64188 Add commerce AppConfig and use to register signals. Move imports. 
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
 2017-11-09 09:24:37 -05:00
John Eskew
09bd0244b4 Move ccxcon, credit, and programs Django apps to AppConfig standard. 2017-11-08 17:06:09 -05:00
Muzaffar yousaf
7157ec2e2f Revert "Revert "Transcript secure credentials"" 2017-11-08 21:18:00 +05:00
Jeremy Bowman
0f4e4e1c31 Remove unused nose settings and plugin 2017-11-07 16:34:59 -05:00
John Eskew
3d884d6cc0 Merge pull request #16428 from edx/jeskew/email_mkting_lti_prov_to_appconfig_ready 
Move lti_provider/email_marketing startup to AppConfig ready.
 2017-11-07 15:15:56 -05:00
Feanil Patel
9a35a5439e Revert "Transcript secure credentials" 2017-11-07 13:07:32 -05:00
Jeremy Bowman
1f1ad26137 Merge pull request #16465 from edx/jmbowman/PLAT-1774 
PLAT-1774 Move x_module monkey-patching
 2017-11-07 10:34:44 -05:00
Qubad786
2310614bb6 Save credentials in edx-video-pipeline 
EDUCATOR-1335 - This Adds a dedicated app which is responsible for communication with edx-video-pipeline service. It also adds the backend for saving 3rd party transcription service credentials on edx-video-pipline and cache it in edx-val.
 2017-11-07 13:18:58 +05:00
Jeremy Bowman
c24a919856 PLAT-1774 Move x_module monkey-patching 2017-11-06 11:32:55 -05:00
John Eskew
ee5887956a Merge pull request #16437 from edx/jeskew/datadog_monitoring_to_appconfig 
Move datadog/monitoring startup to AppConfig ready.
 2017-11-03 14:58:56 -04:00
John Eskew
535d39d571 Merge pull request #16435 from edx/jeskew/bookmarks_course_overviews_startup_move 
Move bookmarks/course_overviews startup to AppConfig ready.
 2017-11-03 14:06:17 -04:00
John Eskew
7b4a3c1714 Move email_marketing startup.py to AppConfig::ready(). 
Remove query counting of LMS signals.
 2017-11-03 13:57:38 -04:00
John Eskew
b02c744790 Move lti_provider startup.py to AppConfig::ready. 2017-11-03 13:57:18 -04:00
John Eskew
d6f8772031 Move course_overviews startup.py over to AppConfig::ready 2017-11-03 12:47:59 -04:00
John Eskew
3f99fe4c1b Move bookmarks startup.py over to AppConfig::ready 2017-11-03 12:47:58 -04:00
Troy Sankey
c19eaef075 Move settings validation out of startup.py 
This also creates a new app common_initialization in order to provide a
place to run initialization code common to both the LMS and CMS.
 2017-11-03 12:23:54 -04:00
John Eskew
d7bab033f7 Move monitoring functionality to util and AppConfig. 2017-11-02 17:44:03 -04:00
John Eskew
65433c9cd4 Move datadog startup.py over to AppConfig::ready 2017-11-02 17:44:03 -04:00
John Eskew
a2cc679b25 Remove usage of default_app_label from ccxcon. 2017-11-02 16:52:09 -04:00
John Eskew
a711fb816b Merge pull request #16369 from edx/jeskew/remove_microsites_from_startup 
Remove microsite configuration from LMS startup.py.
 2017-11-02 15:37:49 -04:00
John Eskew
2808bad0c9 Merge pull request #16416 from edx/jeskew/edxmako_startup_py_remove 
Move edxmako startup to AppConfig::ready.
 2017-11-02 15:08:18 -04:00
Brian Mesick
6a1d5e6a9d Merge pull request #16410 from edx/bmedx/django111_syncdb_cleanup 
syncdb cleanup
 2017-11-02 10:47:00 -04:00
bmedx
82cb62d26a syncdb cleanup 2017-11-02 09:51:44 -04:00
John Eskew
ba07dec4c5 Move edxmako startup to AppConfig::ready. 2017-11-02 09:40:05 -04:00
John Eskew
e85af5d87b Point to the proper AppConfig in INSTALLED_APPS for course_modes. 2017-11-01 17:08:35 -04:00
Jeremy Bowman
c83811f938 Merge pull request #16404 from edx/jmbowman/PLAT-1775 
PLAT-1775 Move help tokens configuration from startup to settings
 2017-11-01 15:02:22 -04:00
John Eskew
a36eb51a64 Move microsite config from startup.py to settings and AppConfig.ready. 2017-11-01 14:04:31 -04:00
Jeremy Bowman
2de2e3027d PLAT-1773 Delegate edx-proctoring service registration to app ready methods 2017-11-01 10:30:58 -04:00
bradmerlin
ab011314ef Add student_view_data to HTML XBlock 
to allow the HTML to be downloadable via the Course Blocks API.

Feature flag ENABLE_HTML_XBLOCK_STUDENT_VIEW_DATA must be set to enable this feature.
 2017-11-01 13:38:54 +10:30
Jeremy Bowman
d549194ba3 PLAT-1775 Move help tokens configuration from startup to settings 2017-10-31 17:04:54 -04:00
Troy Sankey
aeed9f77f7 Merge pull request #16385 from edx/pwnage101/init_app_PLAT-1772 
Add an lms_initialization app
 2017-10-31 16:15:00 -04:00
Troy Sankey
1e599bed09 Add lms_initialization app 
This app is a grab bag of init code which can't find a good home in
other apps.  This was created in response to removing lms.startup.run().
 2017-10-31 14:13:29 -04:00
John Eskew
b866f35620 Remove support for COMPREHENSIVE_THEME_DIR - 
all dirs must now go into COMPREHENSIVE_THEME_DIRS.
Move comprehensive theming setup section out of startup.py and into
  settings files using new 'derived' functionality.
Add 'derive_settings' at the end of all top-level Django settings files.
Move validation of comprehensive theming settings into new apps.py
  theming file.
Split theming code into code safe to run before settings are initialized
  -and- after settings are initialized.
 2017-10-30 14:36:06 -04:00
hamzamunir7300
9c85fcad78 Merge pull request #15988 from edx/footer_design_WIP/LEANER-2311 
Footer New design using bootstrap
 2017-10-30 16:00:18 +05:00
Hamza Munir
4a3164e2e3 Footer New design using bootstrap 
This is a work in progress finished the 320px - 539px mobile
screen design.

LEARNER-2311
 2017-10-30 14:55:26 +05:00
Jeremy Bowman
ba06372cac PLAT-1780 Remove dependency on django-extensions 2017-10-27 13:19:12 -04:00
Troy Sankey
7bbecfdc3c Merge pull request #16301 from edx/pwnage101/verify_student_app_startup 
Move verify_student signal registration to ready()
 2017-10-27 11:10:30 -04: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