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

17094 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Harry Rein
3498cc4e4b Responsive account settings page. 2017-10-30 12:11:04 -04:00
Andy Armstrong
03e496bdbd Merge pull request #16370 from edx/andya/waffle-fix 
Allow Waffle flags to work when outside a request context
 2017-10-30 09:33:09 -04:00
Awais Jibran
abe8b7e7b2 Import Cleanups more logging 
This PR is to add more logging when user clicks "Request Certificate" and gets error "Your certificate will be available when you pass the course."

EDUCATOR-1616
 2017-10-30 17:48:28 +05:00
hamzamunir7300
9c85fcad78 Merge pull request #15988 from edx/footer_design_WIP/LEANER-2311 
Footer New design using bootstrap
 2017-10-30 16:00:18 +05:00
Hamza Munir
4a3164e2e3 Footer New design using bootstrap 
This is a work in progress finished the 320px - 539px mobile
screen design.

LEARNER-2311
 2017-10-30 14:55:26 +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
Harry Rein
58f93cc7cc Styling fixes for the dashboard and course header. 2017-10-29 15:04:29 -04:00
Jeremy Bowman
d0f348d38d Merge pull request #16345 from edx/jmbowman/PLAT-1780 
PLAT-1780 Remove dependency on django-extensions
 2017-10-27 17:47:55 -04:00
Andy Armstrong
c55dbb2c61 Allow Waffle flags to work when outside a request context 2017-10-27 16:24:33 -04:00
Brian Mesick
348605a020 Merge pull request #16310 from edx/bmedx/django111_survey_models 
Clean up survey warnings
 2017-10-27 15:07:14 -04:00
Matt Tuchfarber
e88d916c29 Merge pull request #16360 from edx/tuchfarber/marketing_hero 
Add hero to main.html and use it in program page
 2017-10-27 13:45:27 -04:00
Jeremy Bowman
ba06372cac PLAT-1780 Remove dependency on django-extensions 2017-10-27 13:19:12 -04:00
Matt Tuchfarber
a93832aabe Add hero to main.html and use for program page 
Adding hero to main.html allows for full width marketing images to be
used. This commit includes the addition of the hero block into
main.html along with the program marketing page's use of that new
hero block.
 2017-10-27 12:26:21 -04:00
Troy Sankey
7bbecfdc3c Merge pull request #16301 from edx/pwnage101/verify_student_app_startup 
Move verify_student signal registration to ready()
 2017-10-27 11:10:30 -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
Cliff Dyer
2cadbbad0b Merge pull request #16186 from open-craft/cliff/complete-scored-blocks 
Complete scored blocks
 2017-10-27 10:32:05 -04:00
Ayub khan
b85b793c18 Merge pull request #16363 from edx/you/update_translations 
Update translations
 2017-10-27 17:50:05 +05: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
ayub-khan
8ba42a3355 Update translations 2017-10-27 15:19:08 +05:00
rabiaiftikhar
9260f8813a EDUCATOR-1542 give access to Special Exam tab to the course team 2017-10-27 07:02:54 +00: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
Troy Sankey
3be0fa81b8 Move verify_student signal registration to ready() 2017-10-26 13:57:52 -04:00
Dillon-Dumesnil
e712a2f1f1 Merge pull request #16356 from edx/ddumesnil/flaky-test 
Removing flaky test
 2017-10-26 13:55:25 -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
Dillon Dumesnil
f54edeff2e Removing flaky test 2017-10-26 11:31:42 -04:00
Gabe Mulley
05dd63e85a fix tests, I hope? 2017-10-26 10:32:33 -04:00
ayub-khan
8ede3a53b3 Added REFRESH_TOKEN_EXPIRE_SECONDS=20160 
When edx_clear_expired_tokens command will run it will clear
all refresh,access tokens and grants expired before 2 weeks.
 2017-10-26 18:43:59 +05: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
Tyler Hallada
806114a3ef Check org before course deadline config w/ tests 2017-10-25 17:54:47 -04:00
Andy Armstrong
8dc47f5797 Merge pull request #16336 from edx/andya/fix-browser-tab-i18n 
Fix i18n for the page title in course tabs
 2017-10-25 17:40:51 -04:00
Diana Huang
df89a1d238 Merge pull request #16314 from edx/diana/programs-dashboard-grades 
ECOM-7387 - Add grade display to the programs dashboard
 2017-10-25 16:31:45 -04:00
Tyler Hallada
4c8b257bbb Add OrgDynamicUpgradeDeadlineConfiguration model 2017-10-25 15:56:28 -04:00