John Jarvis
ce2f1400e6
formatting
2013-02-27 15:05:02 -05:00
John Jarvis
7c0d9ff156
Creating group for organization staff access
2013-02-27 14:55:17 -05:00
Arthur Barrett
afa7fca15a
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-27 11:58:38 -05:00
David Ormsbee
c7920f09ad
Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.
2013-02-27 11:42:06 -05:00
Will Daly
e65a017c74
Added additional unit tests for symmath library that verify
...
symmath_check for simple symbolic input strings.
2013-02-27 10:19:02 -05:00
Ned Batchelder
f828049043
Change TorontoX to University of TorontoX
2013-02-27 10:05:58 -05:00
David Ormsbee
51a863bd6b
Merge pull request #1557 from MITx/feature/brian/pdfchapter
...
Feature/brian/pdfchapter
2013-02-26 15:00:58 -08:00
Brian Wilson
310073ddef
use same images for prev/next as used in image-based textbooks
2013-02-26 16:43:48 -05:00
Brian Wilson
19567cc3d5
update styling of pdfs to be more like textbooks
2013-02-26 15:19:23 -05:00
Julian Arni
b6f3042c1d
Incorporate Victor's suggestions
2013-02-26 12:38:09 -05:00
Arthur Barrett
18233ef0d7
bolded the section titles and added unittest skeleton for module
2013-02-26 12:15:43 -05:00
Julian Arni
adaa8463e3
Removed commented-out fn
2013-02-26 10:03:20 -05:00
VikParuchuri
df01064e77
Merge pull request #1536 from MITx/diana/rubric-hot-keys
...
Add in rubric hotkeys
2013-02-26 06:46:26 -08:00
Brian Wilson
fc9ab346e1
fix loading of specific pages.
2013-02-26 01:03:01 -05:00
Julian Arni
414c62115c
Fixed tests and list check
2013-02-25 20:12:33 -05:00
Julian Arni
b4387b287d
Adding migrations
2013-02-25 18:56:58 -05:00
Julian Arni
3473a5d3b0
Fixed broken reference
2013-02-25 18:39:59 -05:00
Will Daly
850d9846f8
Fixed an error in symmath_check that occurred when
...
the expected result = 0. symmath_check() was dividing
a quantity by the expected result, leading to a NaN value
that caused the answer to be marked incorrect.
Added test_symmath_check.py with basic tests for
the symmath_check() function.
2013-02-25 18:34:35 -05:00
Julian Arni
edba0978cf
Included styling and template
2013-02-25 18:18:46 -05:00
Julian Arni
0a47f27fa7
Merge branch 'master' into feature/jkarni/foldit-api
2013-02-25 17:32:30 -05:00
Julian Arni
26eaf8985c
Allow progress without leaderboard and vice-versa
2013-02-25 17:28:22 -05:00
Brian Wilson
dde2cd0bd0
get chapter links to start working
2013-02-25 16:52:32 -05:00
Arthur Barrett
1f160d6ef4
added a box around the instructions text
2013-02-25 16:29:19 -05:00
David Ormsbee
f519c4f571
Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui
...
Feature/victor/revert revert of forums ui
2013-02-25 09:03:33 -08:00
Arthur Barrett
e736ed34f5
added ability to hide/show instructions, if present
2013-02-25 11:29:59 -05:00
Julian Arni
da2d0ed6ec
Foldit with puzzle leaderboard
2013-02-25 11:16:37 -05:00
Will Daly
862ce67bfc
Fixed a bug in symmath_check(): one of the if statements
...
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated bool(ans) was redundant, so I removed it.
2013-02-25 10:59:33 -05:00
Your Name
9f58f6890d
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-25 09:31:28 -05:00
Brian Wilson
fa00ea442e
add first pass at multi-chapter support.
2013-02-25 01:26:34 -05:00
Arthur Barrett
66ddfa295d
more refactoring and work on annotationinput (should be working now).
2013-02-22 16:33:28 -05:00
Julian Arni
e5294591dc
Foldit leaderboard w/o tests
2013-02-22 11:12:26 -05:00
Vik Paruchuri
d5865e70b8
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-22 10:21:34 -05:00
Diana Huang
f9667849b8
Fix some minor bugs in event handling and add enter key support
2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42
Add hot keys to rubrics
2013-02-22 09:47:50 -05:00
Alexander Kryklia
4713c5f095
re-enable discussion service
2013-02-22 10:40:09 +02:00
Brian Wilson
6d174ef029
remove dead code
2013-02-21 15:41:28 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Diana Huang
76c4007449
Merge pull request #1522 from MITx/diana/click-tracking
...
Add more click tracking and logging to the open ended grading interface
2013-02-21 11:10:35 -08:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Brian Talbot
6f2e6116f9
LMS - adding back in a Sass mixin that seems to still have dependencies
2013-02-21 09:16:06 -05:00
Brian Wilson
731f4abd8a
fix bug with nav to a page, and add pdfviewer.css.
2013-02-21 03:15:08 -05:00
Arthur Barrett
cc7f791078
parse xml for annotationinput
2013-02-20 19:19:17 -05:00
John Jarvis
342220f0f4
js syntax
2013-02-20 18:50:16 -05:00
Brian Wilson
50cae69945
define pdfviewer.js, and use from static_pdfbook.html
2013-02-20 18:37:17 -05:00
John Jarvis
4b93ef491b
errors for login and reg
2013-02-20 18:23:41 -05:00
Vik Paruchuri
9bc8dbd7ca
Fix location strings, re-order checkboxes
2013-02-20 18:04:25 -05:00
Diana Huang
3fe6a74e76
Merge pull request #1528 from MITx/press/international-press-release
...
add press release: edX expands internationally
2013-02-20 14:55:58 -08:00
