Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 6dd86f7a97 Refactored courseware_common and open_ended to use ui helpers Will Daly 2013-03-22 12:19:46 -04:00
• 5e69050a16 Elminated unused functions from courseware/features/courses.py and moved the rest to common.py Will Daly 2013-03-22 12:01:55 -04:00
• c12e1fb1ce Added missing import statement Will Daly 2013-03-22 11:54:17 -04:00
• b0eb73302b Moved some courseware/features/common.py steps into terrain/steps.py Will Daly 2013-03-22 11:50:50 -04:00
• 0562f11c56 Fixed import issue with WebDriverException Will Daly 2013-03-22 11:41:30 -04:00
• e494d529fc Split terrain/helpers.py into ui_helpers.py and course_helpers.py Will Daly 2013-03-22 11:38:30 -04:00
• 315b360e4c Fixed an import error in terrain/helpers.py Will Daly 2013-03-22 11:31:41 -04:00
• 24301d2a07 Moved helper functions from terrain/steps.py to terrain/helpers.py Will Daly 2013-03-22 11:30:31 -04:00
• 506a5252b2 converting password_reset_confirm back to django template from mako John Jarvis 2013-03-26 11:06:17 -04:00
• 87f545329a studio - adding in tender-widget sass file Brian Talbot 2013-03-26 11:05:33 -04:00
• 97cb4910a7 Add in default bucket, edit image url checks Vik Paruchuri 2013-03-26 11:04:14 -04:00
• a603f25466 Merge pull request #1739 from MITx/bug/christina/studio Don Mitchell 2013-03-26 07:44:42 -07:00
• f681d4300d More cleanup in base.js. cahrens 2013-03-26 10:42:44 -04:00
• 8afe2eb001 Increase max score allowed Vik Paruchuri 2013-03-26 10:35:47 -04:00
• 83eda6ac93 Merge branch 'master' into bug/christina/studio cahrens 2013-03-26 10:34:37 -04:00
• d4615da555 Adjust max image dim, add in safety for rewriting links Vik Paruchuri 2013-03-26 09:57:52 -04:00
• df935d422d Fix issues with open ended image grading and peer grading centralized module finder. Vik Paruchuri 2013-03-26 09:52:26 -04:00
• 69c95ca785 Newline cleanup. cahrens 2013-03-26 09:51:24 -04:00
• 175e1b46e9 studio - in progress styling of tender help widget Brian Talbot 2013-03-26 08:32:49 -04:00
• 83c0feb84c Merge pull request #1738 from MITx/fix/cdodge/too-many-depth-levels Calen Pennington 2013-03-26 03:42:19 -07:00
• 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 Chris Dodge 2013-03-25 23:15:35 -04:00
• d8f1c2b41a add unit test for proper depth build out Chris Dodge 2013-03-25 22:49:39 -04:00
• d636f4fab0 Merge branch 'master' into feature/abarrett/lms-notes-app Arthur Barrett 2013-03-25 19:04:58 -04:00
• 63349dab9c fixed update/delete responses Arthur Barrett 2013-03-25 19:04:23 -04:00
• 0f486b16e9 add creation time to output Arthur Barrett 2013-03-25 18:54:28 -04:00
• 131c63b697 refactored model and api to search/filter by page uri Arthur Barrett 2013-03-25 18:47:28 -04:00
• 8350fe141b Merge pull request #1735 from MITx/fix/will/bug_258 Victor Shnayder 2013-03-25 14:37:40 -07:00
• ce884c44ee Newline cleanup. cahrens 2013-03-25 17:26:59 -04:00
• fa63bcce94 Allow clearing of dates (except for course start date). https://edx.lighthouseapp.com/projects/102637/tickets/231 cahrens 2013-03-25 17:25:49 -04:00
• 3e43e6d3f2 Merge pull request #1736 from MITx/bug/christina/studio Don Mitchell 2013-03-25 13:52:02 -07:00
• 37e7d68cef pep8 and pylint fixes Will Daly 2013-03-25 16:46:31 -04:00
• c660229b25 Added checking for problem answer state after a problem is checked Will Daly 2013-03-25 16:37:59 -04:00
• 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. Chris Dodge 2013-03-25 16:09:13 -04:00
• ccd4db9ac3 Writing test. cahrens 2013-03-25 15:24:53 -04:00
• 66ba0f9b81 studio - resolving local merge with master Brian Talbot 2013-03-25 15:21:25 -04:00
• f5aaf309e8 edx.org - added in visual spacing for confirmed state of password recovery modal Brian Talbot 2013-03-25 15:16:50 -04:00
• 156afb6d77 Remove duplicate login dialog. Diana Huang 2013-03-25 10:25:38 -04:00
• 3084361042 Updated template to correctly handle checkbox values Will Daly 2013-03-25 15:12:06 -04:00
• e716530692 edx.org - added necessary JS and Sass to disabled login/register button when form is submitting Brian Talbot 2013-03-25 14:52:13 -04:00
• 1df35507a3 Changed 'in' to '==' to fix bug #258 Will Daly 2013-03-25 14:13:47 -04:00
• 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 Brian Talbot 2013-03-25 13:59:30 -04:00
• 0574eb49ad initialize annotator on any element by note:init event Arthur Barrett 2013-03-25 13:36:38 -04:00
• 5ba583ed7b Merge branch 'master' of github.com:MITx/mitx Your Name 2013-03-25 11:46:27 -04:00
• 8c1b7a7160 Merge pull request #1734 from MITx/fix/rocha/course-xmodule-test Don Mitchell 2013-03-25 08:34:12 -07:00
• a5a126ac93 Fix incorrect date in test for course xmodule Carlos Andrés Rocha 2013-03-25 11:28:40 -04:00
• f0e1b477f7 Merge pull request #1703 from MITx/feature/diana/matlab-input Victor Shnayder 2013-03-25 08:27:56 -07:00
• 4bda05d9eb Fix seed assignment priority and add clearer documentation Diana Huang 2013-03-25 11:22:56 -04:00
• a91f1278cb Merge pull request #1733 from MITx/bug/christina/studio Don Mitchell 2013-03-25 08:12:47 -07:00
• c39ff353ea Don't assume input fields will be within a div. https://edx.lighthouseapp.com/projects/102637/tickets/232 cahrens 2013-03-25 11:09:33 -04:00
• cda0fa0aa5 Check for None specifically when setting a new seed. Diana Huang 2013-03-25 11:08:51 -04:00
• d7057ef56d Merge pull request #1732 from MITx/bug/christina/studio Mark L. Chang 2013-03-25 07:58:14 -07:00
• 235cce1323 Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix Victor Shnayder 2013-03-25 07:51:02 -07:00
• ecf395d692 Upadate link to static documentation. cahrens 2013-03-25 10:39:35 -04:00
• 6d9e5ef6e5 Merge branch 'master' of github.com:MITx/mitx Your Name 2013-03-25 10:17:58 -04:00
• 71712ef05d Merge pull request #1729 from MITx/bug/dhm/date-parse chrisndodge 2013-03-25 07:15:04 -07:00
• 264ca65640 Add some comments Don Mitchell 2013-03-25 09:37:00 -04:00
• a26a7c860b Merge pull request #1728 from MITx/bug/christina/cursor-move Brian Talbot 2013-03-25 06:15:04 -07:00
• a2518ff697 Merge pull request #1730 from MITx/feature/zoldak/pylint-docstring Christina Roberts 2013-03-25 06:10:28 -07:00
• 2c4506b79f Pylint to not require docstring for tests Jay Zoldak 2013-03-22 17:13:58 -04:00
• 884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse Don Mitchell 2013-03-22 16:56:31 -04:00
• b9dca0618f Merge pull request #1726 from MITx/fix/cdodge/grading-perf-regression Calen Pennington 2013-03-22 13:46:03 -07:00
• 056b7d3427 More unit tests which found another timezone assumption :-) Don Mitchell 2013-03-22 16:45:21 -04:00
• 5863ba5ac4 Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml David Ormsbee 2013-03-22 13:30:47 -07:00
• 862a7d13e9 pep8: line length Don Mitchell 2013-03-22 16:17:37 -04:00
• 8370124e2b Make to and from json for dates use iso format esp for timezone. Don Mitchell 2013-03-22 16:16:32 -04:00
• dfdc2cb7d8 Remove console.log. cahrens 2013-03-22 16:11:43 -04:00
• 39714a17d9 Merge branch 'master' into bug/christina/cursor-move cahrens 2013-03-22 16:03:52 -04:00
• 2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists Don Mitchell 2013-03-22 12:49:30 -07:00
• eebef1e647 Don't save subsection and unit names until the change event. Fixes bugs #18 and #228. cahrens 2013-03-22 15:32:13 -04:00
• 1069c2c40a Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles Christina Roberts 2013-03-22 11:02:16 -07:00
• 505a382421 Re-enable all the tests! cahrens 2013-03-22 14:00:20 -04:00
• fd973442b1 if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state. Chris Dodge 2013-03-22 13:57:53 -04:00
• 1ea3a4e77b Merge pull request #1724 from MITx/bug/btalbot/studio-viewlivebutton Christina Roberts 2013-03-22 10:34:55 -07:00
• b4e6b792cf studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit Brian Talbot 2013-03-22 12:01:58 -04:00
• 23f77a1571 Merge pull request #1723 from MITx/fix/zoldak/pep8-test-responsetypes Will Daly 2013-03-22 08:52:12 -07:00
• 08c5ab3cc9 pep8 fixes Jay Zoldak 2013-03-22 11:38:58 -04:00
• 420c8216aa demo change to resolve push error Brian Talbot 2013-03-22 11:31:47 -04:00
• 22fd8432c3 demo change to resolve push error Brian Talbot 2013-03-22 11:31:43 -04:00
• f11e54ddc7 studio - syncing up page <title> values with UI titles/headings Brian Talbot 2013-03-22 11:27:16 -04:00
• 45029e7023 Merge pull request #1720 from MITx/ux/marco/textbook brianhw 2013-03-22 08:16:06 -07:00
• 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 Chris Dodge 2013-03-22 11:15:14 -04:00
• f8eacff683 styled textbook css to look closer to the discussion forum navigation marco 2013-03-22 11:04:44 -04:00
• 14e0387b20 Merge pull request #1716 from MITx/bug/orphan Christina Roberts 2013-03-22 07:33:52 -07:00
• 9fdac385e1 Merge branch 'master' into ux/marco/textbook marco 2013-03-22 10:29:05 -04:00
• d631509afa Re-enable all the tests! cahrens 2013-03-22 10:28:36 -04:00
• a2a1478d92 Fix caching bug on back button. cahrens 2013-03-22 09:51:45 -04:00
• be4045cb86 Reduce pep8 warnings, move Checklistst to top of menu. cahrens 2013-03-21 22:17:46 -04:00
• 8385db8518 Clean up comments. cahrens 2013-03-21 21:40:38 -04:00
• 016fe196ae Add Python unit tests, don't convert URLs every time. cahrens 2013-03-21 21:21:24 -04:00
• ae81009a43 Changing edx marketing site cookie value to 'true' John Jarvis 2013-03-21 17:56:56 -04:00
• 4d266fa3ca Merge pull request #1718 from MITx/victor/fewer-phds-more-associates Carlos Andrés Rocha 2013-03-21 14:35:16 -07:00
• 3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree Victor Shnayder 2013-03-21 17:23:46 -04:00
• 7120998938 refactoring notes js Arthur Barrett 2013-03-21 17:18:45 -04:00
• 57dd2e728c Adding a new cookie to determine logged in status for the edx mktg site John Jarvis 2013-03-21 17:17:35 -04:00
• 0de9e6a6a5 Merge pull request #1717 from MITx/fix/cdodge/drive-by-fix David Ormsbee 2013-03-21 13:38:44 -07:00
• 63fc2eecaf drive by fix to get proper error handling Chris Dodge 2013-03-21 16:32:58 -04:00
• 7051a94e7b resolved local master merge conflicts with studio sass Brian Talbot 2013-03-21 16:15:19 -04:00
• 7d22d48e14 disable the discussion cache update signal until we get solution for pickling Chris Dodge 2013-03-21 15:52:48 -04:00
• a5845a2087 remove discussion caching for now. It might be overkill and I need to figure out how to serialize out the resultset into the cache as writing modules into the cache causes a pickle error Chris Dodge 2013-03-21 15:46:57 -04:00
• 6b3b7fe277 Some cleanup. cahrens 2013-03-21 15:19:45 -04:00