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

11412 Commits

Author SHA1 Message Date
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
aamir-khan
987889fc37 ECOM-1524: Display credit availability on the dashboard 2015-06-24 16:50:38 +05:00
Adam Palay
b1346fc747 add tests for structure cache 
use default cache for tests
add test for when cache isn't configured
add test for dummy cache
noop if no cache found
 2015-06-23 23:27:26 -04:00
David Ormsbee
39ab0f31dc Cache SplitMongo course structures in memcached. 
This is primarily to reduce load on MongoDB, where we've lately
had performance problems that we suspect are caused by very
large course structures being evicted from MongoDB's cache. This
may potentially give us a path to better performance as well,
but that's not the goal of this commit.

Surprisingly, LZ4 seemed to actually run more slowly than zlib
for this. Possibly because of some overhead in the Python
bindings? GZip was also surprisingly slow given that it uses
zlib underneath (something like 5x slower).

Use separate cache backend for caching structures.

Abstract out course structure cache.

add datadog metrics for compressed course structure sizes

Since we're using a different cache background, we don't need to have a cache prefix

Use dummy cache backend for tests.

Fallback to default cache if course_structure_cache doesn't exist.
 2015-06-23 23:24:05 -04:00
Will Daly
b89ad57cb7 Remove duplicate logged-in-cookie helper methods 
There were two helper methods that set the marketing site
"logged in" cookie.  This commit deletes one of them
and ensures that all callers are using the other one.
 2015-06-23 12:47:15 -07:00
Nickersoft
e184c78c0a XCOM-416: Embargo restrictions are now enforced during logistration 2015-06-23 14:17:43 -04:00
Diana Huang
ecd237396e Merge pull request #8617 from edx/diana/course-tab-cleanup 
Switch tabs to use ugettext_noop for titles.
 2015-06-23 12:33:06 -04:00
Will Daly
9efe3201da Merge pull request #8568 from edx/will/credit-provider-api-timestamp-update 
Update the format of the credit provider timestamp.
 2015-06-23 08:46:30 -07:00
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -04:00
Kyle McCormick
aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. 2015-06-23 10:27:22 -04:00
David Ormsbee
8718dc13ca Cache SplitMongo course structures in memcached. 
This is primarily to reduce load on MongoDB, where we've lately
had performance problems that we suspect are caused by very
large course structures being evicted from MongoDB's cache. This
may potentially give us a path to better performance as well,
but that's not the goal of this commit.

Surprisingly, LZ4 seemed to actually run more slowly than zlib
for this. Possibly because of some overhead in the Python
bindings? GZip was also surprisingly slow given that it uses
zlib underneath (something like 5x slower).

Use separate cache backend for caching structures.

Abstract out course structure cache.

add datadog metrics for compressed course structure sizes

Since we're using a different cache background, we don't need to have a cache prefix

Use dummy cache backend for tests.

Fallback to default cache if course_structure_cache doesn't exist.
 2015-06-22 23:21:19 -04:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Kyle McCormick
328ed9270f Add new testing decorator check_mongo_calls_range 2015-06-22 17:38:53 -04:00
Sarina Canelake
e7cbcfff20 Merge pull request #8618 from edx/sarina/revert-8402 
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
 2015-06-22 16:05:49 -04:00
Matt Drayer
f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal 2015-06-22 14:04:43 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware" 
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
 2015-06-22 13:55:53 -04:00
Will Daly
cea06e1217 Update the format of the credit provider timestamp. 
Use the number of seconds since the epoch (Jan 1 1970 UTC)
instead of an ISO-formatted datetime string.  This is easier
for credit providers to parse.
 2015-06-22 10:03:31 -07:00
Will Daly
5fa75989fd Merge pull request #8507 from edx/will/reverification-ios 
Reverification iOS support and refactor
 2015-06-22 09:54:49 -07:00
Waheed Ahmed
678369ca7f Merge pull request #8428 from edx/waheed/tnl2166-fix-two-play-events-on-replay 
Fixed two paly_video events emitted on video replay.
 2015-06-22 21:00:40 +05:00
Will Daly
8c52c92bcb Reverification iOS support and refactor 
* Delete reverification templates
* Delete photocapture.js
* Delete unused "name change" end-points
* Rebuild the reverification views using Backbone sub-views
* Stop passing template names to the JavaScript code
* Avoid hard-coding the parent view ID in the webcam view (for getting the capture click sound URL)
 2015-06-22 08:45:12 -07:00