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

11756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
3ce01882bb add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials 2013-03-29 13:59:59 -04:00
Chris Dodge
c55d54b071 also, we don't support metadata on chapters 2013-03-28 13:03:34 -04:00
Chris Dodge
dc983cb9a5 add checking for metadata that we can't support editing for in Studio. This is now an error and will have to be addressed by course authors 2013-03-22 11:15:14 -04:00
Jay Zoldak
25ceea175c Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests 
Feature/will/speed up lettuce tests
 2013-03-21 12:17:07 -07:00
Christina Roberts
dec9aea047 Merge pull request #1715 from MITx/fix/btalbot/studio-fontsizemixin 
studio - fixing a mixin value used when defining font-size
 2013-03-21 09:26:26 -07:00
Brian Talbot
caae29a8ac studio - fixing a default mixin value used when defining font-size for elements 2013-03-21 12:21:02 -04:00
Christina Roberts
e8401cf2bb Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup 
Studio Sass Cleanup
 2013-03-21 08:45:48 -07:00
Don Mitchell
11c9028f52 Merge pull request #1712 from MITx/fix/cdodge/get-import-to-work-with-conditionals 
import needs to enumerate through the fields for all content scopes. Als...
 2013-03-21 08:44:16 -07:00
Will Daly
6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests 
Conflicts:
	lms/djangoapps/courseware/features/problems.py
 2013-03-21 10:49:04 -04:00
chrisndodge
37a673012f Merge pull request #1701 from MITx/bug/orphan 
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
 2013-03-21 07:21:16 -07:00
Don Mitchell
ae55cd7533 One more unit test for json not containing expected fields. 2013-03-21 09:40:57 -04:00
Chris Dodge
9cd38d115e import needs to enumerate through the fields for all content scopes. Also add unit test 2013-03-20 21:37:09 -04:00
Don Mitchell
9413364e55 Disambiguate the course_info url names. 2013-03-20 18:00:25 -04:00
Don Mitchell
3ea70eac9d Also clean up children after sort saved. 2013-03-20 17:59:24 -04:00
Don Mitchell
bd2dd9408d Unit tests and minor fixes to course_info_updates. Main fix was 
returning the content in same form as it was saved rather than parroting
it back.
 2013-03-20 17:49:03 -04:00
Will Daly
2fc96d5fb7 Fixed a merge issue about code response 2013-03-20 17:18:26 -04:00
Brian Talbot
2876554cd7 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-20 17:09:38 -04:00
Will Daly
7a282a9c54 Edited comments, ran pep8 2013-03-20 17:08:19 -04:00
Will Daly
911308cba2 Changed check for unanswered problems so that it now looks for 
an "unanswered" div or span.  This is much faster than
asserting that correct/incorrect is NOT present.
 2013-03-20 17:08:19 -04:00
Will Daly
f69778b367 Changed lettuce test log_in step to log in programatically 
rather than using the login dialog.
 2013-03-20 17:08:19 -04:00
Brian Talbot
3b80a90bd0 studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss 2013-03-20 16:54:14 -04:00
Calen Pennington
93eebdcd97 Merge pull request #1709 from MITx/fix/cdodge/dont-compute-inherited-metadata-on-course-loads-with-depth-zero 
if we're loading a course module with depth = 0, then we don't need to f...
 2013-03-20 12:45:18 -07:00
Christina Roberts
4131f867b4 Merge pull request #1694 from MITx/fix/cdodge/disable-metadata-inheritence-computation-on-import 
add an array of courses to not refresh the metadata cache on writes. Thi...
 2013-03-20 12:38:08 -07:00
Chris Dodge
133bd767d5 small refactoring to use a better semantic with regards to the parameter 2013-03-20 15:26:29 -04:00
Chris Dodge
f462cd6efa if we're loading a course module with depth = 0, then we don't need to fetch/compute inherited metadata 2013-03-20 15:14:14 -04:00
Victor Shnayder
e4437b7abe Merge pull request #1708 from MITx/content/rocha/replace-berkeley-logos 
Update Berkeley logos
 2013-03-20 11:47:41 -07:00
Carlos Andrés Rocha
c5385ff42c Update Berkeley logos 
LMS Lighthouse [#260]
 2013-03-20 14:46:08 -04:00
Chris Dodge
5dbb153abe ooops. didn't clean up the merge conflicts 2013-03-20 14:32:18 -04:00
Chris Dodge
8849ce084f Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-20 14:29:43 -04:00
David Ormsbee
f133d3181b Merge pull request #1706 from MITx/fix/cale/simple-lazy-object 
Force instantiation of the user before querying
 2013-03-20 11:08:57 -07:00
Diana Huang
c13fe9978a Merge pull request #1707 from MITx/victor/remove-dir-of-eng-job 
Remove director of engineering job posting per request from Tess
 2013-03-20 10:50:26 -07:00
Victor Shnayder
83665515d8 Remove director of engineering job posting per request from Tess 2013-03-20 13:45:01 -04:00
Jay Zoldak
23364d8b0f Merge branch 'master' into feature/zoldak/refactor-factories 2013-03-20 13:36:01 -04:00
Calen Pennington
154a441033 Only use .pk for queries, and not on inserts 2013-03-20 13:24:25 -04:00
Calen Pennington
cbed66280a Fix pep8 and pylint errors 2013-03-20 13:20:28 -04:00
Jay Zoldak
8428119856 Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests 
Feature/will/coderesponse lettuce tests
 2013-03-20 10:20:11 -07:00
Calen Pennington
36443163f6 Force instantiation of the user before querying 
Without accessing .pk, it's possible for the user object to still be a
SimpleLazyObject, which breaks Django's query engine

http://stackoverflow.com/questions/11875737/django-filtering-drafts-by-user-causes-error
 2013-03-20 12:59:34 -04:00
Jay Zoldak
5eba299dca Move course and item factories to xmodule.modulestore.tests 2013-03-20 12:10:18 -04:00
Jay Zoldak
192b991334 Pylint for lettuce factory refactor. 2013-03-20 11:52:15 -04:00
Jay Zoldak
6048bc2832 Pep8 fixes for factory refactor 2013-03-20 11:31:12 -04:00
chrisndodge
f7700dfc6a Merge pull request #1700 from MITx/feature/christina/mongo-debug-toolbar 
Reduce pep8 warnings.
 2013-03-20 08:27:32 -07:00
Will Daly
5411fc765e Refactored lettuce test of capa problems to use 
world.css_click() helper instead of directly
calling splinter.
 2013-03-20 11:27:28 -04:00
chrisndodge
ba0b794803 Merge pull request #1704 from MITx/fix/btalbot/studio-updatedelete 
studio - added in basic JS confirm UI when deleting course updates
 2013-03-20 08:26:32 -07:00
Brian Talbot
f181a454e4 studio - added in basic JS confirm UI when deleting course updates 2013-03-20 11:20:16 -04:00
Will Daly
2867476115 Added __init__.py and test_mock_xqueue_server.py, 
which should have been included in the last commit
 2013-03-20 11:18:41 -04:00
Ned Batchelder
3a77426417 Cale said, 'we should delete prod-requirements.txt' 2013-03-20 11:16:30 -04:00
Will Daly
8f055ab037 Moved mock_xqueue_server to its own subpackage within 
lms/djangoapps/courseware/
Separated tests of the mock server into test_mock_xqueue_server.py
 2013-03-20 11:14:42 -04:00
Jay Zoldak
e45ccbf389 Leave CourseEnrollment factor refactoring as a TODO. 2013-03-20 11:12:54 -04:00
Diana Huang
2415680efd Merge pull request #1677 from MITx/victor/fix-auto-cohorting 
Fix randomness bug in cohort placement
 2013-03-20 07:50:43 -07:00
Diana Huang
e0184453a1 Merge pull request #1702 from MITx/victor/remove-legal-council-job 
Remove associate legal council posting, per request from Tess
 2013-03-20 07:49:21 -07:00