Commit Graph

11341 Commits

Author SHA1 Message Date
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
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
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
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
Ben Patterson
86f17d02e0 Merge pull request #8602 from edx/benp/sol-975-fix
Fix flaky test. SOL-975
2015-06-22 11:41:50 -04:00
Sarina Canelake
548d0b662a Remove hinting templates as 'tab:' definition fails on Split 2015-06-22 11:20:08 -04:00
Waheed Ahmed
fb2f4fdade Fixed two paly_video events emitted on video replay.
TNL-2166
2015-06-22 19:59:36 +05:00
Marco Morales
8acc72975e Iniital refactor of capa styling for basic checkbox and multiple choice problem types, including additional comments to sass styles 2015-06-22 10:50:58 -04:00
Ben Patterson
2ee4b85ffc Fix flaky test. SOL-975
Remove flaky flag, improve linting.
2015-06-20 07:30:14 -04:00
John Eskew
c59a3db730 Merge pull request #8537 from edx/jeskew/import_slowdown
Re-nest for the signal-sending, then un-nest.
2015-06-19 14:54:23 -04:00
AlasdairSwan
36c8c36987 Merge pull request #8567 from edx/alasdair/ECOM-1673-dashboard-challenge-expanded
ECOM-1673 removed class and icon to always show full upsell content.
2015-06-19 09:31:22 -04:00
Renzo Lucioni
e960adc0ff Merge pull request #8262 from open-craft/tpa-pipeline-consolidation
Cleanup of third-party login and auto-enrollment
2015-06-19 09:12:11 -04:00
AlasdairSwan
b30839fe88 ECOM-1673 removed class and icon to always show full upsell content.
removed JavaScript function specific to the upsell toggle
removed bok choy test
Removed all referenced to toggleExpandMessage()
2015-06-19 08:29:51 -04:00
Braden MacDonald
345fcabd05 Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code 2015-06-18 20:57:19 -07:00
Braden MacDonald
350f98ebde Changes for compatibility with latest python-social-auth (0.2.7) 2015-06-18 19:31:47 -07:00
Sarina Canelake
6d121dc5ad Merge pull request #6786 from Stanford-Online/nick/extended-hint
Extended hint features
2015-06-18 18:34:24 -04:00
Christine Lytwynec
e48c9d9341 Merge pull request #8569 from edx/clytwynec/axs_tests
Make a11y test inherit from a base class
2015-06-18 18:32:40 -04:00
John Eskew
843c073f4f Re-nest for the signal-sending, then un-nest.
Change publish signal test to reflect new behavior.
2015-06-18 17:29:34 -04:00
Jesse Zoldak
4eee094ea5 Merge pull request #8559 from edx/zoldak/bok-choy-migrations
Update bok-choy cached db with the latest migrations
2015-06-18 16:42:08 -04:00
Christine Lytwynec
d32355fbbd Make a11y test inherit from a base class 2015-06-18 14:35:11 -04:00
Nick Parlante
77f3069655 Extended Feedback and Hints for Problems
Extends the common capa response types (string, numeric, multiple
choice, checkbox, dropdown) with feedback and hint
capabilities. "Feedback" refers to feedback shown to the student when
they check the problem, looking at their specific answer. "Hints"
refers to a Hint button in LMS which the student can click at any time
to see hints for that problem. The implementation extends the markdown
syntax to include feedback and hints. There are new Feedback-and-Hint
specific templates in Studio when the author clicks to add a new
problem.
2015-06-17 16:25:04 -07:00
David Ormsbee
b92ad0ad13 TNL-2291 Add caching to discussion forum permissions
Caches all permissions per user per course. Adds caching functionality to has_permission and replaces all instances of cached_has_permission with has_permission.
2015-06-17 21:08:28 +00:00
Jesse Zoldak
7601eaa941 Update bok-choy cached db with latest migrations 2015-06-17 17:01:38 -04:00
Awais Qureshi
fa4dcdebbe Merge pull request #8531 from edx/awais786/ECOM-1494-del-migrations
ECOM-1494 deleting models from database through new migrations.
2015-06-17 19:19:02 +05:00