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

15221 Commits

Author SHA1 Message Date
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
15c2a828b7 set a custom course_id metric on enrollment 2017-11-03 08:46:25 -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
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
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
Harry Rein
22e05f622e Merge branch 'master' into release-mergeback-to-master 2017-11-02 13:33:03 -04:00
John Eskew
ba07dec4c5 Move edxmako startup to AppConfig::ready. 2017-11-02 09:40:05 -04: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
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
Gabe Mulley
7fd643faa4 Add tests for experience types, ensure courses have a verified mode 2017-11-01 16:51:10 -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
Matt Drayer
e9625aa75d mattdrayer/ENT-686: Log SuccessFactors error response headers 2017-11-01 13:16:33 -04:00
Brian Mesick
6939a5816c Merge pull request #16384 from edx/bmedx/django111_student_mgmt_cmds 
Student management command cleanup for Django 1.11
 2017-11-01 12:34:33 -04:00
John Eskew
94ec96e258 Merge pull request #16396 from edx/jeskew/more_startup_removal_to_appconfig 
Move signal registering to AppConfig's ready from startup.py
 2017-11-01 11:08:49 -04:00
bmedx
ce50c9e620 Student management command cleanup for Django 1.11 2017-11-01 10:24:23 -04:00
Nimisha Asthagiri
6dc8e2125c Merge pull request #15905 from open-craft/bradmerlin/html-xblock-student_view_data-upgrade 
Add student_view_data to HTML XBlock
 2017-11-01 07:46:47 -04:00
noraiz-anwar
5ffe588abe add logs to time frame course listing 2017-11-01 10:50:38 +05: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
Eric Fischer
783dba1c75 Merge pull request #16358 from edx/dahlia/EDU-1529 
Pass contextual data to studio-frontend
 2017-10-31 17:31:59 -04:00
Eric Fischer
27258425d2 Send contextual data through to studio-frontend 
EDUCATOR-1529
 2017-10-31 16:04:02 -04:00
Bill Filler
f9f4876bee Add 'View Consent' button to dashboard when required 
Enterprise customers can require user to agree to Data Sharing Consent
form before they can access a course. We now add it conditionally to
Course Dashboard when it's required so it's apparent to user and they
have a way to revist the consent form if they've previously declined or
the course has not yet started.

WL-1281
 2017-10-31 15:40:02 -04:00
John Eskew
e2060b60c3 Move signal registering to AppConfig's ready from startup.py 2017-10-31 14:25:27 -04:00
John Eskew
43150a1d23 GMT -> UTC in test 2017-10-31 12:55:28 -04:00
Saleem Latif
896da1020b Activation email received when skip_email_verification flag is 'True' 2017-10-30 14:13:42 +05:00
Andy Armstrong
ae1c760ea4 Use Bootstrap theme colors and fonts in old stylesheets 
LEARNER-2977

Fixes
 2017-10-29 22:22:08 -04:00
Brian Beggs
3608b86273 Merge pull request #16309 from edx/bbeggs/PLAT-1411 
Replace SubfieldBase functionality PLAT-1411
 2017-10-27 10:41:32 -04:00
M. Rehan
f04594b8f6 Merge pull request #16290 from edx/mrehan/exlude-bumper 
Exclude bumper from VAL handling the transcripts
 2017-10-27 17:37:27 +05:00
Noraiz Anwar
19f9cb15a5 Merge pull request #16353 from edx/noraiz/add-logs-EDUCATOR-1424 
add logs to better understand course listing response time
 2017-10-27 17:19:34 +05:00
Awais Jibran
4b4e4f2698 Merge pull request #16319 from edx/aj/fix-capa-show-answer 
Fix Show Answer button display for the value "Answered" in studio
 2017-10-27 14:30:13 +05:00
noraiz-anwar
6cda1b2e0a add logs to better understand course listing response time 2017-10-27 12:49:15 +05:00
Brian Beggs
ca92ffe21d Remove SubfieldBase metaclass 2017-10-26 16:59:51 -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
Harry Rein
7091ed0f70 Merge pull request #16337 from edx/HarryRein/home-page-styling-fixes 
Course home page styling with bootstrap.
 2017-10-26 13:39:44 -04:00
Tyler Hallada
52897d5808 Merge pull request #16346 from edx/thallada/ret-org-opt-out 
Org-level schedule upgrade deadline opt-out
 2017-10-26 13:31:21 -04:00
Harry Rein
d4e93fc655 Course home page styling with bootstrap. 
Updates the new bootstrap course home page to match the old course home page.
 2017-10-26 09:25:58 -04:00
Qubad786
4aef8d1c7b exclude bumper 2017-10-26 16:28:25 +05:00
Awais Jibran
fe5a8de55c Fixing quality 2017-10-26 16:19:10 +05:00
Awais Jibran
a428c08168 Fix Show Answer button display for the value "Answered" in studio 
In docs it is explained that we should show "Show Answer" button for "Answered" value when the user has correctly submitted the answer. The current behavior is such, even if the learner has answered the question wrong, the "Show Answer" button would be available.

EDUCATOR-1563
 2017-10-26 12:35:30 +05:00
Tyler Hallada
806114a3ef Check org before course deadline config w/ tests 2017-10-25 17:54:47 -04:00
Matthew Piatetsky
2cb2e5e3eb Merge pull request #16344 from edx/LEARNER-2412 
Fix request to currency endpoint
 2017-10-25 16:41:45 -04:00
Matthew Piatetsky
e1c24084e9 Fix request to currency endpoint 2017-10-25 15:38:10 -04:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
Albert (AJ) St. Aubin
93c3ff2a98 Merge pull request #16273 from edx/aj/LEARNER-1733 
Implement Entitlement Model for Course Centric Architecture
 2017-10-25 07:00:32 -04:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture 
[LEARNER-1733]
 2017-10-24 19:12:55 -04:00
Gabe Mulley
e6abdf7e63 Merge pull request #16328 from edx/mulby/fix-course-sock 
Merge PR 16260 back into master with a fix for the course sock
 2017-10-24 15:08:05 -04:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Gabe Mulley
44e5afba1e Revert "Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging"" 
This reverts commit b541dfa3fd.
 2017-10-24 11:18:06 -04:00