Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,044 Commits 1 Branch 0 Tags
320abd7d2418f030bd7ba1e04bcf91fbb35de2ae
Commit Graph

36044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
320abd7d24 Using edx-ccx-keys from PyPI 
ECOM-4016
 2016-04-01 16:59:02 -04:00
Usman Khalid
343bb3e9af Merge pull request #12017 from edx/notes-jwt-issue 
Removing check from edx notes settings for OAUTH token timeout.
 2016-04-01 21:06:20 +05:00
muzaffaryousaf
ce142eb378 Removing check for edx notes for OAUTH token timeout. 
TNL-4336
 2016-04-01 20:01:46 +05:00
Muzaffar yousaf
cc4349e9ae Merge pull request #11990 from edx/mzfr/prvw-masqrd-tnl4291 
Staff should be able to masquerade when previewing content.
 2016-04-01 19:42:58 +05:00
Clinton Blackburn
c921f2ac90 Merge pull request #12011 from edx/clintonb/course-api-image 
Exposing absolute/CDN image URLs via Course API
 2016-04-01 10:31:59 -04:00
Clinton Blackburn
00b48e54a1 Exposing absolute/CDN image URLs via Course API 
ECOM-4013
 2016-04-01 09:42:57 -04:00
Asad Iqbal
9543989e57 Merge pull request #12012 from edx/asadiqbal08/updating-ubcpi-version-edxplatform 
asadiqbal08/WL-389: Update ubcpi XBlock version
 2016-04-01 18:29:23 +05:00
Cliff Dyer
393e885e4b Merge pull request #12015 from edx/cdyer/broken-master-20160401 
Fix broken import due to merging oauth changes to master
 2016-04-01 09:24:35 -04:00
David Ormsbee
8e42e61773 Merge pull request #12010 from edx/ormsbee/measure_login_page 
Add finished() metric for login and registration.
 2016-04-01 08:42:37 -04:00
sanfordstudent
6c4037b1cf Merge pull request #12002 from edx/sstudent/accordion_ 
making the accordion template escape by default
 2016-04-01 08:24:22 -04:00
J. Cliff Dyer
845b0261c0 Fix broken import due to merging oauth changes to master 2016-04-01 12:14:27 +00:00
Cliff Dyer
6917eb03cf Merge pull request #12009 from edx/merge-release-into-master 
Merge oauth release into master via intermediary branch
 2016-04-01 06:12:16 -04:00
Awais Jibran
75b8eae964 Merge pull request #11973 from edx/aj/ecom-3910-certification-exception-not-loading 
Fix certificate exception view.
 2016-04-01 14:48:36 +05:00
asadiqbal
177a237485 Wl-389 2016-04-01 13:02:16 +05:00
Omar Khan
b8dc2af3a7 Merge pull request #11871 from open-craft/omar/sso-icon-images 
Custom icons for SSO providers
 2016-04-01 12:35:39 +07:00
David Ormsbee
c11c663498 Add finished() metric for login and registration. 
Call New Relic's finished() event marker to measure when the login and
registration pages actually become usable. This is important because the
pageLoad event can be distorted by analytics and marketing tools that
trigger after the page looks complete to the user.

Note: The "xfinished" PageAction is there to work around a New Relic bug
where "finished" events weren't making it into Insights. The reason we
have both is because finished() *does* still show up in session traces.

[PERF-298]
 2016-03-31 23:21:28 -04:00
Peter Desjardins
982e99bd41 Merge pull request #11998 from edx/pdesjardins/api-deprecation 
Deprecating REST APIs per DOC-2101, DOC-2653. Also adding the -W shpinx-build option per DOC-2530.
 2016-03-31 23:00:37 -04:00
Omar Khan
453ae3e7e5 Add azuread SSO button style 2016-04-01 08:58:00 +07:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-01 08:57:43 +07:00
Omar Khan
d426931e40 Add --save_screenshots option to paver test_bokchoy 2016-04-01 08:56:27 +07:00
Nimisha Asthagiri
ac6749acef Merge pull request #12006 from edx/sstudent/enable-next-pre 
Enable next/prev button across sections
 2016-03-31 20:50:36 -04:00
Nimisha Asthagiri
0c604da9ee Merge pull request #11900 from edx/nasthagiri/css-template 
XSS Safe by default: dashboard, header, footer, navigation, help_modal
 2016-03-31 17:25:30 -04:00
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