Your Name
7f877344d6
added comment to explain sorting
2013-03-13 19:47:19 -04:00
Your Name
896ee094c6
added comment to explain sorting
2013-03-13 19:44:41 -04:00
Your Name
117be695cb
candidate without inline
2013-03-13 18:40:10 -04:00
Your Name
08bc073fa5
updates
2013-03-13 16:40:04 -04:00
Your Name
a2f9e4d565
almost there
2013-03-13 15:29:57 -04:00
Your Name
7450128064
update coffeescript
2013-03-13 12:52:07 -04:00
jmclaus
db282d891c
Problem 5 grades correctly. Also added missing images
2013-03-13 16:27:56 +01:00
Your Name
8280c55992
pinning .1
2013-03-12 17:40:26 -04:00
David Ormsbee
5f125e6807
Merge branch 'master' into jmpm-analytics
2013-03-10 01:09:03 -05:00
Brian Talbot
786ffd1092
studio - further small cleanup on Sass
2013-03-08 12:44:24 -05:00
Brian Talbot
3b2c970248
studio - reorganized and documented used Sass for studio
2013-03-08 11:47:11 -05:00
Peter Baratta
49f85211fa
More documentation for the javascript
2013-03-08 03:39:34 -07:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Brian Talbot
afa704c253
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-07 11:38:07 -05:00
Victor Shnayder
57700a56d4
remove links to missing image files. We can add them if needed later.
2013-03-06 19:11:36 -05:00
jkarni
3bb108b12e
Merge pull request #1608 from MITx/feature/jkarni/genex
...
Feature/jkarni/genex
2013-03-06 14:35:01 -08:00
David Ormsbee
d0bff1ed3c
Merge branch 'master' into jmpm-analytics
...
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
2013-03-06 17:09:09 -05:00
Victor Shnayder
12b6b7d403
Merge pull request #1609 from MITx/diana/refactor-chemical-equation
...
Refactor Chemical Equation Preview
2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
...
Feature/abarrett/annotatable xmodule DO NOT MERGE
2013-03-06 12:05:27 -08:00
Diana Huang
42e711e7d2
Update tests and documentation.
2013-03-06 14:53:13 -05:00
Diana Huang
1aa3580dcb
Switch over to using the inputtype ajax handler for chemical input.
2013-03-06 14:41:48 -05:00
Julian Arni
d05e82e35c
Merge branch 'master' into feature/jkarni/genex
2013-03-06 13:25:30 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
Peter Baratta
c6545eb092
Begin to document symmath as we go
2013-03-06 06:21:08 -07:00
Vasyl Nakvasiuk
0d83fefecf
merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged
2013-03-05 18:20:38 +02:00
Brian Talbot
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -05:00
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
jmclaus
cb14893daa
Genex updates hidden input field on any modification of dna sequence
2013-03-03 21:41:52 +01:00
jmclaus
72b7193c03
Genex is gradable
2013-03-03 10:43:16 +01:00
Brian Talbot
47aacc70b7
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-02 22:11:16 -05:00
Victor Shnayder
310ecead36
Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3
...
Feature/kevin/cohorts take 3
2013-03-01 16:13:30 -08:00
Your Name
b7a6eadca4
new cohorts tested
2013-03-01 16:33:27 -05:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
Brian Talbot
8552b2d614
local merge with master - WIP
2013-03-01 15:47:23 -05:00
Julian Arni
3203360e9e
Removed console.logs
2013-03-01 14:57:38 -05:00
Julian Arni
b39bbec23e
Fixed many more broken references in css
2013-03-01 14:43:28 -05:00
Julian Arni
6ccd496add
Fixing broken split-button-arrow-focus link
2013-03-01 14:22:41 -05:00
Julian Arni
09ff623561
Updated version of JSME.
2013-03-01 13:38:35 -05:00
Arthur Barrett
1da644fcb3
merge from master. resolved conflict with test_responsetypes.py by using the version from master.
2013-02-28 11:22:32 -05:00
Arthur Barrett
44a68e6903
added partially correct icon from marco
2013-02-27 14:36:14 -05:00
Carlos Andrés Rocha
2ca303c95d
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
...
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Arthur Barrett
afa7fca15a
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-27 11:58:38 -05:00
Arthur Barrett
e3f12607cd
add grading for annotationinput
2013-02-27 01:44:07 -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 Talbot
cc02b4714c
Merge branch 'master' into feature/btalbot/studio-alerts
2013-02-26 14:22:50 -05:00
Brian Wilson
fc9ab346e1
fix loading of specific pages.
2013-02-26 01:03:01 -05:00
Brian Wilson
dde2cd0bd0
get chapter links to start working
2013-02-25 16:52:32 -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
