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

35903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
a254d7542a make sure email from addresses don't exceed 320 characters (TNL-4264) 
clean up and fix quality violations

since get_course can never return None, we can remove these lines
 2016-04-06 12:52:39 -04:00
Braden MacDonald
60f4f1ac77 Enable Azure AD third party auth provider by default 2016-04-06 12:51:22 -04:00
Omar Khan
c5072d63ac Add azuread SSO button style 2016-04-06 12:51:07 -04:00
Omar Khan
07892a75f2 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-06 12:50:55 -04:00
Omar Khan
c09a4c472f Add --save_screenshots option to paver test_bokchoy 2016-04-06 12:50:43 -04:00
Renzo Lucioni
0fd06e808a Merge pull request #12040 from edx/patch/2016-04-05 
Patch/2016 04 05
 2016-04-05 14:15:48 -04:00
muzaffaryousaf
cc7aa349a1 Removing check for edx notes for OAUTH token timeout. 
TNL-4336
 2016-04-05 10:21:25 -04:00
Renzo Lucioni
003cbd5a1d Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-05 09:09:09 -04:00
Renzo Lucioni
77a90a08ca Add option to bypass course home 
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
 2016-04-05 09:08:51 -04:00
Renzo Lucioni
7222f9b0f5 Hide chrome and default_tab from advanced settings 
It doesn't make sense to list these LMS block attributes in course-level advanced settings. Doing so is confusing to course teams.
 2016-04-05 09:08:39 -04:00
Simon Chen
649e8b1158 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-04-05 09:07:56 -04:00
Cliff Dyer
69305ce8de Merge pull request #11877 from edx/cdyer/oauth-toolkit 
introducing django-oauth-toolkit and public client refresh tokens
 2016-03-31 15:59:12 -04:00
J. Cliff Dyer
1df040228a Configure LMS to select oauth2 providing library. 
Available backends:

* django-oauth-toolkit (DOT)
* django-oauth2-provider (DOP)

* Use provided client ID to select backend for
  * AccessToken requests
  * third party auth-token exchange
* Create adapters to isolate library-dependent functionality
* Handle django-oauth-toolkit tokens in edX DRF authenticator class

MA-1998
MA-2000
 2016-03-30 14:21:27 +00:00
J. Cliff Dyer
88fef8b2a4 Use renamed edx_oauth2_provider throughout. 
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
 2016-03-30 14:21:17 +00:00
sanfordstudent
2e2687ba05 Merge pull request #11955 from edx/rc/2016-03-29 
Release Candidate rc/2016-03-29
 2016-03-30 09:29:07 -04:00
sanfordstudent
88d0461bfc Merge pull request #11967 from edx/sstudent/fix-typo 
fixing typo in template
 2016-03-28 09:44:03 -04:00
Sanford Student
ed7237b671 fixing typo in template 2016-03-25 16:50:28 -04:00
Robert Raposa
801bb288c2 Merge pull request #11945 from edx/robrap/linter 
Add check for multiple page tags
 2016-03-25 11:29:46 -04:00
Douglas Hall
6bbcbbf09d Merge pull request #11952 from edx/douglashall/PHX-255/update_lti_consumer_1_0_4 
Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes
 2016-03-25 11:19:35 -04:00
Andy Armstrong
e8f620a2f4 Merge pull request #11938 from edx/andya/fix-underscore-on-sandboxes 
Fix issues with Underscore in the asset pipeline
 2016-03-25 11:16:22 -04:00
Simon Chen
0ad9eb910e Merge pull request #11943 from edx/schen/FixPageTagsOnDashboardMakoTemplates 
Fix to remove mulitple page tags on mako templates
 2016-03-25 10:49:19 -04:00
Dennis Jen
f1c700a689 Merge pull request #11946 from edx/dsjen/instr-page-args 
Consolidated page tags in instructor analytics template.
 2016-03-25 10:46:20 -04:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline 
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
 2016-03-25 10:02:38 -04:00
Simon Chen
d15e192b26 Fix to remove mulitple page tags on mako templates 2016-03-25 09:56:23 -04:00
Muzaffar yousaf
73c97f4d75 Merge pull request #11935 from edx/mzfr/rqst-timeout-tnl2444 
Setting request timeouts for edx notes.
 2016-03-25 18:42:16 +05:00
Douglas Hall
fb6f3ca568 Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes 2016-03-25 09:34:52 -04:00
muzaffaryousaf
1ecba9a954 Setting request timeouts for edx notes. 
TNL-2444
 2016-03-25 16:26:35 +05:00
Michael Katz
9ea37a642b Merge pull request #11888 from edx/mkatz/safetemplate 
safe template
 2016-03-25 06:48:31 -04:00
Douglas Hall
62ce357b81 Merge pull request #11905 from edx/douglashall/xss_bug_bash 
XSS Bug Bash
 2016-03-25 05:38:59 -04:00
Waheed Ahmed
402ca836ea Merge pull request #11827 from edx/waheed/ecom-2947-support-entire-password-reset-flow-in-logistration 
Fixed the other half of forgot password flow accourding to logistration.
 2016-03-25 13:35:25 +05:00
Waheed Ahmed
4399a5c7bd Fixed the other half of forgot password flow accourding to logistration. 
ECOM-2947
 2016-03-25 12:02:03 +05:00
Douglas Hall
f177cb6e3e Make templates safe 2016-03-24 20:52:07 -04:00
Dennis Jen
89f11638ad Consolidated page tags in instructor analytics template. 2016-03-24 17:06:40 -04:00
Akiva Leffert
91c0517b7a Merge pull request #11918 from edx/aleffert/remove-unit-coffee 
Remove unused empty file
 2016-03-24 17:01:10 -04:00
Robert Raposa
0707e0dd73 Add check for multiple page tags 2016-03-24 16:40:11 -04:00
Dennis Jen
33bff3b244 Merge pull request #11897 from edx/dsjen/instructor-dash-enrollment-safe-temp 
Added safe templating to instructor_analytics.html.
 2016-03-24 15:36:39 -04:00
Toby Lawrence
beabe25a97 Merge pull request #11839 from edx/PERF-268 
Make CDNifying of course over image URLs only happen for relative URLs.
 2016-03-24 15:29:21 -04:00
Michael Frey
90da5cea68 Merge pull request #11942 from edx/release 
Hotfix 2016-03-24
 2016-03-24 15:22:56 -04:00
Ned Batchelder
8703affe59 Merge pull request #11940 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-24 15:06:35 -04:00
Michael Frey
c6112c35bd Merge pull request #11934 from edx/hotfix/2016-03-24 
[hotfix] Redirecting sidebar verification link to new checkout basket.
 2016-03-24 14:27:46 -04:00
Ned Batchelder
026ac6636f Update translations (autogenerated message) 2016-03-24 18:04:37 +00:00
Kevin Falcone
93dc905081 Merge pull request #11913 from edx/jibsheet/submission-history-time-zone 
This appears to actually be in UTC (not in the django TZ default).
 2016-03-24 14:01:24 -04:00
Douglas Hall
3acc6da98c Merge pull request #11859 from edx/douglashall/edx_proctoring_0_12_15 
Updated edx-proctoring requirement to 0.12.15
 2016-03-24 13:48:39 -04:00
vkaracic
1a0b2df6f8 Change EcommerceService's is_enabled to accept User instead of request 
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
 2016-03-24 13:13:34 -04:00
Daniel Friedman
a0654f93a2 Merge pull request #11890 from edx/dan-f/make-cms-500-safe 
Make CMS 500 template safe by default
 2016-03-24 11:24:12 -04:00
Daniel Friedman
32f6bc0791 Merge pull request #11887 from edx/dan-f/make-cms-404-safe 
Make CMS 404 template safe by default
 2016-03-24 11:23:13 -04:00
Daniel Friedman
c210d918b2 Make CMS 404 template safe by default 2016-03-24 10:31:42 -04:00
sanfordstudent
5ec01207be Merge pull request #11924 from edx/sstudent/safe_video_template 
Sstudent/safe video template
 2016-03-24 10:10:30 -04:00
sanfordstudent
4a496e7db4 Merge pull request #11921 from edx/sstudent/safe_welcome_back 
making the welcome_back template safe
 2016-03-24 10:10:21 -04:00
Daniel Friedman
0fd137c271 Make CMS 500 template safe by default 2016-03-24 09:51:55 -04:00