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

1731 Commits

Author SHA1 Message Date
Mushtaq Ali
40d74e77c9 Modify video pipleine client jwt settings - EDUCATOR-1733 2017-11-14 17:23:06 +05:00
David Ormsbee
fc0dab4c4f Merge pull request #16529 from edx/ormsbee/consolidate_xblock_assets 
Consolidate collected XBlock static assets.
 2017-11-13 12:46:20 -05:00
David Ormsbee
a6752b7c4d Consolidate collected XBlock static assets. 
Before this commit, XBlock static assets were extracted during the
collectstatic process by iterating through all installed XBlock classes
and creating a separate directory for each. However, some packages
install many XBlocks that actually share the same static assets. The
most notable example is problem_builder, though we also see this with
schoolyourself and google_drive.

This commit uses the parent module name to do package asset lookup,
collapsing those cases down and eliminating duplicates. For a default
install of edx-platform XBlocks, this reduces assets generated from 31M
to 14M.
 2017-11-13 11:09:09 -05:00
Nimisha Asthagiri
e88d384ad1 Merge pull request #16509 from edx/sync-course-language 
Sync course language: Discovery -> LMS Course Overview
 2017-11-09 14:29:43 -05:00
Gabe Mulley
54ae1c6238 support theming of ACE emails 2017-11-09 11:16:26 -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
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
80d70f6ecb Run all touched files through isort. 2017-11-09 09:25:19 -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
Albert St. Aubin
ddcc5feaa4 Added new method to retrieve the course runs for a course based on UUID 
This method will retrieve the Course Run information from the Discovery
service based on a Courses UUID.

[LEARNER-3160]
 2017-11-09 07:55:36 -05:00
Muzaffar yousaf
690ddceb83 Merge pull request #16489 from edx/revert-16479-revert-16201-transcript-secure-credentials 
Revert "Revert "Transcript secure credentials""
 2017-11-09 15:57:36 +05:00
Nimisha Asthagiri
e7f8a592dd Sync course language: Discovery Course Catalog -> LMS Course Overview 2017-11-08 21:42:05 -05:00
John Eskew
09bd0244b4 Move ccxcon, credit, and programs Django apps to AppConfig standard. 2017-11-08 17:06:09 -05:00
John Eskew
7c94131e51 Merge pull request #16494 from edx/jeskew/remove_autostartup_call_code 
Remove everything from CMS/LMS startup.py except single monkey-patch.
 2017-11-08 14:03:26 -05:00
John Eskew
0279181624 Remove everything from CMS/LMS startup.py except single monkey-patch. 
Move mimetype addition to common initialization.
 2017-11-08 11:26:07 -05:00
Muzaffar yousaf
7157ec2e2f Revert "Revert "Transcript secure credentials"" 2017-11-08 21:18:00 +05:00
Gabe Mulley
e5a0bcfc32 hold back some users from dynamic pacing features 2017-11-08 09:48:48 -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
Gabe Mulley
cfaf45054d Merge pull request #16476 from edx/mulby/ace-bidi 
rtl support for ACE emails
 2017-11-07 10:56:43 -05:00
Gabe Mulley
f6adde3d45 rtl support for ACE emails 2017-11-07 09:33:50 -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
Tyler Hallada
5332b6920f Merge pull request #16466 from edx/thallada/ret-fix-absolute-url 
Schedules: absolute_url returns given URL if already absolute
 2017-11-06 16:44:43 -05:00
Clinton Blackburn
69eeca61d8 Opening courseware to anonymous users 
Anonymous users may now view units in the courseware. This access is limited to units that are not considered problems/graded (e.g. homework, exams).
 2017-11-06 16:42:06 -05:00
Nimisha Asthagiri
f61cbe75b5 Merge pull request #16455 from edx/pacing/highlights-email 
Schedule-based Highlights email update
 2017-11-06 15:35:35 -05:00
Clinton Blackburn
9782b40751 Updated override_waffle_flag to work as a context manager 
override_waffle_flag can now be used as a context manager in addition to its previous role as a decorator. Additionally, the tests have been updated to use standard assertions since we now use py.test.
 2017-11-06 15:32:12 -05:00
Nimisha Asthagiri
98e647fa24 Schedule-based Highlights email update 2017-11-06 14:30:28 -05:00
Tyler Hallada
1f88d528bd Add unit tests for absolute_url 2017-11-06 13:17:52 -05:00
Tyler Hallada
1b1c7235d1 absolute_url returns given URL if already absolute 2017-11-06 11:30:46 -05:00
Brian Mesick
0255592c67 Merge pull request #16436 from edx/bmedx/django111_urls_openedx 
openedx urls cleanup for Django 1.11
 2017-11-06 10:36:20 -05:00
bmedx
68e3894c17 openedx urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
 2017-11-03 16:11:41 -04: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
Nimisha Asthagiri
e63cf7ff98 Merge pull request #16446 from edx/naa/course-highlights-4 
Course Week Highlights accessor
 2017-11-03 14:33:08 -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
Troy Sankey
d8293f962c Merge pull request #16412 from edx/pwnage101/settings_validation_refactor_PLAT-1776 
move settings validation out of startup.py
 2017-11-03 13:44:11 -04:00
Nimisha Asthagiri
4f2fdde2d8 Course Week Highlights accessor 2017-11-03 13:33:46 -04:00
Brian Mesick
e12ce751d7 Merge pull request #16413 from edx/bmedx/django111_urls_cms 
CMS urls cleanup for Django 1.11
 2017-11-03 12:53:48 -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
d11d7554c3 Move theming settings validation registration into ready method 
This avoids premature registration of django checks which could break
django 1.11 startup.
 2017-11-03 12:23:54 -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
bmedx
9099f0dc23 CMS urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
 2017-11-02 14:29:48 -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
Gabe Mulley
7fd643faa4 Add tests for experience types, ensure courses have a verified mode 2017-11-01 16:51:10 -04:00