Commit Graph

14212 Commits

Author SHA1 Message Date
Will Daly
e69931ec5a Refactored studio lettuce tests to use terrain/ui_helpers for ui
manipulation
2013-03-26 11:44:56 -04:00
Will Daly
dde0d1676b Refactored terrain/steps.py to use ui_helpers
Added a wait time before checking the page HTML,
and changed it to check just in the HTML body
2013-03-26 11:44:56 -04:00
Will Daly
4528490fac Refactored lms/coureware lettuce tests to use terrain helpers
for common ui manipulations
2013-03-26 11:44:56 -04:00
Will Daly
6dd86f7a97 Refactored courseware_common and open_ended to use ui helpers 2013-03-26 11:44:56 -04:00
Will Daly
5e69050a16 Elminated unused functions from courseware/features/courses.py
and moved the rest to common.py
2013-03-26 11:44:56 -04:00
Will Daly
c12e1fb1ce Added missing import statement 2013-03-26 11:44:56 -04:00
Will Daly
b0eb73302b Moved some courseware/features/common.py steps into
terrain/steps.py
2013-03-26 11:44:56 -04:00
Will Daly
0562f11c56 Fixed import issue with WebDriverException 2013-03-26 11:44:56 -04:00
Will Daly
e494d529fc Split terrain/helpers.py into ui_helpers.py and course_helpers.py 2013-03-26 11:44:56 -04:00
Will Daly
315b360e4c Fixed an import error in terrain/helpers.py 2013-03-26 11:44:55 -04:00
Will Daly
24301d2a07 Moved helper functions from terrain/steps.py to terrain/helpers.py 2013-03-26 11:44:55 -04:00
John Jarvis
506a5252b2 converting password_reset_confirm back to django template from mako 2013-03-26 11:06:39 -04:00
Brian Talbot
87f545329a studio - adding in tender-widget sass file 2013-03-26 11:05:33 -04:00
Vik Paruchuri
97cb4910a7 Add in default bucket, edit image url checks 2013-03-26 11:04:14 -04:00
Don Mitchell
a603f25466 Merge pull request #1739 from MITx/bug/christina/studio
Allow clearing of dates (except for course start date).
2013-03-26 07:44:42 -07:00
cahrens
f681d4300d More cleanup in base.js. 2013-03-26 10:42:44 -04:00
Vik Paruchuri
8afe2eb001 Increase max score allowed 2013-03-26 10:35:47 -04:00
cahrens
83eda6ac93 Merge branch 'master' into bug/christina/studio 2013-03-26 10:34:37 -04:00
Vik Paruchuri
d4615da555 Adjust max image dim, add in safety for rewriting links 2013-03-26 09:57:52 -04:00
Vik Paruchuri
df935d422d Fix issues with open ended image grading and peer grading centralized module finder. 2013-03-26 09:52:26 -04:00
cahrens
69c95ca785 Newline cleanup. 2013-03-26 09:51:24 -04:00
Brian Talbot
175e1b46e9 studio - in progress styling of tender help widget 2013-03-26 08:32:49 -04:00
Calen Pennington
83c0feb84c Merge pull request #1738 from MITx/fix/cdodge/too-many-depth-levels
it appears we are taking one too many round trips to do when pre-fetchin...
2013-03-26 03:42:19 -07:00
Chris Dodge
269152c4f2 add a test scenario to count RT to database when prefetching children. This uses a shim function on pymongo's collection.find to do the counting 2013-03-25 23:15:35 -04:00
Chris Dodge
d8f1c2b41a add unit test for proper depth build out 2013-03-25 22:49:39 -04:00
Arthur Barrett
d636f4fab0 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-03-25 19:04:58 -04:00
Arthur Barrett
63349dab9c fixed update/delete responses 2013-03-25 19:04:23 -04:00
Arthur Barrett
0f486b16e9 add creation time to output 2013-03-25 18:54:28 -04:00
Arthur Barrett
131c63b697 refactored model and api to search/filter by page uri 2013-03-25 18:47:28 -04:00
Victor Shnayder
8350fe141b Merge pull request #1735 from MITx/fix/will/bug_258
Fix bug #258: multiple choice with choice names ending with 0 cause multiple choice answers marked incorrect
2013-03-25 14:37:40 -07:00
cahrens
ce884c44ee Newline cleanup. 2013-03-25 17:26:59 -04:00
cahrens
fa63bcce94 Allow clearing of dates (except for course start date).
https://edx.lighthouseapp.com/projects/102637/tickets/231
2013-03-25 17:25:49 -04:00
Don Mitchell
3e43e6d3f2 Merge pull request #1736 from MITx/bug/christina/studio
Don't assume input fields will be within a div-- PART 2!
2013-03-25 13:52:02 -07:00
Will Daly
37e7d68cef pep8 and pylint fixes 2013-03-25 16:46:31 -04:00
Will Daly
c660229b25 Added checking for problem answer state after a problem is checked 2013-03-25 16:37:59 -04:00
Chris Dodge
7dcb1bf7c6 it appears we are taking one too many round trips to do when pre-fetching children. This can be very expensive as the tree gets wider the deeper we go. For example, in courseware we want depth=2 (course, chapter, sequential). But looking at log output we were also getting verticals, which there can be a lot of. This should cut down on the total data we are grabbing from the DB. 2013-03-25 16:09:13 -04:00
cahrens
ccd4db9ac3 Writing test. 2013-03-25 15:24:53 -04:00
Brian Talbot
66ba0f9b81 studio - resolving local merge with master 2013-03-25 15:21:25 -04:00
Brian Talbot
f5aaf309e8 edx.org - added in visual spacing for confirmed state of password recovery modal 2013-03-25 15:16:50 -04:00
Diana Huang
156afb6d77 Remove duplicate login dialog. 2013-03-25 15:16:00 -04:00
Will Daly
3084361042 Updated template to correctly handle checkbox values 2013-03-25 15:12:06 -04:00
Brian Talbot
e716530692 edx.org - added necessary JS and Sass to disabled login/register button when form is submitting 2013-03-25 14:52:13 -04:00
Will Daly
1df35507a3 Changed 'in' to '==' to fix bug #258 2013-03-25 14:13:47 -04:00
Brian Talbot
dc1a7f5d6a edx.org - changed status message UI to be hidden by default (rather than with JS) for the time being for page load/render's sake 2013-03-25 13:59:30 -04:00
Arthur Barrett
0574eb49ad initialize annotator on any element by note:init event 2013-03-25 13:36:38 -04:00
Your Name
5ba583ed7b Merge branch 'master' of github.com:MITx/mitx 2013-03-25 11:46:27 -04:00
Don Mitchell
8c1b7a7160 Merge pull request #1734 from MITx/fix/rocha/course-xmodule-test
Fix incorrect date in test for course xmodule
2013-03-25 08:34:12 -07:00
Carlos Andrés Rocha
a5a126ac93 Fix incorrect date in test for course xmodule 2013-03-25 11:28:40 -04:00
Victor Shnayder
f0e1b477f7 Merge pull request #1703 from MITx/feature/diana/matlab-input
Matlab Input Type
2013-03-25 08:27:56 -07:00
Diana Huang
4bda05d9eb Fix seed assignment priority and add clearer documentation 2013-03-25 11:22:56 -04:00