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

14377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
5bf839c9a9 Guard against trying to load a template when checking pages. 2013-03-28 16:55:20 -04:00
Will Daly
d92533bb51 Test case now drops the mongo collection 2013-03-28 16:41:55 -04:00
Will Daly
86bc70c3c2 Reverted cms changes back 2013-03-28 15:00:19 -04:00
Chris Dodge
ee5076bda9 fix incorrect comment 2013-03-28 14:48:12 -04:00
Chris Dodge
cdc353b61c add back dropped import 2013-03-28 14:07:13 -04:00
Chris Dodge
8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 13:27:29 -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
Chris Dodge
c55d54b071 also, we don't support metadata on chapters 2013-03-28 13:03:34 -04:00
Will Daly
f652fb5f73 Pylint and pep8 fixes 2013-03-28 12:51:09 -04:00
Brian Talbot
2cd8f448f7 studio - resolving merge with tender widget branch 2013-03-28 12:48:42 -04:00
Brian Talbot
bc248a1d4a studio - tender widget: revised styling with spam protection back in place 2013-03-28 12:47:08 -04:00
Brian Talbot
653369e3cf resolving local stash merge 2013-03-28 12:37:58 -04:00
Will Daly
6f8c9b4a9f Optimized ModuleStoreTestCase to reload templates only once 
over all test runs.
 2013-03-28 12:31:46 -04:00
Chris Dodge
1c2a8a97cd remove unnecessary debug log message 2013-03-28 11:38:22 -04:00
Chris Dodge
197f52539f add some unit tests 2013-03-28 11:37:53 -04:00
cahrens
b2bda10435 Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/features/subsection.feature
 2013-03-28 11:17:47 -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
cahrens
2d677a834c Test for due dates. 2013-03-28 10:24:31 -04:00
Will Daly
13c01ec3fc Randomized instructor page tests 2013-03-28 10:03:05 -04: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
c7bafddace DRY things out a bit and share as much code between MongoModuleStore and DraftMongoModuleStore 2013-03-28 09:49:55 -04:00
Will Daly
bf37d4a9a3 Randomized loading of test pages for dark launch test 2013-03-28 09:33:51 -04:00
Chris Dodge
3cdd973af4 get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore 2013-03-28 09:28:19 -04:00
Chris Dodge
6c67ed1f57 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 09:28:12 -04:00
Will Daly
c48f119cec Skip test of mock_xqueue_server 2013-03-28 09:13:28 -04:00
Will Daly
3eefb7d5ec Resolved conflicts from rebase to master; fixed keyword error caught by 
pylint
 2013-03-28 08:58:56 -04:00
Will Daly
27a31230bf Removed full course tests 2013-03-28 08:55:45 -04:00
Will Daly
7978c581db Changed test for checking all pages to checking a random page 2013-03-28 08:55:16 -04: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
Vik Paruchuri
0c218176d9 Run some code reformatting 2013-03-27 18:40: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
Vik Paruchuri
df6d8fd2a3 Fix issues with progress page and open ended grading 2013-03-27 18:20:04 -04:00
Brian Wilson
c639799a07 fix missing import 2013-03-27 18:12:48 -04:00
Vik Paruchuri
4443afecaf Get rid of max score on open ended modules. Auto-calculate it from the rubric instead. 2013-03-27 18:05:00 -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
Brian Talbot
c8ab45cc57 studio - footer help ui revamp - animation, structure, styling - WIP 2013-03-27 17:40:24 -04:00
Will Daly
9c671163fd Added exc_info=True to log.warning 
Changed log.exception to log.warning
 2013-03-27 17:11:02 -04:00
Will Daly
f038237ee9 Changed log.exception to log.warning 2013-03-27 16:34:08 -04:00
Jay Zoldak
6564cc57e6 Fix typo with hyphen in cms lettuce feature files 2013-03-27 16:29:55 -04:00
Brian Talbot
756f75951d studio - in progress work on help UI 2013-03-27 16:28:49 -04:00