Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,176 Commits 1 Branch 0 Tags
7437bcfe12e1d5ebff627909b41b88bc377aa1b8
Commit Graph

31176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
5bf0b1794d Bump python-social-auth and python-same to upstream's latest master - PR 8599 2015-06-26 13:24:00 -07:00
Braden MacDonald
00226bf3c0 Asynchronous metadata fetching using celery beat - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Sarina Canelake
2942846afe Merge pull request #8667 from edx/sarina/update-middleware-LOC-87 
Fix dark lang and django.middleware.locale behaviors
 2015-06-26 15:17:32 -04:00
Sarina Canelake
e485e5ee24 Dark language should stay set until explicitly cleared. 
Adds a temporary user_preference key, DARK_LANGUAGE_KEY, to hold the user's dark lang preference.
This preference key is deleted when ?clear-lang is placed in query params.
 2015-06-26 13:41:14 -04:00
Sarina Canelake
9f46d9f0c5 Regression test: dark lang stays set through multiple pages 2015-06-26 13:15:44 -04:00
Sarina Canelake
cf80c96f0b Add i18n roundtrip regression tests for language pref and dark lang 
Tests would have caught issues raised in LOC-87
 2015-06-26 13:15:44 -04:00
Sarina Canelake
91a7df8832 Replace deprecated 'django_language' key with LANGUAGE_SESSION_KEY 
LOC-87
 2015-06-26 13:15:43 -04:00
Sarina Canelake
5fcdafd0cf Add i18n regression tests (LOC-72, LOC-85) 2015-06-26 13:15:42 -04:00
Sarina Canelake
34b2c91709 dark_lang: only allow released langs in accept header LOC-72, LOC-85 
Only return languages we've actually released LOC-85
Perform fuzzy matching to greedily serve the best released language LOC-72
 2015-06-26 13:15:42 -04:00
Sarina Canelake
def22d2cfc Store released dark_lang codes as all lower-case 2015-06-26 13:15:41 -04:00
Sarina Canelake
33e43bcf54 Port django.utils.translation.trans_real.parse_accept_lang_header from Django 1.8 
Add to dark_lang middleware
 2015-06-26 13:15:41 -04:00
Sarina Canelake
df0c56dde3 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-26 13:15:40 -04:00
Sarina Canelake
033d36c8f5 Merge pull request #8627 from Stanford-Online/nick/fix-tab-templates 
Fix hint-problem tab bug TNL-2542
 2015-06-26 13:11:46 -04:00
Nick Parlante
98730f3141 Fix hint-problem tab bug TNL-2542 
Revert the removal of hint templates.
Move the 'tab' attribute in the new-problem yaml
files out one level, out of the 'metadata' section.
 2015-06-26 09:22:04 -07:00
Calen Pennington
e61b750524 Merge pull request #8678 from cpennington/improve-structure-cache-metrics 
Improve structure cache metrics
 2015-06-26 12:16:52 -04:00
Calen Pennington
ba971db1ba Merge pull request #8594 from cpennington/pass-xblock-parents 
Pass xblock parents
 2015-06-26 12:15:41 -04:00
Calen Pennington
67783f8d3e Sample more frequently, and always record unexpected cache misses 2015-06-26 11:17:53 -04:00
Calen Pennington
ec2e90f539 Improve the structure cache metrics with a course context, more standardized from_cache tag, and compression sizes 2015-06-26 11:17:53 -04:00
Calen Pennington
a25f91da69 Fix XBlock inheritance ordering. XBlockMixin and derivatives should always come after XBlock and derivatives 2015-06-26 11:05:38 -04:00
Will Daly
754eb9af18 Merge pull request #8655 from edx/will/more-login-cookie-info 
User info cookie
 2015-06-26 07:34:07 -07:00
Will Daly
7f451c8835 Merge pull request #8681 from edx/will/credit-provider-integration-fixups 
Credit provider integration fixups
 2015-06-25 18:02:54 -07:00
chrisndodge
0bc2c42e0b Merge pull request #8682 from edx/muhhshoaib/PHX-40-sorting-of-popular-coupon-codes 
PHX-40 added the sorting of the most popular coupon codes used.
 2015-06-25 20:27:06 -04:00
Braden MacDonald
22a3f8620a Merge pull request #8658 from open-craft/library-create-unrestricted 
Remove restrictions on library creation in Studio (SOL-808)
 2015-06-25 14:20:03 -07:00
Alison Hodges
05972a608e Merge pull request #8677 from edx/ahodges/video_help 
Fixes DOC-1715, video doc is now in the correct RTD project
 2015-06-25 16:25:34 -04:00
Will Daly
ab915d1992 Merge pull request #8676 from edx/will/fix-credit-provider-config-unicode-error 
Gracefully handle credit provider keys with unicode type
 2015-06-25 13:24:57 -07:00
Will Daly
da982341e7 Accept string-encoded timestamps 2015-06-25 13:18:30 -07:00
Will Daly
62742952a2 Make credit provider callback CSRF exempt 2015-06-25 13:04:45 -07:00
Braden MacDonald
24af22ca88 Remove restrictions on library creation in Studio 2015-06-25 12:57:56 -07:00
Muhammad Shoaib
0442e70072 PHX-40 added the sorting of the most popular coupon codes used. 2015-06-26 00:35:24 +05:00
Kyle McCormick
4d6cefcc3f Merge pull request #8665 from edx/mekkz/course-overviews-fix 
MA-879 Fix bug in course_start_datetime_text
 2015-06-25 15:04:31 -04:00
Kyle McCormick
8c505e6b36 MA-879 Fix bug in course_start_datetime_text 2015-06-25 14:16:56 -04:00
Alison Hodges
9ed127ec8a Fixes DOC-1715, video doc is now in the correct RTD project 2015-06-25 14:14:07 -04:00
Nimisha Asthagiri
c63ac86842 Merge pull request #8675 from edx/release-merge-test 
Release merge 06-24-2015
 2015-06-25 14:06:20 -04:00
Calen Pennington
fdf81042f5 Pass XBlock parents down to their children when constructing them, for caching 2015-06-25 13:59:46 -04:00
Calen Pennington
324d4785c1 Include stack traces when counting calls in unit tests 2015-06-25 13:58:00 -04:00
Will Daly
8548d55700 Gracefully handle credit provider keys with unicode type 2015-06-25 10:53:36 -07:00
Matt Drayer
ee479a0bbc Merge pull request #8673 from edx/mattdrayer/SOL-449 
mattdrayer/SOL-449: Add flaky decorator to bok choy test
 2015-06-25 13:22:32 -04:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Matt Drayer
f7262a211e mattdrayer/SOL-449: Add flaky decorator to bok choy test 2015-06-25 11:50:57 -04:00
Utkarsh
091dc4c3aa Merge pull request #8650 from edx/utkjad/platform-eusc 
Moving xblock_user_state to edx-user-state-client, and add dependency to edx-platform
 2015-06-25 11:05:17 -04:00
Andy Armstrong
4ff1c8b38a Merge pull request #8529 from edx/andya/bokchoy-asset-pipeline 
Update Bok Choy to run against optimized static files
 2015-06-25 10:50:50 -04:00
Ahsan Ulhaq
950917945a Merge pull request #8671 from edx/ahsan/ECOM-1739-reverification-ask-for-webcam-permission-twice 
Reverification flow asks for permission to use the webcam twice
 2015-06-25 19:42:05 +05:00
cahrens
923edee15f Fix flaky test_import_timestamp test. 
TNL-2386
 2015-06-25 09:58:28 -04:00
Andy Armstrong
aa76d9482a Update Bok Choy to use optimized static assets 
TNL-2465
 2015-06-25 09:58:27 -04:00
Peter Fogg
5ca6bfeb70 Merge pull request #8668 from edx/peter-fogg/update-team-tab-urls 
Update URL when switching between Team tabs.
 2015-06-25 09:19:11 -04:00
Ahsan Ulhaq
84f03a16a6 Reverification flow asks for permission to use the webcam twice 
In-course Reverification checkpoint ask for the camera access twice on
Chrome.

ECOM-1739
 2015-06-25 15:39:51 +05:00