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

11960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark L. Chang
565a2cf752 Merge branch 'feature/markchang/studio-nps' of github.com:MITx/mitx into feature/markchang/studio-nps 2013-04-03 00:28:24 -04:00
Mark L. Chang
43f6f0ce8f put survey behind MITX_FEATURES flag 2013-04-03 00:28:08 -04:00
Mark L. Chang
5df7f41c8f added net promoter score tracking javascript shim from Qualaroo 2013-04-03 00:28:08 -04:00
Mark L. Chang
7a57e369d1 put survey behind MITX_FEATURES flag 2013-04-03 00:26:12 -04:00
Mark L. Chang
84a16f5ce1 Merge branch 'master' into feature/markchang/studio-nps 2013-04-02 11:07:22 -04:00
Ned Batchelder
252f9364a6 Merge pull request #1761 from MITx/content/rocha/utaustinx-courses 
Content/rocha/utaustinx courses
 2013-03-28 10:26:02 -07:00
Carlos Andrés Rocha
a15baa97c5 Add UTAustinX landing page 2013-03-28 13:23:58 -04:00
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
chrisndodge
210101dc21 Merge pull request #1759 from MITx/bug/christina/grading 
Bug fix for grading type not showing on course outline (#258).
 2013-03-28 08:11:28 -07:00
cahrens
7279f9c460 Bug fix for grading type not showing on course outline (#258). 2013-03-28 10:54:10 -04:00
Jay Zoldak
c9a7be6b9b Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers 
Feature/will/lettuce test helpers
 2013-03-28 07:26:14 -07:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata 
Fix/cdodge/use request scoped cache for metadata inheritance
 2013-03-28 06:51:20 -07:00
Chris Dodge
3f52261b5b hmmm. actually, we should only write out to memcache if we've recomputed. Otherwise, a memcache hit will end up writing back to memcache... 2013-03-27 23:18:38 -04:00
Chris Dodge
d448aa1365 remove debug log messages 2013-03-27 23:13:33 -04:00
Chris Dodge
446397b23b remove unused thread.local() 2013-03-27 23:12:00 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
Chris Dodge
03f9bb5d38 use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down 2013-03-27 22:37:07 -04:00
Mark L. Chang
cf51971298 added net promoter score tracking javascript shim from Qualaroo 2013-03-27 22:36:18 -04:00
Victor Shnayder
a79a2907a9 Merge pull request #1755 from MITx/fix/brian/fix500v1 
Fix/brian/fix500v1
 2013-03-27 15:21:30 -07:00
Brian Wilson
c639799a07 fix missing import 2013-03-27 18:12:48 -04:00
Brian Wilson
bb7bc88847 merge out from master 2013-03-27 18:04:58 -04:00
Brian Wilson
99778b1b5b add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8. 2013-03-27 17:59:56 -04:00
Jay Zoldak
6564cc57e6 Fix typo with hyphen in cms lettuce feature files 2013-03-27 16:29:55 -04:00
Don Mitchell
6d63d13fa8 Merge pull request #1753 from MITx/bug/christina/studio 
Converter cleanup.
 2013-03-27 12:46:01 -07:00
David Ormsbee
6e3d9608b4 Merge pull request #1754 from MITx/fix/cale/enrollment-integrity-error 
An integrity error while creating an enrollment just means that our work...
 2013-03-27 12:03:26 -07:00
Calen Pennington
122c8567c5 An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947 2013-03-27 15:00:08 -04:00
cahrens
5c78218b13 Don't need to convert to milliseconds. 2013-03-27 14:52:27 -04:00
cahrens
22537ffd3b Don't need to convert to milliseconds. 2013-03-27 14:51:39 -04:00
Victor Shnayder
b0356e32b2 Merge pull request #1589 from MITx/peter/symbolic 
Added support for superscripts in variables
 2013-03-27 10:40:50 -07:00
Victor Shnayder
eca18a1237 Merge pull request #1752 from MITx/fix/will/bug_294 
Fix bug 294
 2013-03-27 10:39:42 -07:00
Will Daly
cddc868656 Login URL resolves differently in LMS and CMS, which breaks login_test 
when loaded by rake test_cms

I moved the test into lms/courseware/tests so they run correctly.
 2013-03-27 13:01:10 -04:00
cahrens
227a5e8266 Delete converters, move unit tests to test_fields, add new additional test cases. 2013-03-27 12:56:06 -04:00
Will Daly
15ea32b095 Fixed bug 294, caused by unicode encoding error when creating logging 
strings.

Added unit tests that verify the fix.
 2013-03-27 12:53:58 -04:00
brianhw
a04881ceda Merge pull request #1740 from MITx/fix/vik/peer-image-grading 
Fix/vik/peer image grading
 2013-03-27 09:06:54 -07:00
Vik Paruchuri
7101c76016 comment on rewrite links change 2013-03-27 12:02:32 -04:00
Victor Shnayder
8905343f80 Merge pull request #1744 from MITx/fix/diana/image-response-show-answer 
Fix 500 errors for bug #289
 2013-03-27 07:14:38 -07:00
Victor Shnayder
2cf815ae01 Merge pull request #1750 from MITx/fix/cale/anonymous-modx-dispatch 
Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes...
 2013-03-27 07:13:05 -07:00
Victor Shnayder
0e7cf8e782 Merge pull request #1751 from MITx/fix/cale/comment-client-non-json-errors 
Make the django_comment_client return errors that can't be parsed as JSO...
 2013-03-27 07:12:20 -07:00
Victor Shnayder
68902b8039 Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request 
if we parse an invalid location in the content store middleware, then re...
 2013-03-27 07:09:38 -07:00
Christina Roberts
d4eca16f04 Merge pull request #1745 from MITx/feature/rocha/fix-advertised-start 
Display advertised date correctly if it is an ISO date
 2013-03-27 06:23:57 -07:00
Christina Roberts
093ac4a2a2 Merge pull request #1749 from MITx/fix/btalbot/studio-smoothscroll 
studio - corrected JQ selector for smoothscrolling in-page links
 2013-03-27 06:23:31 -07:00
Calen Pennington
521843876e Make the django_comment_client return errors that can't be parsed as JSON just as simple strings when in an ajax context 2013-03-27 08:10:25 -04:00
Calen Pennington
2c0e5b82ff Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029 2013-03-27 07:29:22 -04:00
Calen Pennington
772e805eb6 Merge pull request #1748 from MITx/fix/cdodge/limit-fields-in-metadata-cache-computation 
optimize the result-set that gets returned from Mongo on metadata inheri...
 2013-03-27 03:22:00 -07:00
Brian Talbot
2120481738 studio - corrected JQ selector for smoothscrolling in-page links 2013-03-27 01:34:25 -04:00
Chris Dodge
195fd2d1fe optimize the result-set that gets returned from Mongo on metadata inheritence. We just need the fields which are actually inheritable, so no need to return anything else as it gets filtered out during the computation 2013-03-26 23:48:06 -04:00
Chris Dodge
b0e2c82ad3 actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test. 2013-03-26 20:02:29 -04:00
chrisndodge
8abba39590 Merge pull request #1746 from MITx/feature/cale/metadata-inheritance-caching 
Use get_many and set_many to cut down on the number of metadata trees to...
 2013-03-26 16:28:58 -07:00
Chris Dodge
a44ecdfcd6 if we parse an invalid location in the content store middleware, then return a 404, not a 500 2013-03-26 16:45:47 -04:00
Calen Pennington
b975d4d90c Fix tests 2013-03-26 16:43:58 -04:00