25ceea175c
Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests
Jay Zoldak
2013-03-21 12:17:07 -07:00
7ecf0e5bc1
small positioning adjustments to inline pins;
marco
2013-03-21 14:27:10 -04:00
0a063342cf
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
cahrens
2013-03-21 13:56:32 -04:00
1ae9e9bde3
Tests for opening action links.
cahrens
2013-03-21 13:56:11 -04:00
76e338d82b
added template for notes view
Arthur Barrett
2013-03-21 12:33:27 -04:00
e7727fcc6e
Pylint muting via docstrings and line wraps
Don Mitchell
2013-03-21 12:30:33 -04:00
dec9aea047
Merge pull request #1715 from MITx/fix/btalbot/studio-fontsizemixin
Christina Roberts
2013-03-21 09:26:26 -07:00
8ca6e324af
Merge branch 'master' into feature/btalbot/studio-checklists
cahrens
2013-03-21 12:23:13 -04:00
caae29a8ac
studio - fixing a default mixin value used when defining font-size for elements
Brian Talbot
2013-03-21 12:21:02 -04:00
e8401cf2bb
Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup
Christina Roberts
2013-03-21 08:45:48 -07:00
11c9028f52
Merge pull request #1712 from MITx/fix/cdodge/get-import-to-work-with-conditionals
Don Mitchell
2013-03-21 08:44:16 -07:00
f44989e516
Use Brian's open external method.
cahrens
2013-03-21 11:17:31 -04:00
bc8c0b6db2
Added unit test for what broke the system, but won't catch such a regression in future b/c the problem was persisting under one parser and reading under another.
Don Mitchell
2013-03-21 11:09:55 -04:00
6728f16ae4
Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests
Will Daly
2013-03-21 10:49:04 -04:00
67c6852b5c
studio - checklists: removing not needed sass variable for animating height
Brian Talbot
2013-03-21 10:01:39 -04:00
ae55cd7533
One more unit test for json not containing expected fields.
Don Mitchell
2013-03-21 09:40:57 -04:00
d763a6fc3a
CSS from JSME doesn't affect surrounding content now
jmclaus
2013-03-21 12:19:40 +01:00
9cd38d115e
import needs to enumerate through the fields for all content scopes. Also add unit test
Chris Dodge
2013-03-20 21:37:09 -04:00
f45cc6fb35
changes to textbook styling
marco
2013-03-20 21:30:05 -04:00
9413364e55
Disambiguate the course_info url names.
Don Mitchell
2013-03-20 18:00:25 -04:00
3ea70eac9d
Also clean up children after sort saved.
Don Mitchell
2013-03-20 17:59:24 -04:00
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.
Don Mitchell
2013-03-20 17:49:03 -04:00
2fc96d5fb7
Fixed a merge issue about code response
Will Daly
2013-03-20 17:18:26 -04:00
204f89d4dc
Make sure we are still showing the message when we are queued as well.
Diana Huang
2013-03-20 17:16:04 -04:00
481aa063c4
Merge branch 'master' into feature/btalbot/studio-checklists
Brian Talbot
2013-03-20 17:10:07 -04:00
2876554cd7
Merge branch 'master' into fix/btalbot/studio-sasscleanup
Brian Talbot
2013-03-20 17:09:38 -04:00
7a282a9c54
Edited comments, ran pep8
Will Daly
2013-03-20 15:35:46 -04:00
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.
Will Daly
2013-03-20 15:28:17 -04:00
f69778b367
Changed lettuce test log_in step to log in programatically rather than using the login dialog.
Will Daly
2013-03-20 15:11:07 -04:00
3b80a90bd0
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
Brian Talbot
2013-03-20 16:54:14 -04:00
fd9c29f449
Merge branch 'master' into feature/btalbot/studio-checklists
cahrens
2013-03-20 16:37:56 -04:00
284cfcc941
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
cahrens
2013-03-20 16:37:26 -04:00
994ced3c61
studio - notifications: organizing base variables
Brian Talbot
2013-03-20 16:34:21 -04:00
38df54dc53
studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference
Brian Talbot
2013-03-20 16:19:45 -04:00
4131f867b4
Merge pull request #1694 from MITx/fix/cdodge/disable-metadata-inheritence-computation-on-import
Christina Roberts
2013-03-20 12:38:08 -07:00
133bd767d5
small refactoring to use a better semantic with regards to the parameter
Chris Dodge
2013-03-20 15:26:29 -04:00
f462cd6efa
if we're loading a course module with depth = 0, then we don't need to fetch/compute inherited metadata
Chris Dodge
2013-03-20 15:14:14 -04:00
e4437b7abe
Merge pull request #1708 from MITx/content/rocha/replace-berkeley-logos
Victor Shnayder
2013-03-20 11:47:41 -07:00
c5385ff42c
Update Berkeley logos
Carlos Andrés Rocha
2013-03-20 14:46:08 -04:00
5dbb153abe
ooops. didn't clean up the merge conflicts
Chris Dodge
2013-03-20 14:32:18 -04:00
8849ce084f
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import
Chris Dodge
2013-03-20 14:29:43 -04:00
af1af8c6d1
Address code review feedback: - improve docstrings - only pass in the state for a particular input and not the whole dictionary - refactor some common code - minor syntax cleanup
Diana Huang
2013-03-20 14:08:15 -04:00
f133d3181b
Merge pull request #1706 from MITx/fix/cale/simple-lazy-object
David Ormsbee
2013-03-20 11:08:57 -07:00
5411fc765e
Refactored lettuce test of capa problems to use world.css_click() helper instead of directly calling splinter.
Will Daly
2013-03-20 11:27:28 -04:00
f181a454e4
studio - added in basic JS confirm UI when deleting course updates
Brian Talbot
2013-03-20 11:20:16 -04:00
2867476115
Added __init__.py and test_mock_xqueue_server.py, which should have been included in the last commit
Will Daly
2013-03-20 11:18:41 -04:00
3a77426417
Cale said, 'we should delete prod-requirements.txt'
Ned Batchelder
2013-03-20 11:16:30 -04:00
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
Will Daly
2013-03-20 11:14:42 -04:00
e45ccbf389
Leave CourseEnrollment factor refactoring as a TODO.
Jay Zoldak
2013-03-20 11:12:54 -04:00
99cf432390
Merge branch 'master' into feature/btalbot/studio-alerts
Brian Talbot
2013-03-20 10:45:01 -04:00
8cf2cc6f78
studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
Brian Talbot
2013-03-20 10:42:35 -04:00
9069d822a4
Merge branch 'master' into fix/btalbot/studio-sasscleanup
Brian Talbot
2013-03-20 10:38:07 -04:00
10c6e7615b
More polish for matlab input type
Diana Huang
2013-03-20 09:42:42 -04:00
16773aac63
More factory refactoring.
Jay Zoldak
2013-03-19 17:09:57 -04:00
3576a3154b
Repoint factory references in lettuce tests to world.
Jay Zoldak
2013-03-19 16:38:51 -04:00
1c4ffcf122
Fix import statement for test.py
Jay Zoldak
2013-03-19 16:00:15 -04:00
daadaffb61
Add mongo contentstore to acceptance.py for lettuce tests for lms
Jay Zoldak
2013-03-19 15:44:01 -04:00
74653ff8ad
Factory refactor working for lms lettuce tests.
Jay Zoldak
2013-03-19 15:18:29 -04:00
a2957cb3b7
Add in some JS messages for when things go wrong.
Diana Huang
2013-03-19 16:36:33 -04:00
f4d68d77f6
Add Javascript for new button and fix Python backend issues
Diana Huang
2013-03-19 15:29:40 -04:00
8649d67b9d
Force the progress bar update when we get a code response answer.
Diana Huang
2013-03-19 13:11:48 -04:00
521c469a35
Add the ability for input types to have their own state and add in a handler for ungraded responses via xqueue
Diana Huang
2013-03-18 17:14:16 -04:00
45d8086e1c
Set up ajax to submit to XQueue. Add some unit tests to make sure this is working properly
Diana Huang
2013-03-15 11:40:22 -04:00
eda6169b8b
Pass along a url creator as opposed to just a url through the ModuleSystem.
Diana Huang
2013-03-15 09:45:31 -04:00
58e8f7db12
- Pep8 and pylint fixes - beginnings of new Matlab input type - update progress after getting a response from xqueue
Diana Huang
2013-03-14 15:10:33 -04:00
359de858b4
merge master
Kevin Chugh
2013-03-20 09:21:51 -04:00
9964e4c2bb
local fix to merge conflict
Your Name
2013-03-20 09:16:26 -04:00
1e56b7d28d
Merge branch 'master' of github.com:MITx/mitx
Your Name
2013-03-20 09:04:21 -04:00
6ddff7fcb3
stash merge
Your Name
2013-03-20 09:04:14 -04:00
05ba082c8f
Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue
Alexander Kryklia
2013-03-20 01:53:15 -07:00
8e7990598c
Merge branch 'master' into jmclaus/genex-save-state
jmclaus
2013-03-20 09:23:16 +01:00
21e58d009a
Remove associate legal council posting, per request from Tess
Victor Shnayder
2013-03-20 00:05:13 -04:00
10ac7e04f8
copy finalized
Mark L. Chang
2013-03-19 21:31:59 -04:00
af136e75ca
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
Don Mitchell
2013-03-19 18:07:46 -04:00
e0d1449e91
add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception
Chris Dodge
2013-03-19 17:42:21 -04:00
fe59ca5b89
edx.org - replacing visual banners with updated marketing ones
Brian Talbot
2013-03-19 17:14:57 -04:00
b5a587d8d0
Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.
cahrens
2013-03-19 16:57:19 -04:00
01d95b7ebe
fixing merge issues
John Jarvis
2013-03-19 16:24:23 -04:00
63d85a52dc
fixing merge issues
John Jarvis
2013-03-19 16:22:36 -04:00
Jay Zoldak