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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carol Tong
1bfb414713 Merge pull request #11995 from kevinrobinson/patch-1 
Update developer links to point directly to Confluence pages
 2016-03-31 17:16:40 -04:00
Peter Desjardins
3983d4b58a Deprecating REST APIs per DOC-2101, DOC-2653. Also adding the -W shpinx-build option per DOC-2530. 2016-03-31 17:05:17 -04:00
Sanford Student
53e6611fc8 removing feature flag for next button across sections 2016-03-31 16:50:48 -04:00
Renzo Lucioni
dc25ece02a Merge pull request #11879 from edx/schen/ECOM-3194 
ECOM-3194 Create the listing page of Programs (x-series) which learners have enrolled in
 2016-03-31 16:35:54 -04:00
Nimisha Asthagiri
5f8330ff50 XSS Safe default - footer.html 2016-03-31 16:35:31 -04:00
Nimisha Asthagiri
432c570628 XSS Safe default - header.html, navigation.html, help_modal.html 2016-03-31 16:34:33 -04:00
Nimisha Asthagiri
6eec5ac472 XSS Safe Default - dashboard 2016-03-31 16:33:17 -04:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
Adam
d93e4c33a8 Merge pull request #12005 from edx/adam/max-from-address-no-translation 
make sure email from addresses don't exceed 320 characters (TNL-4264)
 2016-03-31 16:00:36 -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
Sanford Student
777b92a03c making the accordion template escape by default 2016-03-31 15:58:20 -04:00
Simon Chen
21be72048a Create the listing page of Programs (x-series) which learners have enrolled in 2016-03-31 15:35:50 -04:00
Matt Drayer
1a5e8c8af7 Merge pull request #12003 from edx/mattdrayer/update-xblock-dependency 
mattdrayer/update-xblock-dependency: Bump to 0.4.7
 2016-03-31 14:54:09 -04:00
Eric Fischer
59ab5d2a62 Merge pull request #11886 from edx/efischer/make_edx_safe_again 
Verify student template safety
 2016-03-31 14:49:42 -04:00
Fred Smith
5eb586674d Merge pull request #11641 from eduNEXT/fmo/read_elasticsearch_config_from_json 
Read ELASTIC_SEARCH_CONFIG setting from the cms.env.json file
 2016-03-31 14:27:22 -04:00
Adam Palay
6e43d97fe7 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-03-31 14:23:08 -04:00
Ned Batchelder
259cbdd630 Merge pull request #11993 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-31 14:16:15 -04:00
Braden MacDonald
374ab7d1ec Merge pull request #11984 from open-craft/enable-azuread-default 
Enable Azure AD third party auth provider by default
 2016-03-31 08:52:09 -07:00
Simon Chen
cd737b6fcc Merge pull request #11992 from edx/schen/ECOM-3673 
ECOM-3673 Update the course end date description text to remove the reference to certificates
 2016-03-31 11:50:52 -04:00
Diana Huang
1defe4c3a3 Merge pull request #11981 from edx/diana/track-configuration 
Verified track configuration
 2016-03-31 11:13:59 -04:00
Nimisha Asthagiri
133f0f790a Merge pull request #11997 from edx/tnl/update-name-to-subsection 
Rename Section to Subsection in a11y label
 2016-03-31 11:06:01 -04:00
Simon Chen
33fc268d21 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-03-31 10:47:31 -04:00
muzaffaryousaf
e572eafaa4 Staff should be able to masquerade when previewing content. 
TNL-4291
 2016-03-31 19:12:16 +05:00
Diana Huang
ced32800a6 Add new djangoapp that allows for configuration of 
Verified Track Cohorts through the admin interface.
 2016-03-31 09:45:22 -04:00
Matt Drayer
d6385a0c72 mattdrayer/update-xblock-dependency: Bump to 0.4.7 2016-03-31 09:39:55 -04:00
Saleem Latif
7b549bc354 Merge pull request #11806 from edx/saleem-latif/WL-327 
WL-327: Add SiteConfiguration and SiteConfigurationHistory models to LMS
 2016-03-31 18:39:38 +05:00
Saleem Latif
d7f781db20 Add SiteConfiguration configuration model to LMS 2016-03-31 12:46:42 +05:00
attiyaIshaque
b912aa453f Merge pull request #11948 from edx/atiya/ECOM-3963-specific-student 
Fixed error on Course Home, when viewed as specific student.
 2016-03-31 10:48:43 +05:00
Nimisha Asthagiri
3fedb4f057 Rename Section to Subsection in a11y label 2016-03-30 18:46:32 -04:00
Clinton Blackburn
bc5e6c8da2 Merge pull request #11985 from edx/clintonb/course-api-pacing 
Added pacing field Course API
 2016-03-30 17:27:07 -04:00
Jim Abramson
2fe4df77d0 Merge pull request #11794 from edx/jsa/add-user-mgmt-commands 
add edx-management-commands dependency.
 2016-03-30 16:17:50 -04:00
Kevin Robinson
35413105de Update developer links to point directly to Confluence pages 2016-03-30 16:16:45 -04:00
Ned Batchelder
38a9ace7bf Update translations (autogenerated message) 2016-03-30 19:35:49 +00:00
Robert Raposa
62793ade7d Merge pull request #11979 from edx/robrap/linter 
TNL-4214/TNL-4287: Enhance safe template linter
 2016-03-30 15:13:31 -04:00
jsa
52657af81d add edx-management-commands dependency. 2016-03-30 14:59:09 -04:00
Clinton Blackburn
1185fff1ec Added pacing field Course API 
ECOM-3994
 2016-03-30 14:36:43 -04:00
Robert Raposa
916723fcaa Enhance safe template linter 
- Check includes for Mako templates
- Check display_name_with_default_escaped uses
- Add exceptions for Underscore and <%=
- Skip templates that are Django and not Mako
- Add pragma to disable errors
- Enhance unit tests
- Remove violation mako-js-string-missing-quotes
- Refactor line processing into StringLines
 2016-03-30 14:16:51 -04:00
Eric Fischer
7077c933a4 Make verify_student templates safe 
Fixes safe_template_linter errors for everything under verify_student. Includes
fixes to Jasmine tests and usage of HtmlUtils functionality.
 2016-03-30 13:47:42 -04:00
sanfordstudent
f730936d76 Merge pull request #11937 from edx/sstudent/MA-2164-followup 
followup to MA-2164, cleaning up unused steps
 2016-03-30 13:30:55 -04:00
Andy Armstrong
79f44357ab Merge pull request #11904 from edx/andya/static-html-utils 
Add static HtmlUtils/StringUtils into edx namespace
 2016-03-30 12:04:48 -04:00
Diana Huang
70145de7bb Merge pull request #11061 from CredoReference/impossible-to-click-check-without-answer 
PR-154 - Make it impossible to click "final check" without selecting a choice
 2016-03-30 11:33:11 -04:00
sanfordstudent
fd37948726 Merge pull request #11989 from edx/release 
Release
 2016-03-30 11:22:23 -04:00
Cliff Dyer
2c7241a3ce Merge pull request #11883 from edx/cdyer/safe-marathon-1 
Added safety to lms/templates/student_account/account_settings.html
 2016-03-30 11:14:39 -04:00
Andy Armstrong
2a204f7ffa Add static HtmlUtils/StringUtils into edx namespace 
This is a temporary workaround for code that needs
access to these classes from the UI Toolkit but
without using RequireJS.
 2016-03-30 10:30:39 -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
Dmitry Viskov
4c83a2f0de Make it impossible to click "final check" without selecting a choice 2016-03-30 16:50:00 +03:00
Matt Drayer
db3b2f0c97 Merge pull request #11954 from edx/mattdrayer/theme-ecommerce-url 
mattdrayer/theme-ecommerce-url: Theme support for ECOMMERCE_PUBLIC_URL_ROOT
 2016-03-30 09:41:30 -04:00
Christina Roberts
a2faef242a Merge pull request #11926 from edx/christina/course-discovery-template 
Clean up escaping in course discovery templates.
 2016-03-30 09:37:45 -04: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