Vik Paruchuri
|
ca2eb9cd1b
|
Add in tests for combinedopenended scoring
|
2013-04-10 17:33:43 -04:00 |
|
Vik Paruchuri
|
820a2b407a
|
Add in js image upload preview
|
2013-04-10 17:06:02 -04:00 |
|
Vik Paruchuri
|
9f04769c00
|
Better confirmation for flagging
|
2013-04-10 16:16:13 -04:00 |
|
Vik Paruchuri
|
a64d57ae1d
|
Add popup when flag box is checked
|
2013-04-10 16:01:56 -04:00 |
|
Vik Paruchuri
|
2a5631da86
|
Code cleanup
|
2013-04-10 15:26:45 -04:00 |
|
Vik Paruchuri
|
cef4d0cb09
|
Display instructor feedback
|
2013-04-10 15:25:05 -04:00 |
|
Vik Paruchuri
|
799c8282bc
|
Fix hotkeys for combined open ended
|
2013-04-10 15:15:22 -04:00 |
|
Vik Paruchuri
|
d0ecbbb4cf
|
Fix hotkeys in peer and staff grading to use ctrl prefix
|
2013-04-10 15:10:48 -04:00 |
|
Vik Paruchuri
|
463a88ccfb
|
Display rubric to students after calibration
|
2013-04-09 16:54:27 -04:00 |
|
Vik Paruchuri
|
7d38147490
|
Remove attempts field from peer grading template
|
2013-04-09 15:34:35 -04:00 |
|
Vik Paruchuri
|
418f218eec
|
Fix some templates, minor code reformats
|
2013-04-09 15:33:11 -04:00 |
|
Vik Paruchuri
|
247ccc37a6
|
Code reformat, patch score gen
|
2013-04-09 14:47:26 -04:00 |
|
Vik Paruchuri
|
112fb4539b
|
Correctly calculate score for combinedopenended and peer assessment
|
2013-04-09 14:43:41 -04:00 |
|
Vik Paruchuri
|
45a3dd4ee0
|
Fix file uploads to work after error
|
2013-04-09 14:13:29 -04:00 |
|
Vik Paruchuri
|
448c8121c3
|
Patch combinedopenended to work if self assessment is not first
|
2013-04-09 13:37:37 -04:00 |
|
Sarina
|
74104d6081
|
Merge pull request #1831 from MITx/vik/fix/pg-and-progress
Fix weighting and score generation
|
2013-04-08 14:37:07 -07:00 |
|
Christina Roberts
|
7fd8a33b3c
|
Merge pull request #1816 from MITx/feature/btalbot/studio-alerts
Feature/btalbot/studio-alerts
|
2013-04-08 14:19:12 -07:00 |
|
Vik Paruchuri
|
7d09617ec9
|
Fix weighting and score generation
|
2013-04-08 16:52:18 -04:00 |
|
Brian Talbot
|
3f2e21f9dc
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 16:29:18 -04:00 |
|
Chris Dodge
|
54afc5eb63
|
seems like we need to purge 'filename' from both _model_data as well as xml_attributes
|
2013-04-08 16:09:41 -04:00 |
|
Chris Dodge
|
a0f5a51135
|
wip to fix broken test
|
2013-04-08 15:34:12 -04:00 |
|
Chris Dodge
|
0b26cc2635
|
fix line breaks per Cale
|
2013-04-08 14:48:16 -04:00 |
|
Chris Dodge
|
069f997595
|
import was putting the xml data into definition.data.data rather than definition.data
|
2013-04-08 14:33:46 -04:00 |
|
chrisndodge
|
9a405ff44c
|
Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through
extend the list of container module names to our comuputation of inherit...
|
2013-04-08 11:11:14 -07:00 |
|
Don Mitchell
|
c14d046d2f
|
Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage
add a simple Studio walkthough to check page loads
|
2013-04-08 10:58:47 -07:00 |
|
Chris Dodge
|
5137119f2b
|
add a simple Studio walkthough to check page loads
|
2013-04-08 13:55:38 -04:00 |
|
Chris Dodge
|
7cd4310c32
|
extend the list of container module names to our comuputation of inherited metadata
|
2013-04-08 12:12:23 -04:00 |
|
Brian Talbot
|
c8cceb7140
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 11:40:53 -04:00 |
|
chrisndodge
|
a57e0fa2c5
|
Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl
make "edit" links work - fixes giturl (was broken by xblocks migration)
|
2013-04-08 08:17:31 -07:00 |
|
cahrens
|
7f1c89b492
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 10:28:52 -04:00 |
|
Don Mitchell
|
c6bec6bcad
|
Merge pull request #1812 from MITx/feature/christina/gmt
Display UTC on the end of dates (that are in UTC).
|
2013-04-08 07:00:08 -07:00 |
|
cahrens
|
c4befa136f
|
pep8
|
2013-04-08 09:15:07 -04:00 |
|
cahrens
|
f0d2ff7ba4
|
Change display_timezone to show_timezone.
|
2013-04-08 09:11:10 -04:00 |
|
Chris Dodge
|
93e27c5f0c
|
remove unsed import
|
2013-04-08 09:09:51 -04:00 |
|
Chris Dodge
|
9e2409743f
|
remove unsed import
|
2013-04-08 09:09:35 -04:00 |
|
Chris Dodge
|
052fc5ad11
|
revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work
|
2013-04-08 09:08:51 -04:00 |
|
cahrens
|
2631452b9c
|
Add display_timezone so course authors can choose not to display timezones in LMS.
|
2013-04-08 08:46:07 -04:00 |
|
cahrens
|
e4dac6e310
|
Add display_timezone so course authors can choose not to display timezones in LMS.
|
2013-04-08 08:38:52 -04:00 |
|
Chris Dodge
|
288620592a
|
get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish
|
2013-04-07 19:33:04 -04:00 |
|
ichuang
|
f88b5794e4
|
fix default giturl link
|
2013-04-07 00:51:07 +00:00 |
|
ichuang
|
d2768c644e
|
not all modules have xml_attributes ; be careful about this in xmodule_modifier
|
2013-04-07 00:20:46 +00:00 |
|
ichuang
|
8cafadc03b
|
make "edit" links work - fixes giturl (was broken by xblocks migration)
Conflicts:
lms/templates/staff_problem_info.html
lms/xmodule_namespace.py
|
2013-04-07 00:03:36 +00:00 |
|
Brian Talbot
|
1a68d516fb
|
resolving local merge with master
|
2013-04-05 15:27:08 -04:00 |
|
Brian Talbot
|
512e4fe3bd
|
resolving local merge with master and sprucing style and templates for merge with master
|
2013-04-05 15:13:21 -04:00 |
|
Sarina
|
aca6cdbade
|
Merge pull request #1813 from MITx/fix/vik/pg-progress
Fix pg progress
|
2013-04-05 09:51:13 -07:00 |
|
vik
|
6aada791d8
|
Fix pg progress
|
2013-04-05 11:58:16 -04:00 |
|
chrisndodge
|
f467d93f97
|
Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course
Feature/cdodge/integrity check mongo course
|
2013-04-05 06:52:42 -07:00 |
|
Chris Dodge
|
8e36197cc2
|
tweeks per Cale's feedback
|
2013-04-05 09:30:49 -04:00 |
|
Brian Talbot
|
ceb4c719f7
|
changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes
|
2013-04-04 17:38:14 -04:00 |
|
cahrens
|
49e0753ef5
|
Show GMT time, 24-hour.
|
2013-04-04 16:56:10 -04:00 |
|