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

7100 Commits

Author SHA1 Message Date
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor 
Stub Server Port Conflicts and Refactor
 2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain 
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
 2013-12-19 09:12:41 -05:00
polesye
24106a9203 BLD-590: Fix typos in Announcement template. 2013-12-19 14:14:30 +02:00
David Baumgold
36f35ac926 Reformat xml_importer.py to be more readable 2013-12-18 16:17:05 -05:00
Julia Hansbrough
0d91e61e60 Added flag for lms-specific functionality 
Studio doesn't do email changes, thus has no email reset template; thus, we must disable password/email-reset related tests when running with studio settings
 2013-12-18 14:18:12 -05:00
Julia Hansbrough
f351b05031 Fixing email link injection bug 
Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
 2013-12-18 13:38:36 -05:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
Sarina Canelake
bc625ab571 Merge pull request #1904 from tusbar/player-size 
Stop forcing video player’s speeds widget width
 2013-12-17 13:16:05 -08:00
Oleg Marshev
cc2e4bfeae Fix lis_outcome_service_url sending. 2013-12-17 18:53:21 +02:00
Valera Rozuvan
f6867da502 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 18:52:01 +02:00
Alexander Kryklia
946c615047 Merge pull request #1859 from edx/oleg/fix_outcome_url_sending 
Make LTI module not send grade_back_url if has_score=False
 2013-12-17 08:14:42 -08:00
Carson Gee
149a188e30 Merge pull request #1547 from carsongee/bugfix/cg/beta_user_none 
Corrects a bug experienced with external auth enabled
 2013-12-17 07:55:59 -08:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
frances botsford
8a23f432c7 Merge pull request #1896 from edx/frances/fix/studio-outline-cleanup 
FED Cleanup of Studio Outline page
 2013-12-17 07:27:14 -08:00
polesye
335a36f17c Address comments. 2013-12-17 13:22:08 +02:00
polesye
887eea30c9 Add comments. 2013-12-17 13:22:08 +02:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
polesye
4e10c72988 BLD-21: Show answer for imageresponse. 2013-12-17 13:22:08 +02:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 12:47:49 +02:00
Valera Rozuvan
f03f3ebf96 Adding Jasmine tests for ImageInput. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
06b6535fb1 Using jQuery for all DOM manipulation. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
7ebeccd4bf Updating ImageInput JS code base. 2013-12-17 12:21:19 +02:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
David Baumgold
179a1dd44e Revert "Merge pull request #1889 from tusbar/studio-https-fonts" 
This reverts commit 540256b213, reversing
changes made to bd04ab5a08.
 2013-12-16 09:30:42 -05:00
Carson Gee
cbb6e5e686 Changed default user to be anonymous in both has_access and student.views.index 
Replaced existing test_none_user_index_access_with_startdate_fails
test with new test now that the tested function has changed and
was causing the original test to fail.
 2013-12-15 09:56:37 -05:00
David Baumgold
540256b213 Merge pull request #1889 from tusbar/studio-https-fonts 
Remove protocol from font URLs in Studio and Tiny MCE
 2013-12-13 11:52:07 -08:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
Christina Roberts
258d3227ee Merge pull request #1938 from edx/christina/common-location 
Create explicit Locations.
 2013-12-13 09:15:21 -08:00
Diana Huang
6952aec870 Merge pull request #1941 from edx/diana/openid-fullname 
Return the full name of the student as part of the OpenId response.
 2013-12-13 07:32:34 -08:00
Diana Huang
68b75086f2 Clean up test conditions. 
LMS-750
 2013-12-13 09:11:00 -05:00
Calen Pennington
41dfa3e552 Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering 2013-12-12 21:45:22 -05:00
Diana Huang
0057f460ec Return the full name of the student as part of the OpenId response. 
LMS-750
 2013-12-12 17:33:33 -05:00
cahrens
df09e99ad1 Create explicit Locations. 
Part of STUD-1030
 2013-12-12 14:37:00 -05:00
Don Mitchell
f4e69275ee Use mongo indices for all queries 
STUD-1039
 2013-12-12 12:55:39 -05:00
Carson Gee
cec793680d Add additional check signin to make sure an SSL certificate is passed 
before redirecting to SSL authentication.
 2013-12-12 11:26:57 -05:00
Carson Gee
93b0357978 Replaced retfun in ssl_login so that it properly redirect to dashboard 2013-12-12 10:49:20 -05:00
Carson Gee
50e2e833a2 Added comment as requested 2013-12-12 09:35:46 -05:00
Carson Gee
caf44c3685 Added full test coverage for ssl login decorator 
I also removed conflicting implementation of SSL_AUTH_IMMEDIATE_SIGNUP
and rebased on the current master.
 2013-12-12 09:35:46 -05:00
ichuang
07e235a0c4 remove @cache_if_anonymous 2013-12-12 09:29:11 -05:00
ichuang
246fc030bd add missing retfun 2013-12-12 09:29:10 -05:00
ichuang
e868759ceb fix external_auth @ssl_login_shortcut decorator to properly use retfun 2013-12-12 09:29:10 -05:00
Anton Stupak
5eb029293c Merge pull request #1917 from edx/anton/fix-imageresponse-in-ie 
Fix image mapping in IE
 2013-12-12 03:58:03 -08:00
Anton Stupak
a79d79aa12 Merge pull request #1891 from edx/anton/fix-lti-dnd 
LTI: fix reordering bug in Studio
 2013-12-12 02:57:41 -08:00
Valera Rozuvan
d31268e790 Minor changes by Valera. 2013-12-11 17:27:23 +02:00