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

11380 Commits

Author SHA1 Message Date
Will Daly
e67975b275 Feature flag credit provider messaging on the dashboard. 
When the credit eligibility is disabled, skip the code
that access the CreditProvider table.  This will allow us
to safely delete a column from the table in rc/2015-07-08.
 2015-07-06 12:56:15 -07:00
Sarina Canelake
28a234380a Dark lang middleware: Check if user is authenticated 
Check if the request's user is authenticated before attempting to
get their user preferences. Otherwise, log warnings appear indicating
the UserNotFound error was caught.
 2015-06-30 20:01:00 -04:00
Kyle McCormick
6b70785c12 TNL-2623 Fix bug where status icons were hidden in image response problems 2015-06-30 17:09:20 -04:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Will Daly
4632a07c07 Fix login/logout errors caused by unicode cookie names 2015-06-29 09:23:15 -07:00
Braden MacDonald
072ae99d12 Merge pull request #8140 from edx/feature/shibboleth-tpa 
Feature: Shibboleth/SAML SSO
 2015-06-26 14:17:24 -07:00
Diana Huang
42d8091b49 Merge pull request #8688 from edx/diana/polling-cleanup 
Clean up capa polling to have exponential backoff
 2015-06-26 17:00:53 -04:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
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
Diana Huang
254d6c6821 Put a timeout on poling for codeinput and matlab problems. 2015-06-26 15:29:49 -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
91a7df8832 Replace deprecated 'django_language' key with LANGUAGE_SESSION_KEY 
LOC-87
 2015-06-26 13:15:43 -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
Syed Hassan Raza
2ca1d0ef78 fix the source_version xblock after discard changes 
formatting changes
 2015-06-25 16:19:29 -04:00
Will Daly
da982341e7 Accept string-encoded timestamps 2015-06-25 13:18:30 -07: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
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
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
cahrens
923edee15f Fix flaky test_import_timestamp test. 
TNL-2386
 2015-06-25 09:58:28 -04:00
Will Daly
34863c76c1 Make the user info cookie secure 2015-06-24 16:02:23 -07:00
Christina Roberts
2013c96376 Merge pull request #8662 from edx/christina/remove-flaky-test 
Fix flaky teams test
 2015-06-24 16:03:57 -04:00
Nimisha Asthagiri
4b64316425 Merge branch 'rc/2015-06-24' into release 2015-06-24 15:12:05 -04:00
cahrens
a5fc4e6d6c Fix flaky test. 
TNL-2494
 2015-06-24 13:25:02 -04:00
Will Daly
5e86a64729 User info cookie 
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
 2015-06-24 09:44:50 -07:00
Bertrand Marron
f19b338170 Shorten long lines to resolve pylint issues 2015-06-24 17:55:24 +02:00
Bertrand Marron
e0ed2d8a3a Fix misleading enrollment API documentation 
The user parameter corresponds to the username, not the user ID.
 2015-06-24 17:55:24 +02:00
Aamir
f07e4b9b38 Merge pull request #8387 from edx/aamir-khan/ECOM-1524-dashboard-credit-display-new 
Aamir khan/ecom 1524 dashboard credit display new
 2015-06-24 19:02:57 +05:00
Marco Morales
2dfca626a7 Merge pull request #8151 from edx/marco/capa-styling 
Updated styling for basic capa problems (multiple choice, dropdown, checkboxes, numerical input and text input) including support for mobile app experience.
 2015-06-24 09:05:34 -04:00