Arthur Barrett
|
72d9c1d7d2
|
Saving work-in-progress of guided classification exercise.
|
2013-02-18 19:02:54 -05:00 |
|
Arthur Barrett
|
9fb80ec3df
|
Removed console.log.
|
2013-02-15 13:50:57 -05:00 |
|
Arthur Barrett
|
24f519e32f
|
Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.
|
2013-02-15 13:46:38 -05:00 |
|
Arthur Barrett
|
2848df8282
|
Style changes to comments: increase font size, width. Improved scrolling between spans and discussions.
|
2013-02-14 12:43:11 -05:00 |
|
Arthur Barrett
|
010593be6f
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-13 15:39:41 -05:00 |
|
Christina Roberts
|
0b91c1c346
|
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
clean up templates that were removed from disk - we need to remove from ...
|
2013-02-13 06:29:35 -08:00 |
|
Arthur Barrett
|
949603e3c1
|
Fixed issue with return link and scroll after effects.
|
2013-02-13 01:16:20 -05:00 |
|
Arthur Barrett
|
6b5bf319c3
|
Style and behavior changes. Added return links to discussions.
|
2013-02-12 19:08:23 -05:00 |
|
jkarni
|
2197bd987f
|
Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks
Feature/julian/multiple choice tweaks
|
2013-02-12 13:32:15 -08:00 |
|
Arthur Barrett
|
0c70d201f8
|
Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color.
|
2013-02-12 13:57:28 -05:00 |
|
Ned Batchelder
|
27e8d699be
|
On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.
|
2013-02-12 13:43:03 -05:00 |
|
Arthur Barrett
|
7e7911a08d
|
Changed the markup and js for associating spans with discussion threads. Uses the discussion id now.
|
2013-02-12 13:24:50 -05:00 |
|
Brian Wilson
|
b5378b04b3
|
change timer to calculate relative duration in javascript
|
2013-02-12 12:25:11 -05:00 |
|
Arthur Barrett
|
45a27f303f
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-12 12:09:21 -05:00 |
|
Arthur Barrett
|
cfa16feab5
|
Trying to setup jasmine specs...
|
2013-02-12 12:00:54 -05:00 |
|
Chris Dodge
|
93d186511f
|
clean up templates that were removed from disk - we need to remove from DB as well
|
2013-02-12 10:23:32 -05:00 |
|
Arthur Barrett
|
a144896154
|
Style and behavior changes to the header and tooltips.
|
2013-02-11 16:17:34 -05:00 |
|
Don Mitchell
|
46a7f7427a
|
Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
add exporting of grading_policy.json
|
2013-02-11 12:53:36 -08:00 |
|
Chris Dodge
|
33009eba7d
|
add exporting of grading_policy.json
|
2013-02-11 14:30:26 -05:00 |
|
Arthur Barrett
|
3a81ed0651
|
Updated styling and markup.
|
2013-02-10 19:40:18 -05:00 |
|
David Ormsbee
|
fb1e7f3dc1
|
Make type check for self.code a little more robust, give default val for mmlans so it's never undefined
|
2013-02-10 19:03:25 -05:00 |
|
Arthur Barrett
|
b7158e9f8a
|
Switched to $.scrollTo instead of custom animation and refactored toggle method.
|
2013-02-09 14:38:04 -05:00 |
|
Arthur Barrett
|
5fc7f1a892
|
Constrain comments to viewport.
|
2013-02-08 21:27:35 -05:00 |
|
Arthur Barrett
|
a9773eb888
|
Updated markup, styling, and tooltip behavior for displaying instructor comments. Added drag/drop to the comments so the user can organize them as they wish after clicking on the span. When the user hides the annotations, their positions on the screen are remembered so they can be restored later. Also modified the markup so that block content can be displayed.
|
2013-02-08 20:38:24 -05:00 |
|
David Ormsbee
|
80843c1561
|
Merge pull request #1463 from MITx/feature/brian/pearson-exam
Feature/brian/pearson exam
|
2013-02-08 11:07:15 -08:00 |
|
cahrens
|
98026e4325
|
A couple minor bug fixes.
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
|
2013-02-08 12:46:32 -05:00 |
|
Jay Zoldak
|
0d0049ec76
|
Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
fix test_conditional
|
2013-02-08 08:13:01 -08:00 |
|
Calen Pennington
|
dd4db0601f
|
Remove generated files
|
2013-02-08 10:45:59 -05:00 |
|
Arthur Barrett
|
7ea87793c2
|
Modified annotatable to retrieve and display instructor comments from span elements. Instructor commentaries are displayed in tooltips with a reply link when the highlighted area is clicked. The commentaries are connected to inline discussion forums by anchors (for now).
|
2013-02-07 19:51:22 -05:00 |
|
ichuang
|
7b7b0690b6
|
fix test_conditional
|
2013-02-07 18:19:48 -05:00 |
|
Brian Wilson
|
290368ef0d
|
merge out from master
|
2013-02-07 17:40:54 -05:00 |
|
Brian Wilson
|
80e4944314
|
minor cleanup
|
2013-02-07 16:12:02 -05:00 |
|
Brian Wilson
|
2974b9eec3
|
Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam
|
2013-02-07 15:58:12 -05:00 |
|
Brian Wilson
|
cc11dc2aa3
|
switch to using timelimit module for Pearson test
|
2013-02-07 15:57:43 -05:00 |
|
Julian Arni
|
8a75e1ad19
|
Added comment
|
2013-02-07 14:50:18 -05:00 |
|
Brian Talbot
|
6d4cb558d3
|
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
|
2013-02-07 12:35:52 -05:00 |
|
Brian Wilson
|
33a5a5fd9f
|
add implementation for fixed_time_module
|
2013-02-07 05:17:56 -05:00 |
|
Victor Shnayder
|
37b735d708
|
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
Hack to disable YouTube <iframe> API when they break it.
|
2013-02-06 19:41:12 -08:00 |
|
David Ormsbee
|
a470a62d12
|
Hack to disable YouTube <iframe> API when they break it.
|
2013-02-06 22:37:41 -05:00 |
|
Julian Arni
|
a770e34bec
|
Adding multiple-choice loncapa integration.
|
2013-02-06 20:54:43 -05:00 |
|
jmclaus
|
5737f58b95
|
Added GWT Protex - reads target shape from xml writes answer to hidden input field
|
2013-02-06 20:48:25 -05:00 |
|
Victor Shnayder
|
0141f31d33
|
add warning message to sample-post.py
|
2013-02-06 18:57:25 -05:00 |
|
Victor Shnayder
|
edf96036c8
|
Merge remote-tracking branch 'origin/master' into 7012x-clean
|
2013-02-06 18:53:14 -05:00 |
|
Carlos Andrés Rocha
|
536333cbb5
|
Refactor how editamolecule displays messages
|
2013-02-06 18:31:00 -05:00 |
|
ichuang
|
b5ba88f0af
|
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker
Conflicts:
common/lib/xmodule/xmodule/conditional_module.py
|
2013-02-06 18:15:36 -05:00 |
|
ichuang
|
c16f688802
|
conditional xmod: add errortracker msg and inherit icon from child
|
2013-02-06 18:10:25 -05:00 |
|
Carlos Andrés Rocha
|
d4afa02b12
|
Modify editamolecule to load GWT scripts dynamically
|
2013-02-06 17:40:44 -05:00 |
|
David Ormsbee
|
e5fda33eff
|
Throw the error back up if we don't have a console to log it to.
|
2013-02-06 17:13:22 -05:00 |
|
Vik Paruchuri
|
463f31618d
|
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images
|
2013-02-06 16:37:52 -05:00 |
|
Vik Paruchuri
|
cf81fb27e8
|
Add in close date to metadata
|
2013-02-06 15:55:39 -05:00 |
|