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

43399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Hallada
b60cefb3d5 Merge pull request #16418 from edx/thallada/ret-section-highlights-button 
Make the Section Highlights in outline a button
 2017-11-02 10:46:03 -04:00
Tyler Hallada
ff56102d18 Merge pull request #16411 from edx/thallada/ret-section-highlights-copy-edit 
Edit highlights modal copy
 2017-11-02 10:45:45 -04:00
Douglas Hall
e26f0ed0e8 Merge pull request #16425 from edx/zub/bump-enterprise-version-to-0.53.9 
bump enterprise version from 0.53.7 to 0.53.9
 2017-11-02 09:55:56 -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
025df85a88 Merge pull request #16424 from edx/LEARNER-2653-add-transifex-push-files-to-repo 
LEARNER-2653 Added Untranslated strings files to Repo
 2017-11-02 17:55:54 +05: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
zubair-arbi
c4d6a7101f bump enterprise version from 0.53.7 to 0.53.9 2017-11-02 17:15:13 +05:00
ayub-khan
faeb0c01f7 Those po files are created and used to push 
translations to transifex. This will help edx-platform
automated jenkins translation job understand when to push
translations to transifex.
 2017-11-02 16:19:49 +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
Saleem Latif
6614ca8265 Merge pull request #16421 from edx/saleem-latif/ENT-673 
ENT-673: Hide braces when ENTERPRISE_TAGLINE is not set.
 2017-11-02 15:13:43 +05: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
Andy Armstrong
19c2faeee5 Merge pull request #16391 from edx/andya/responsive-course-content 
Make the course content page responsive
 2017-11-01 20:27:32 -04:00
Tyler Hallada
dd087a1e54 Make the Section Highlights in outline a button 2017-11-01 18:59:09 -04:00
Andy Armstrong
268bea9e62 Make the course content page responsive 
LEARNER-2754
 2017-11-01 17:34:04 -04:00
Andy Armstrong
ea4582abda Merge pull request #16414 from edx/bfiller/fix-dashboard-edx-theme 
fix dashboard error on edx.org theme
 2017-11-01 17:31:15 -04:00
John Eskew
e85af5d87b Point to the proper AppConfig in INSTALLED_APPS for course_modes. 2017-11-01 17:08:35 -04:00
Tyler Hallada
1ba564c32e Edit highlights modal copy 
Make modal intro text darker.

Make intro message dark in the base modal scss
 2017-11-01 17:08:29 -04:00
Gabe Mulley
7fd643faa4 Add tests for experience types, ensure courses have a verified mode 2017-11-01 16:51:10 -04:00
Tyler Hallada
57bf89c8e2 Create schedule experience on schedule creation 2017-11-01 16:51:00 -04:00
Gabe Mulley
95d1e5c25e use a left outer join for experience types 2017-11-01 16:50:28 -04:00
Tyler Hallada
e5c8acb609 Allow communication experiences to be customized per-learner 2017-11-01 16:50: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
Bill Filler
2c6f2f6578 fix dashboard error on edx.org theme 2017-11-01 15:43:06 -04:00
Eric Fischer
5026b4f9fd Merge pull request #16405 from edx/dahlia/fix_webpack_split 
fix styling loader
 2017-11-01 15:28:54 -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
Matt Drayer
6458477161 Merge pull request #16403 from edx/mattdrayer/ENT-686 
mattdrayer/ENT-686: Log SuccessFactors error response headers
 2017-11-01 14:41:15 -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
Brian Mesick
7cd3e72323 Merge pull request #16366 from edx/bmedx/django111_cms_mgmt_cmds 
CMS management command cleanup for Django 1.11
 2017-11-01 12:34:13 -04:00
Jeremy Bowman
e48be6e616 Merge pull request #16406 from edx/jmbowman/PLAT-1773 
PLAT-1773 Delegate edx-proctoring service registration to app ready
 2017-11-01 12:31:38 -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
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
Eric Fischer
83b3867794 Use style-loader 2017-11-01 10:39:44 -04:00
Jeremy Bowman
2de2e3027d PLAT-1773 Delegate edx-proctoring service registration to app ready methods 2017-11-01 10:30:58 -04:00
bmedx
ce50c9e620 Student management command cleanup for Django 1.11 2017-11-01 10:24:23 -04:00
bmedx
d5b3db8934 Fix up tests to support updated management commands 2017-11-01 10:13:47 -04:00
bmedx
79fe2e6260 CMS management command cleanup for Django 1.11 2017-11-01 10:13:46 -04:00
Robert Raposa
b57f144724 Merge pull request #16402 from edx/robrap/remove-pragma 
Remove pragmas to disable mako-missing-default
 2017-11-01 08:52:12 -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
51f648edbd Merge pull request #16393 from edx/noraiz/EDUCATOR-1652 
EDUCATOR-1652 - add logs to time frame course listing
 2017-11-01 12:05:56 +05:00
noraiz-anwar
5ffe588abe add logs to time frame course listing 2017-11-01 10:50:38 +05:00
Jillian Vogel
ae15e69a0a Fixes bug with Course Blocks API student_view_data parameter 
Prior to this change, providing any student_view_data querystring would result
in student_view_data returned for all XBlock types.

Updates Course Blocks API tests to verify.
 2017-11-01 13:38:54 +10:30
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
Jeremy Bowman
d549194ba3 PLAT-1775 Move help tokens configuration from startup to settings 2017-10-31 17:04:54 -04:00
Bill Filler
c0c740ad1d Merge pull request #16361 from edx/bfiller/WL-1281 
Add 'View Consent' button to dashboard when required
 2017-10-31 16:34:46 -04:00
Nimisha Asthagiri
e0d0bffd6e Merge pull request #16390 from edx/naa/encircle-numbered-highlights 
Section Highlights UI: Encircle numbered highlights in Studio
 2017-10-31 16:32:39 -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