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

43375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
e85af5d87b Point to the proper AppConfig in INSTALLED_APPS for course_modes. 2017-11-01 17:08:35 -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
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
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
Eric Fischer
27258425d2 Send contextual data through to studio-frontend 
EDUCATOR-1529
 2017-10-31 16:04:02 -04:00
Nimisha Asthagiri
30dfa98bf0 Section Highlights Studio UI: Encircle number of highlights 2017-10-31 15:41:07 -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
Robert Raposa
fcfb40cf52 Remove pragmas to disable mako-missing-default 2017-10-31 14:42:55 -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
dbad9fbcd4 Merge pull request #16400 from edx/jeskew/fix_utc_gmt_acceptance_test 
GMT -> UTC in test
 2017-10-31 14:24:29 -04:00
Troy Sankey
20b6dd5182 Move analytics initialization out of lms.startup.run 
lms.startup is being removed, so initialize the analytics module in the
lms_initialization ready() method instead.
 2017-10-31 14:16:32 -04:00
Troy Sankey
1e599bed09 Add lms_initialization app 
This app is a grab bag of init code which can't find a good home in
other apps.  This was created in response to removing lms.startup.run().
 2017-10-31 14:13:29 -04:00
John Eskew
43150a1d23 GMT -> UTC in test 2017-10-31 12:55:28 -04:00
Gregory Martin
15ced1334e Merge pull request #16388 from edx/yro/a11y_audit_1556 
Fix onload tabindex focus for wiki edits
 2017-10-31 11:28:44 -04:00
John Eskew
0e08525fe9 Merge pull request #16289 from edx/jeskew/move_themeing_startup 
Move comprehensive theming startup code to AppConfig.
 2017-10-31 09:06:20 -04:00
Douglas Hall
719f90e733 Merge pull request #16392 from edx/douglashall/update_edx_enterprise_0_53_7 
Upgrade edx-enterprise to 0.53.7.
 2017-10-31 05:33:04 -04:00
Ayub khan
056191db85 Merge pull request #16375 from edx/LEARNER-2653-make-targets-for-extract-and-push-translations 
LEARNER-2653 Created make targets for extract and push translations
 2017-10-31 14:29:11 +05:00
Awais Jibran
e39451a9a2 Merge pull request #16376 from edx/aj/cleanup-and-logging 
Import Cleanup and Adding Logging message
 2017-10-31 14:21:52 +05:00
Douglas Hall
3b865c92c5 Upgrade edx-enterprise to 0.53.7. 
https://github.com/edx/edx-enterprise/compare/0.53.6...0.53.7
 2017-10-30 20:32:20 -04:00
Harry Rein
b0fd8e2304 Merge pull request #16387 from edx/HarryRein/up-arrow-scrolling 
Allow scrolling up on LMS.
 2017-10-30 17:23:30 -04:00
Gregory Martin
97c1a7580b Fix onload tabindex focus for wiki edits 2017-10-30 16:37:39 -04:00
Harry Rein
4608aee3b3 Allow scrolling up on LMS. 2017-10-30 16:31:56 -04:00
Harry Rein
dff11d97cc Merge pull request #16379 from edx/HarryRein/responsive-account-settings 
Responsive account settings page.
 2017-10-30 15:33:22 -04:00
Nimisha Asthagiri
588f3d9d34 Merge pull request #16381 from edx/naa/course-update-tests 
Schedules: Tests for Course Update messages
 2017-10-30 15:19:09 -04:00
Douglas Hall
4eb490876c Merge pull request #16321 from edx/saleem-latif/ENT-669 
ENT-669: Activation email received when skip_email_verification flag is 'True'
 2017-10-30 14:49:23 -04:00
John Eskew
b866f35620 Remove support for COMPREHENSIVE_THEME_DIR - 
all dirs must now go into COMPREHENSIVE_THEME_DIRS.
Move comprehensive theming setup section out of startup.py and into
  settings files using new 'derived' functionality.
Add 'derive_settings' at the end of all top-level Django settings files.
Move validation of comprehensive theming settings into new apps.py
  theming file.
Split theming code into code safe to run before settings are initialized
  -and- after settings are initialized.
 2017-10-30 14:36:06 -04:00
John Eskew
9a2e25c370 Add derived/derived_dict_entry/derive_settings and tests. 
- Enables a method of deriving Django settings from other Django
  settings after all other Django settings are stable.
 2017-10-30 14:33:25 -04:00
Nimisha Asthagiri
da95676e10 Schedules: rename test class variables that aren't test methods 2017-10-30 14:14:00 -04:00