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

7073 Commits

Author SHA1 Message Date
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
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
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
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
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
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -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
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Waheed Ahmed
aba25c2de7 In OpenEndedModule latest_score and all_score calculate sum of rubric scores every time for ML grading. 
ORA-72
 2013-12-10 11:17:44 -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
Sarina Canelake
b406ba0f83 Acceptance tests for grades download 
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.

LMS-58
 2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286 Fix bulk email acceptance test 2013-12-09 18:28:41 -05:00
David Baumgold
b60d060358 Remove old READMEs 
These files seem to have been copied over from old XML courses,
and shouldn't be in our repository.
 2013-12-09 15:57:22 -05:00
Bertrand Marron
42040fb18c Remove protocol in Tiny MCE’s font URLs 
Allow the fonts to be served using the same protocol as the current
page.
 2013-12-09 21:20:41 +01:00
polesye
7196cf21ee BLD-479: Add additional example of DnD. 2013-12-09 22:04:45 +02:00
Greg Price
cec58f885b Remove forum user profile moderator toggle button 
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
 2013-12-09 10:23:21 -05:00
Valera Rozuvan
9072b9cc5d e-reader error when popping out window 
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.

BLD-465.
 2013-12-09 10:38:57 +02:00
Don Mitchell
0684f6a40a Merge pull request #1878 from edx/dhm/pymongo_client 
Upgrade pymongo usage from deprecated connection to client
 2013-12-06 13:14:28 -08:00
Don Mitchell
298e7a2343 Shorten collection name to keep index name w/in limit 2013-12-06 15:37:38 -05:00
David Baumgold
2666b96976 Change mitx.db to edx.db for dev sqlite 2013-12-06 11:21:19 -05:00