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 |
|
David Ormsbee
|
537d6dd18e
|
Merge pull request #1490 from MITx/bugfix/brian/pearson-timer
change timer to calculate relative duration in javascript
|
2013-02-12 09:26:53 -08: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 |
|
Ned Batchelder
|
baee9f96dc
|
Merge branch 'master' of github.com:MITx/mitx
|
2013-02-12 11:28:51 -05:00 |
|
Ned Batchelder
|
78d3d20069
|
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
Conflicts:
common/djangoapps/util/converters.py
|
2013-02-12 11:25:14 -05:00 |
|
Victor Shnayder
|
7d65c64148
|
Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt
fix showing less than and greater than in code
|
2013-02-12 07:38:16 -08: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 |
|
Calen Pennington
|
23bb87e0bb
|
Merge pull request #1486 from MITx/feature/ned/clean_up_tests
We no longer need override_settings, Django has a better one.
|
2013-02-12 07:22:27 -08:00 |
|
Calen Pennington
|
de5b3a2a39
|
Merge pull request #1483 from MITx/feature/victor/raw-static-files
Feature/victor/raw static files
|
2013-02-12 07:21:01 -08:00 |
|
Kevin Chugh
|
21f4616080
|
spread less than and greater than fix to responses and comments, and profile view
|
2013-02-12 09:18:46 -05:00 |
|
Kevin Chugh
|
d57c78f9d9
|
fix showing less than and greater than in code
|
2013-02-11 20:01:09 -05:00 |
|
Victor Shnayder
|
3ccb33c8b3
|
Simplify, make it actually work.
- regexp was too complicated, didn't work
|
2013-02-11 17:50:13 -05:00 |
|
Victor Shnayder
|
2dcdeff4b6
|
Make replace_static_urls leave alone urls that have '?raw' at the end
- needed for GWT'ed modules that rely on the filename to find dependencies
|
2013-02-11 17:07:15 -05:00 |
|
Ned Batchelder
|
aa2d0ecaf2
|
We no longer need override_settings, Django has a better one.
|
2013-02-11 17:06:35 -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 |
|
David Ormsbee
|
9b6f8a3673
|
Merge pull request #1475 from MITx/feature/brian/pearson-exam
change missingExamSeriesCode to missingPartnerID
|
2013-02-09 08:08:37 -08:00 |
|
Brian Wilson
|
2a1c89bec5
|
change missingExamSeriesCode to missingPartnerID
|
2013-02-09 02:24:51 -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 |
|
Brian Wilson
|
f51876da6a
|
cosmetic changes
|
2013-02-08 13:42:54 -05: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 |
|
Brian Wilson
|
ab6f383be1
|
support for Pearson test user
|
2013-02-08 03:05:28 -05:00 |
|
Brian Wilson
|
f1198b5f5f
|
for starting pearson exam, just call jump_to() instead of reverse(jump_to...)
|
2013-02-08 02:15:45 -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 |
|