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

43462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
73d7947b05 enterprise version upgrade to 0.53.11 2017-11-06 19:52:26 +05:00
Farhanah Sheets
33335f7ade Merge pull request #15933 from edx/george/reinstate-pr-15641 
Toggle timer visibility on timed exams #15641 
https://github.com/edx/edx-platform/pull/15641
 2017-11-06 09:28:47 -05:00
Awais Jibran
81461610da Merge pull request #16438 from edx/aj/fix-django-wiki-links 
Fix Django Wiki Links Issue
 2017-11-06 18:08:32 +05:00
Awais Jibran
96dd282970 Fix Django Wiki Links Issue 
EDUCATOR-1655
 2017-11-06 16:08:10 +05:00
Muhammad Ammar
549c0f6b2c Merge pull request #16422 from edx/ammar/add-video-duration-to-events 
add video duration to events
 2017-11-06 13:47:33 +05:00
Ned Batchelder
a6254d5049 Merge pull request #16434 from edx/nedbat/openedx-favicon 
A new favicon for Open edX
 2017-11-05 17:51:34 -05:00
Eric Fischer
c153198928 theme update 2017-11-03 15:38:44 -04:00
Farhanah Sheets
b482fbec60 Update to latest proctoring release 
https://github.com/edx/edx-proctoring/releases/tag/1.3.0
 2017-11-03 15:38:44 -04:00
Eric Fischer
2ede2b7397 Revert "Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream"" 
This reverts commit e32615e132.
 2017-11-03 15:38:44 -04:00
Jeremy Bowman
8b13a8a459 Merge pull request #16442 from edx/jmbowman/oauth_provider_cms_import_fix 
Add oauth_provider to Studio INSTALLED_APPS
 2017-11-03 15:32:54 -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
Douglas Hall
6cd33d6848 Merge pull request #16448 from edx/douglashall/ENT-749 
Fixed enterprise tagline styling.
 2017-11-03 14:41:23 -04:00
Douglas Hall
174302c191 Fixed enterprise tagline styling. 
ENT-749
 2017-11-03 14:40:17 -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
Ned Batchelder
2499dc95c2 A new favicon for Open edX 2017-11-03 14:14:28 -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
Fred Smith
c02c4f9fb7 Merge pull request #15325 from isms/sandbox-cryptography 
Add cryptography package to sandbox environment
 2017-11-03 13:53:14 -04:00
Bessie Steinberg
f216b2b8f2 Merge pull request #16443 from edx/bessiesteinberg/update-edx-enterprise-version 
update edx-enterprise to version 0.53.10
 2017-11-03 13:44:22 -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
Cliff Dyer
c0d84c8fdd Merge pull request #16397 from edx/cliff/fix-broken-polls 
Fix polls 404 on disabled completion.
 2017-11-03 13:00:41 -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
Bessie Steinberg
00fd7b6bfa update edx-enterprise to version 0.53.10 2017-11-03 12:45:36 -04:00
Jeremy Bowman
2e2ec0f5d0 Add oauth_provider to Studio INSTALLED_APPS 2017-11-03 12:28:07 -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
Gabe Mulley
47e3c68faf Merge pull request #16439 from edx/mulby/monitor-enrollment-perf 
set a custom course_id metric on enrollment
 2017-11-03 11:09:13 -04:00
J. Cliff Dyer
4313951dcb Fix polls 404 on disabled completion. 
Calling runtime.handle('progress', ...) was causing a 404 error due to
the runtime handler.  It should be okay for xblocks to submit a
completion or progress event; they just shouldn't have it treated
specially.

EDUCATOR-1642
 2017-11-03 11:06:59 -04:00
Tyler Hallada
8809fd86b7 Merge pull request #16420 from edx/thallada/studio-outline-modal-escape 
Allow escaping out of Studio CourseOutlineXBlockModals
 2017-11-03 09:46:15 -04:00
Gabe Mulley
15c2a828b7 set a custom course_id metric on enrollment 2017-11-03 08:46:25 -04:00
muhammad-ammar
feee575014 add video duration to events 
EDUCATOR-1409
 2017-11-03 15:35:56 +05: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
Andy Armstrong
42396560f1 Merge pull request #16432 from edx/HarryRein/EDUCATOR-1681-import-error 
Import Issue.
 2017-11-02 16:56:04 -04:00
John Eskew
a2cc679b25 Remove usage of default_app_label from ccxcon. 2017-11-02 16:52:09 -04:00
Troy Sankey
c866b5261c Merge pull request #16426 from edx/pwnage101/mailing_mgmt_cleanup 
Mailing management command cleanup for Django 1.11
 2017-11-02 16:08:17 -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
Tasawer Nawaz
01f6d69298 Merge pull request #16350 from edx/tasawer/learner-2735/add-success-component 
add success component on successful form submission
 2017-11-03 00:03:28 +05:00
edx-pipeline-bot
fd027db6ff Merge pull request #16430 from edx/release-mergeback-to-master 
Merge release back to master
 2017-11-02 15:02:41 -04:00
Harry Rein
8e64b4c252 Import Issue. 2017-11-02 15:01:17 -04:00
Clinton Blackburn
0162b3708b Fixed CourseMode admin search 
Searching by course run key no longer raises an exception.
 2017-11-02 14:44:38 -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
Troy Sankey
e069790501 Mailing management command cleanup for Django 1.11 2017-11-02 13:55:18 -04:00
tasawernawaz
5d97f6a3b0 add success component on successfull form submission LEARNER-2735 2017-11-02 22:41:58 +05:00
Harry Rein
22e05f622e Merge branch 'master' into release-mergeback-to-master 2017-11-02 13:33:03 -04:00
Stu Young
c3ebad65a8 Merge pull request #16401 from edx/estute/disable-capturing-stderr-in-pytest-output 
add option to disable capturing stderr in pytest
 2017-11-02 11:42:28 -04:00
Jeremy Bowman
564514dd07 Merge pull request #16415 from edx/jmbowman/PLAT-1779 
PLAT-1779 Fix CMS INSTALLED_APPS/model imports mismatch
 2017-11-02 11:13:42 -04:00