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

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Your Name
32f75bfe9e added pinning UI to inline 2013-03-20 11:58:47 -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
Brian Talbot
99cf432390 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-20 10:45:01 -04:00
Brian Talbot
8cf2cc6f78 studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles 2013-03-20 10:42:35 -04:00
Brian Talbot
9069d822a4 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-20 10:38:07 -04:00
Diana Huang
10c6e7615b More polish for matlab input type 2013-03-20 10:09:44 -04:00
Jay Zoldak
16773aac63 More factory refactoring. 2013-03-20 09:38:53 -04:00
Jay Zoldak
3576a3154b Repoint factory references in lettuce tests to world. 2013-03-20 09:38:52 -04:00
Jay Zoldak
1c4ffcf122 Fix import statement for test.py 2013-03-20 09:38:52 -04:00
Jay Zoldak
daadaffb61 Add mongo contentstore to acceptance.py for lettuce tests for lms 2013-03-20 09:38:52 -04:00
Jay Zoldak
74653ff8ad Factory refactor working for lms lettuce tests. 2013-03-20 09:38:52 -04:00
Diana Huang
57f7acf863 Unbreak grading for capa problems 
Clean up some pylint errors
 2013-03-20 09:23:25 -04:00
Diana Huang
a2957cb3b7 Add in some JS messages for when things go wrong. 2013-03-20 09:23:25 -04:00
Diana Huang
f4d68d77f6 Add Javascript for new button and fix Python backend issues 2013-03-20 09:23:25 -04:00
Diana Huang
8649d67b9d Force the progress bar update when we get a code response answer. 2013-03-20 09:23:25 -04:00
Diana Huang
521c469a35 Add the ability for input types to have their own state 
and add in a handler for ungraded responses via xqueue
 2013-03-20 09:23:25 -04:00
Diana Huang
45d8086e1c Set up ajax to submit to XQueue. Add some unit tests to make sure 
this is working properly
 2013-03-20 09:23:25 -04:00
Diana Huang
eda6169b8b Pass along a url creator as opposed to just a url through 
the ModuleSystem.
 2013-03-20 09:23:25 -04:00
Diana Huang
58e8f7db12 - Pep8 and pylint fixes 
- beginnings of new Matlab input type
- update progress after getting a response from xqueue
 2013-03-20 09:23:25 -04:00
Kevin Chugh
359de858b4 merge master 2013-03-20 09:21:51 -04:00
Your Name
9964e4c2bb local fix to merge conflict 2013-03-20 09:16:26 -04:00
Your Name
1e56b7d28d Merge branch 'master' of github.com:MITx/mitx 2013-03-20 09:04:21 -04:00
Your Name
6ddff7fcb3 stash merge 2013-03-20 09:04:14 -04: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
jmclaus
8e7990598c Merge branch 'master' into jmclaus/genex-save-state 2013-03-20 09:23:16 +01:00
Victor Shnayder
21e58d009a Remove associate legal council posting, per request from Tess 2013-03-20 00:05:13 -04:00
Mark L. Chang
10ac7e04f8 copy finalized 2013-03-19 21:31:59 -04:00
Don Mitchell
af136e75ca Fix bug 249 the ugly way (decerebrate the moronically impotent model) 2013-03-19 18:07:46 -04:00
Chris Dodge
e0d1449e91 add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception 2013-03-19 17:42:21 -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
Brian Talbot
fe59ca5b89 edx.org - replacing visual banners with updated marketing ones 2013-03-19 17:14:57 -04:00