Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,520 Commits 1 Branch 0 Tags
0c2dfd136eafaae88a71df4eecdcacc3845fca45
Commit Graph

20747 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Harry Rein
8e64b4c252 Import Issue. 2017-11-02 15:01:17 -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
Gregory Martin
a285ed0810 Merge pull request #16386 from edx/yro/a11y_audit_1553 
A11Y Update to wiki edit field.
 2017-11-02 10:58:10 -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
4ed71b0234 Merge pull request #16417 from edx/jeskew/course_modes_ready_fix 
Point to the proper AppConfig in INSTALLED_APPS for course_modes.
 2017-11-02 09:37:54 -04:00
Ayub khan
9823802413 Merge pull request #16423 from edx/you/update_translations 
Update translations
 2017-11-02 17:55:10 +05:00
Uzair Rasheed
1ebf9cf821 Merge pull request #16229 from edx/celery-task 
celery task to update sailthru purchase record
 2017-11-02 17:26:11 +05:00
Gabe Mulley
d4af6ec001 Merge pull request #16294 from edx/thallada/ret-schedule-experience 
Support multiple dynamic pacing experiences
 2017-11-02 07:00:02 -04:00
ayub-khan
d922364e21 Update translations 2017-11-02 14:44:29 +05:00
Saleem Latif
d36153cbb8 Hide braces when ENTERPRISE_TAGLINE is not set. 2017-11-02 12:20:33 +05:00
Harry Rein
63eeca73ce Removing waffle flag for responsive header. 2017-11-01 21:36:32 -04:00
Andy Armstrong
268bea9e62 Make the course content page responsive 
LEARNER-2754
 2017-11-01 17:34:04 -04:00
John Eskew
e85af5d87b Point to the proper AppConfig in INSTALLED_APPS for course_modes. 2017-11-01 17:08:35 -04:00
Gabe Mulley
7fd643faa4 Add tests for experience types, ensure courses have a verified mode 2017-11-01 16:51:10 -04:00
Giulio Gratta
908d5f91a5 Makes regen_user fn respect ENABLE_OPENBADGES 
- Uses pre-existing function to check if badging is enabled
- Patch ENABLE_OPENBADGES for failing test
 2017-11-01 16:05:57 -04:00
Gregory Martin
8bae7785ee A11Y Update to wiki edit field. 
EDUCATOR-1553
 2017-11-01 15:24:37 -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
1a1c93e5e8 Remove orphaned pre-startup code and tests. 2017-11-01 14:04:31 -04:00
John Eskew
a36eb51a64 Move microsite config from startup.py to settings and AppConfig.ready. 2017-11-01 14:04:31 -04:00
uzairr
1b6ed3ba21 Celery task to update sailthru purchase record 
After change in the audit enrollment process, edX platform is
no longer keeping its audit enrollment record on sailthru.To keep
updated sailthru a celery task is created that will update sailthru
user profile in case of enroll/un-enroll of any audit enrollment course.

LEARNER-2694
 2017-11-01 15:28:52 +00:00