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
Carson Gee
8261f2b4b1
Merge pull request #1862 from carsongee/bugfix/mitx/external_auth-retfun
...
Fix external_auth to properly use retfun for @ssl_login_shortcut()
2013-12-12 08:22:07 -08:00
Carson Gee
93b0357978
Replaced retfun in ssl_login so that it properly redirect to dashboard
2013-12-12 10:49:20 -05:00
Christina Roberts
455a327bb7
Merge pull request #1925 from edx/christina/underscore
...
Fix missing _ import.
2013-12-12 07:42:02 -08: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
David Baumgold
74b3a8ab7e
Merge pull request #1924 from edx/db/turn-off-mit-auth
...
Turn off AUTH_USE_MIT_CERTIFICATES
2013-12-12 04:55:47 -08: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
David Baumgold
cc31b5cce6
Fix another unbound underscore
2013-12-11 14:38:36 -05:00
cahrens
249aa8ef23
Fix missing _ import.
...
Fallout from #1792 .
2013-12-11 14:33:18 -05:00
cahrens
0b161998a1
Revert "Fix missing _ import."
...
This reverts commit 82d7da8253 .
2013-12-11 14:30:02 -05:00
cahrens
82d7da8253
Fix missing _ import.
...
Fallout from #1792 .
2013-12-11 14:29:22 -05:00
David Baumgold
81bc6617a6
Turn off AUTH_USE_MIT_CERTIFICATES
2013-12-11 14:23:23 -05:00
e0d
258802e591
Merge pull request #1922 from edx/e0d/remove-pre-wsgi-init
...
Removing duplicated initialization code.
2013-12-11 10:52:43 -08:00
srpearce
ce44ff898d
Merge pull request #1920 from edx/markhoeber/documentation/stud-1007
...
Adding accessibility guidelines to "Building a Course with edX Studio" documentation
2013-12-11 10:39:58 -08:00
e0d
7be524d769
Removing duplicated initialization code.
2013-12-11 12:59:07 -05:00
Julia Hansbrough
6b9a3e2976
Merge pull request #1913 from carsongee/cg/ssl_auth_enhancements
...
Adds redirects for login pages and the registration page
2013-12-11 09:07:32 -08:00
Mark Hoeber
48fcaeb1bc
Accessibility edits
...
Accessibility edits
2013-12-11 10:38:32 -05:00
Valera Rozuvan
d31268e790
Minor changes by Valera.
2013-12-11 17:27:23 +02:00
Mark Hoeber
f69311f848
Accessibilty updates
...
Accessibilty updates
2013-12-11 10:01:33 -05:00
polesye
2ea166313b
Fix comment.
2013-12-11 16:52:46 +02:00
David Baumgold
d1cb40def1
Merge pull request #1915 from edx/anton/fix-author-name
...
Fix author name.
2013-12-11 06:49:41 -08:00
polesye
79519b7a07
Address comments.
2013-12-11 16:25:07 +02:00
polesye
418d6fa9e1
BLD-413: Add rounding of coordinates.
2013-12-11 15:20:05 +02:00
polesye
38276972a5
Fix author name.
2013-12-11 13:59:07 +02:00
polesye
e5f583294a
Address comments.
2013-12-11 13:28:34 +02:00
polesye
39e97225ff
Fix tests.
2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f
BLD-543: Fix bug with reordering in Studio.
2013-12-11 13:28:33 +02:00
Carson Gee
484602ad61
Adds redirects for login pages and the registration page so that
...
they go through the SSL login process in branding when that feature
is enabled.
2013-12-10 18:06:26 -05:00
David Ormsbee
d5bff2e28c
Merge pull request #814 from edx/bugfix/ichuang/make-edit-link-use-static-asset-path
...
fix: make edit link use static_asset_path in xmodule_modifiers.py
2013-12-10 13:58:13 -08:00
Mark Hoeber
7c4a26a000
New Accessibility Chapter
...
Adding changes for accessibility
2013-12-10 16:33:13 -05:00
Julia Hansbrough
421f02518b
Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events
...
Events for entering verified flow & buying
2013-12-10 11:47:47 -08:00
David Baumgold
2bc4198760
Merge pull request #1853 from edx/db/update-comments
...
Updating comments and docs for MITx -> edX transition
2013-12-10 11:10:37 -08:00
Calen Pennington
80fd12b9aa
Merge pull request #1692 from cpennington/pure-xblock-handler-urls
...
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
2013-12-10 10:54:55 -08:00
Julia Hansbrough
2f9380c296
response to cr
2013-12-10 18:51:45 +00:00
Julia Hansbrough
5b5fa7c202
response to cr
2013-12-10 18:45:34 +00:00
David Baumgold
fb13bed947
Updating comments and docs for MITx -> edX transition
2013-12-10 13:21:18 -05:00
Will Daly
bc7b0ef7e8
Merge pull request #1909 from edx/will/disable-more-js-tests
...
Disable failing JS tests
2013-12-10 10:07:26 -08:00
Will Daly
4d6c8ccae9
Disable failing JS tests
2013-12-10 13:04:52 -05:00
Calen Pennington
9e7ccd8edc
Run tests in lms/lib
2013-12-10 12:04:47 -05:00
Calen Pennington
d937da8d47
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
...
[LMS-1613]
2013-12-10 12:04:18 -05:00
Calen Pennington
541ee6e707
Merge pull request #1857 from cpennington/studio-better-xblock-logging
...
Add debug logging of exceptions that happen during rending of studio_view or student_view in Studio
2013-12-10 09:00:50 -08:00
Mark Hoeber
153b7560d6
Merge pull request #1908 from edx/sylvia/documentation/ora-237
...
ORA-237: Number in "Available for Grading" column drops rapidly
2013-12-10 08:51:31 -08:00
spearce
b99f991f81
ORA-237: Number in "Available for Grading" column drops rapidly
...
Added the following under "Grade an Open Response Assessment Problem":
After you've graded enough responses for AI assessments to start, the
number of responses in the Available to grade column decreases rapidly
as the algorithm grades responses and returns them to your students in
just a few seconds. No student data is lost.
Also corrected a few minor formatting problems.
2013-12-10 11:45:52 -05:00
Mark Hoeber
ad9da035cf
Added user_id_map
...
Added user_id_map
2013-12-10 10:51:10 -05:00
Greg Price
c84164510e
Merge pull request #1882 from edx/gprice/remove-moderator-toggle
...
Remove forum user profile moderator toggle button
2013-12-10 07:40:39 -08:00