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

11697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Alexander Kryklia
05ba082c8f Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue 
Bug fix for Polls tool.
 2013-03-20 01:53:15 -07:00
Victor Shnayder
21e58d009a Remove associate legal council posting, per request from Tess 2013-03-20 00:05:13 -04:00
cahrens
f5bae8d8e3 Reduce pep8 warnings. 2013-03-19 17:29:06 -04:00
chrisndodge
8cbf24fd73 Merge pull request #1698 from MITx/feature/christina/mongo-debug-toolbar 
Have to explicitly specify safe option on mongo insert, remove, update b...
 2013-03-19 14:24:19 -07:00
cahrens
b5a587d8d0 Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False. 2013-03-19 16:57:19 -04:00
Will Daly
e7f8c7c676 pep8 fixes 2013-03-19 16:00:43 -04:00
Will Daly
39aa25c2d6 Removed file that was added accidentally. 2013-03-19 15:57:24 -04:00
Will Daly
66434d7d05 Moved XQueue mock from terrain into LMS, so that the 
server is not created for cms tests.
 2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
Will Daly
2087b81573 Created MockXQueueServer which listens on a local port 
and simulates an XQueue.
 2013-03-19 15:53:06 -04:00
Valera Rozuvan
0884051b32 Fixed bug where in firefox a marked poll button was not highlighted in blue. 2013-03-19 19:29:09 +02:00
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning 
Allow backwards compatibility for forums pinning UI.
 2013-03-19 09:31:14 -07:00
chrisndodge
a245cae4ef Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance 
Feature/cale/fix metadata inheritance
 2013-03-19 07:56:21 -07:00
Calen Pennington
8fda5af4e4 Comment cleanup 2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674 Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data 2013-03-19 10:41:12 -04:00
Jay Zoldak
a70a23a48e Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests 
Feature/will/courseware lettuce tests
 2013-03-18 12:24:19 -07:00
Don Mitchell
c50bf5678e Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio 
Fix/cdodge/add 500 404 templates to studio
 2013-03-18 12:11:39 -07:00
Chris Dodge
3e28ffa4f7 remove import and shortened line length 2013-03-18 15:10:17 -04:00
Chris Dodge
dc78a08ce5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio 2013-03-18 15:05:37 -04:00
VikParuchuri
9a59336b5e Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite 
Fix version handling for combined open ended
 2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests 
Fix/will/fix broken jasmine lms tests
 2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc Pep8 fixes 
Changed constant to uppercase
 2013-03-18 13:57:26 -04:00
chrisndodge
eff6f1d182 Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash 
Skip over fields that are scoped to students when looping through the Co...
 2013-03-18 10:21:37 -07:00
Jay Zoldak
2b14960519 Merge pull request #1689 from MITx/fix/cale/pylint-cleanup 
Small pylint cleanup
 2013-03-18 10:14:49 -07:00
Calen Pennington
3fbde821dd Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard 2013-03-18 13:09:10 -04:00
Chris Dodge
651465f1ad add HTML templates for 404/500 errors 2013-03-18 12:56:17 -04:00
Calen Pennington
a4f10bfdaf Small pylint cleanup 2013-03-18 12:45:46 -04:00
Chris Dodge
2b677544a5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio 2013-03-18 09:39:47 -04:00
chrisndodge
27be7e159a Merge pull request #1685 from MITx/feature/cale/string_days_early 
Handle days_early_for_beta possibly being a string
 2013-03-16 17:48:43 -07:00
Calen Pennington
9dda977ece Handle days_early_for_beta possibly being a string 2013-03-16 20:38:32 -04:00
Carlos Andrés Rocha
1b619ac1c6 Merge pull request #1684 from MITx/content/rocha/xblock-announcement-2 
XBlock SDK announcement
 2013-03-16 14:47:50 -07:00
Carlos Andrés Rocha
a4451bdcd2 XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-16 14:26:14 -07:00