Don Mitchell
ecb136e582
Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util
...
move call to update_templates on service startup into a django-admin com...
2013-03-04 13:11:46 -08: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
Don Mitchell
020e1e94fb
Move side effecting of definition for grader to the course_module and
...
don't make caller responsible.
2013-03-04 15:38:47 -05:00
Victor Shnayder
df5ad6ba42
Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug
...
Fix/will/cs191 matrix style bug
2013-03-04 12:28:12 -08:00
David Ormsbee
42a944bb86
Merge pull request #1593 from MITx/hack/dave/submission_history
...
It's not UTC time, it's whatever the local settings are set to
2013-03-04 12:20:41 -08:00
David Ormsbee
01a1bf6b6f
It's not UTC time, it's whatever the local settings are set to (New York in prod)
2013-03-04 15:19:24 -05:00
David Ormsbee
9d2a2cbc2f
Merge pull request #1555 from MITx/feature/jkarni/foldit-api
...
Feature/jkarni/foldit api
2013-03-04 11:40:43 -08:00
David Ormsbee
b0afbba58d
Merge pull request #1516 from MITx/hack/dave/submission_history
...
Record and report submission history for a problem
2013-03-04 11:39:54 -08:00
Victor Shnayder
c0bb4ee22a
Merge pull request #1588 from MITx/bugfix/dave/username_space_msg
...
Tell user that spaces aren't allowed in usernames (requested by Teppo).
2013-03-04 10:25:34 -08:00
David Ormsbee
88a30cb733
Fixes in response to Victor's comments.
2013-03-04 13:21:19 -05:00
David Ormsbee
f33c00243f
Merge pull request #1591 from MITx/fix/cdodge/optimize-instructor-dashboard
...
add performance optimizations (efficiently get all course content) to instructor dashboard
2013-03-04 09:55:00 -08:00
Don Mitchell
de3a75d29d
Don't prepopulate models which may have script tags in their payloads
...
but fetch async via json get.
2013-03-04 12:54:58 -05:00
David Ormsbee
e4f1dab409
Merge pull request #1590 from MITx/fix/cdodge/optimize-progress-summary-page
...
add depth parameters when loading course and student-state caches. This ...
2013-03-04 09:54:49 -08:00
Chris Dodge
b482e2ac21
add performance optimizations (efficiently get all course content)
2013-03-04 12:51:21 -05:00
Don Mitchell
4245816e9e
Separate bug on virgin grading policy edits not being persisted b/c the
...
definition not being updated when using defaults. Not sure why this
passed before.
2013-03-04 12:15:28 -05:00
Chris Dodge
4892897c0d
add depth parameters when loading course and student-state caches. This will make fewer (but fatter) queries to the database
2013-03-04 12:03:25 -05:00
David Ormsbee
a00f11c1ff
Tell user that spaces aren't allowed in usernames (requested by Teppo).
2013-03-04 11:17:29 -05:00
Carlos Andrés Rocha
9b1ae9f99c
Merge pull request #1583 from MITx/fix/ned/clean-ups
...
Fix/ned/clean ups
2013-03-04 08:11:29 -08:00
David Ormsbee
3a748b1e79
Merge pull request #1587 from MITx/feature/kevin/cohorts_take_3
...
Feature/kevin/cohorts take 3
2013-03-04 07:59:30 -08:00
Your Name
a9804a3349
proper tab
2013-03-04 10:57:37 -05:00
Ned Batchelder
7c8a90229e
Use 'is None' and 'is not None'
2013-03-04 10:57:25 -05:00
Ned Batchelder
97f1e04282
Fix some 2-space indents
2013-03-04 10:57:25 -05:00
Chris Dodge
f21ff7bbfa
update comment
2013-03-04 09:15:53 -05:00
Chris Dodge
f057ec5a04
add new file to commit
2013-03-04 08:29:56 -05:00
Chris Dodge
2d44f51cbc
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/make-update-templates-django-admin-util
2013-03-04 08:08:51 -05:00
Chris Dodge
6bacbafb6f
move call to update_templates on service startup into a django-admin command
2013-03-04 08:06:58 -05:00
chrisndodge
999ed17e6d
Merge pull request #1585 from MITx/fix/cdodge/fix-broken-test
...
need to pass commit parameter
2013-03-02 18:27:12 -08:00
Chris Dodge
3f9bc86c9e
need to pass commit parameter
2013-03-02 21:26:24 -05:00
chrisndodge
f543ad4932
Merge pull request #1584 from MITx/fix/cdodge/fix-sporadic-test-error-in-metadata-inheritance
...
do the metadata comparison on the parent not the course as we don't actu...
2013-03-02 18:02:34 -08:00
Kevin Chugh
949c95ea00
better fix
2013-03-02 19:51:59 -05:00
Your Name
32e0c580f0
fix
2013-03-02 19:50:14 -05:00
Chris Dodge
bcea53d4b7
do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary).
2013-03-02 19:36:11 -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
Will Daly
548f9b85a8
Changed response_msg argument default to ''
2013-03-01 17:07:23 -05:00
Your Name
e1ef6a8323
clean up commments
2013-03-01 16:43:55 -05:00
Will Daly
28a502ea97
Fixed a bug in CorrectMaps.get_npoints(), which would return 1
...
when npoints=0.
2013-03-01 16:40:54 -05:00
Your Name
b7a6eadca4
new cohorts tested
2013-03-01 16:33:27 -05:00
chrisndodge
c236b2c8a9
Merge pull request #1550 from MITx/feature/cdodge/add-test-delete
...
add another command line argument to allow users to only simulate a dele...
2013-03-01 13:29:06 -08:00
Don Mitchell
afc2d66d07
Merge pull request #1578 from MITx/bug/christina/misc
...
Don't usurp ValidatingView's error handling.
2013-03-01 13:16:45 -08: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
David Ormsbee
bba96ee1d7
Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base
...
reapply Ike's pull-request in a new branch. The PR branch got mangled on...
2013-03-01 12:59:02 -08:00
Chris Dodge
20540fbc2d
update usage feedback
2013-03-01 15:52:27 -05:00
Victor Shnayder
88bfdd01ce
Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice
...
Feature/will/move correct mark for multiple choice
2013-03-01 12:52:26 -08:00
Chris Dodge
0047295695
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete
2013-03-01 15:48:23 -05:00
chrisndodge
7fa77769c8
Merge pull request #1543 from MITx/feature/ichuang/turn-on-tracking-in-cms
...
turn on tracking in CMS / Studio
2013-03-01 12:47:01 -08:00
Chris Dodge
724c6c9eaa
reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident.
2013-03-01 15:25:36 -05:00
cahrens
d7c28bfa11
Don't usurp ValidatingView's error handling.
...
#219
2013-03-01 15:24:56 -05:00
Don Mitchell
5fa1da5324
Merge pull request #1577 from MITx/bug/christina/misc
...
Bug fix for #215 (quotes not rendering in text fields).
2013-03-01 12:09:20 -08:00
Will Daly
d6df7e2d96
Added comments to clean_message_html
2013-03-01 15:04:01 -05:00
jkarni
a204bff298
Merge pull request #1576 from MITx/feature/jkarni/newjsme
...
Updated version of JSME.
2013-03-01 11:58:19 -08:00
