cbdf9ea25b
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
Brian Talbot
2013-03-05 09:57:14 -05:00
2fd9ccece1
Fixed whitespace issues; removed a test that made no assertions
Will Daly
2013-03-05 09:34:52 -05:00
437aadb28e
Cleaned up some tests; deleted skip tests
Will Daly
2013-03-05 09:32:20 -05:00
faf5c3f0a2
Updated Deena's tests after merge with master to ensure that none of the tests fail. Deleted some tests.
Will Daly
2013-03-05 09:10:02 -05:00
d891361b4a
Merge branch 'master' into bug/christina/misc
cahrens
2013-03-05 09:09:08 -05:00
ff26913795
Added a limitation to the DnD docs.
Valera Rozuvan
2013-03-05 14:40:02 +02:00
cb4a7c663c
A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors.
Vik Paruchuri
2013-03-04 18:54:52 -05:00
a58e7c7a26
Merge pull request #1596 from MITx/jth/admindash
Victor Shnayder
2013-03-04 15:39:09 -08:00
94db91fcef
Cast cursor responses as lists. MySQL returns them as tuples.
John Hess
2013-03-04 18:19:24 -05:00
b5786874ab
Wiring through some changes
Vik Paruchuri
2013-03-04 18:04:13 -05:00
77ed921624
Prelim wiring on peer grading and combined open ended xmodules
Vik Paruchuri
2013-03-04 17:48:43 -05:00
7a0aead0d9
annotation now hides automatically on mouseleave events. click to hide/show or re-position the annotation.
Arthur Barrett
2013-03-04 17:21:32 -05:00
2436d59e14
Merge branch 'master' into feature/deena/testing
Will Daly
2013-03-04 16:30:41 -05:00
22420adc9a
Merge pull request #1594 from MITx/bug/dhm/course_update_js
Jay Zoldak
2013-03-04 13:29:10 -08:00
9743f6bea9
Fixed indentation in capa module. Added test of HTML output for successful check to capa module unit tests
Will Daly
2013-03-04 16:16:38 -05:00
0c4a52567e
Provide convenience converter of the grading policy but don't save it on the object.
Don Mitchell
2013-03-04 16:13:29 -05:00
ecb136e582
Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util
Don Mitchell
2013-03-04 13:11:46 -08:00
d148906851
Added unit tests for capa module check_problem() method
Will Daly
2013-03-04 16:06:14 -05:00
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
Christina Roberts
2013-03-04 12:42:42 -08:00
020e1e94fb
Move side effecting of definition for grader to the course_module and don't make caller responsible.
Don Mitchell
2013-03-04 15:38:47 -05:00
df5ad6ba42
Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug
Victor Shnayder
2013-03-04 12:28:12 -08:00
42a944bb86
Merge pull request #1593 from MITx/hack/dave/submission_history
David Ormsbee
2013-03-04 12:20:41 -08:00
01a1bf6b6f
It's not UTC time, it's whatever the local settings are set to (New York in prod)
David Ormsbee
2013-03-04 15:19:24 -05:00
a81e9a673c
additional courseware view optimizations. Do a 'depth' fetch on the selected section so that it does a more efficient set of queries to the database. Also, in the CachingDescriptorSystem, if we have a 'cache miss', when we do the actual fetch (which creates a new 'system'), keep that fetched data around in our own collection, in case it is queried again
Chris Dodge
2013-03-04 14:59:45 -05:00
9d2a2cbc2f
Merge pull request #1555 from MITx/feature/jkarni/foldit-api
David Ormsbee
2013-03-04 11:40:43 -08:00
b0afbba58d
Merge pull request #1516 from MITx/hack/dave/submission_history
David Ormsbee
2013-03-04 11:39:54 -08:00
b0abfa07c8
style the guided discussion text so it is boxed like the instructions text.
Arthur Barrett
2013-03-04 14:23:41 -05:00
2e6115c734
constrain the annotation call-out horizontally so it is always visible in the window
Arthur Barrett
2013-03-04 14:19:28 -05:00
c0bb4ee22a
Merge pull request #1588 from MITx/bugfix/dave/username_space_msg
Victor Shnayder
2013-03-04 10:25:34 -08:00
88a30cb733
Fixes in response to Victor's comments.
David Ormsbee
2013-03-04 13:21:19 -05:00
f33c00243f
Merge pull request #1591 from MITx/fix/cdodge/optimize-instructor-dashboard
David Ormsbee
2013-03-04 09:55:00 -08:00
de3a75d29d
Don't prepopulate models which may have script tags in their payloads but fetch async via json get.
Don Mitchell
2013-03-04 12:54:58 -05:00
e4f1dab409
Merge pull request #1590 from MITx/fix/cdodge/optimize-progress-summary-page
David Ormsbee
2013-03-04 09:54:49 -08:00
b482e2ac21
add performance optimizations (efficiently get all course content)
Chris Dodge
2013-03-04 12:51:21 -05:00
dd82ea5738
Merge branch 'master' into feature/btalbot/studio-alerts
Brian Talbot
2013-03-04 12:47:23 -05:00
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
Brian Talbot
2013-03-04 12:47:07 -05:00
1cc8950780
Added comments for make_dict_of_responses() in capa module
Will Daly
2013-03-04 12:45:13 -05:00
082216395c
Added unit test for conversion of GET parameters for capa module. Added error checking for possible error cases
Will Daly
2013-03-04 12:38:11 -05:00
eb1658730a
studio - alerts: revised border styling on all elements and button/color inheritance
Brian Talbot
2013-03-04 12:30:04 -05:00
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.
Don Mitchell
2013-03-04 12:15:28 -05:00
4892897c0d
add depth parameters when loading course and student-state caches. This will make fewer (but fatter) queries to the database
Chris Dodge
2013-03-04 12:03:25 -05:00
66657db0be
Added support for superscripts in variables and fixed bug with normal subscripted variables raised to powers
Peter Baratta
2013-03-04 09:49:41 -07:00
a00f11c1ff
Tell user that spaces aren't allowed in usernames (requested by Teppo).
David Ormsbee
2013-03-04 11:17:29 -05:00
9b1ae9f99c
Merge pull request #1583 from MITx/fix/ned/clean-ups
Carlos Andrés Rocha
2013-03-04 08:11:29 -08:00
3a748b1e79
Merge pull request #1587 from MITx/feature/kevin/cohorts_take_3
David Ormsbee
2013-03-04 07:59:30 -08:00
a9804a3349
proper tab
Your Name
2013-03-04 10:57:37 -05:00
7c8a90229e
Use 'is None' and 'is not None'
Ned Batchelder
2013-03-01 17:34:05 -05:00
97f1e04282
Fix some 2-space indents
Ned Batchelder
2013-03-01 17:31:26 -05:00
f21ff7bbfa
update comment
Chris Dodge
2013-03-04 09:15:53 -05:00
908bfa3c09
Remove the old poll module test case
Calen Pennington
2013-03-04 09:02:59 -05:00
ee6c3d6b7e
Make advertised_start work when it's not parseable as a date
Calen Pennington
2013-03-04 09:02:51 -05:00
f057ec5a04
add new file to commit
Chris Dodge
2013-03-04 08:29:56 -05:00
2d44f51cbc
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/make-update-templates-django-admin-util
Chris Dodge
2013-03-04 08:08:51 -05:00
6bacbafb6f
move call to update_templates on service startup into a django-admin command
Chris Dodge
2013-03-04 08:06:58 -05:00
72c58cd454
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
Brian Talbot
2013-03-03 20:44:48 -05:00
cb14893daa
Genex updates hidden input field on any modification of dna sequence
jmclaus
2013-03-03 21:41:52 +01:00
72b7193c03
Genex is gradable
jmclaus
2013-03-03 10:43:16 +01:00
47aacc70b7
Merge branch 'master' into feature/btalbot/studio-alerts
Brian Talbot
2013-03-02 22:11:16 -05:00
bc0b1b0958
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
Brian Talbot
2013-03-02 22:06:55 -05:00
949c95ea00
better fix
Kevin Chugh
2013-03-02 19:51:59 -05:00
32e0c580f0
fix
Your Name
2013-03-02 19:50:14 -05:00
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).
Chris Dodge
2013-03-02 19:36:11 -05:00
310ecead36
Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3
Victor Shnayder
2013-03-01 16:13:30 -08:00
7ee58fb21c
Add in a todo
Vik Paruchuri
2013-03-01 17:09:28 -05:00
548f9b85a8
Changed response_msg argument default to ''
Will Daly
2013-03-01 17:07:23 -05:00
20174fd24a
Removing failing jasmine tests for now.
Arthur Barrett
2013-03-01 17:06:12 -05:00
55e19f8227
Fix the way that peer grading tab is initialized to make it work with studio
Vik Paruchuri
2013-03-01 17:02:38 -05:00
e1ef6a8323
clean up commments
Your Name
2013-03-01 16:43:55 -05:00
4400f94196
Fix some xml issues in yaml
Vik Paruchuri
2013-03-01 16:41:18 -05:00
28a502ea97
Fixed a bug in CorrectMaps.get_npoints(), which would return 1 when npoints=0.
Will Daly
2013-03-01 16:40:54 -05:00
b7a6eadca4
new cohorts tested
Your Name
2013-03-01 16:33:27 -05:00
f8b0338dee
Change name of annotatable, add in sass for advanced module
Vik Paruchuri
2013-03-01 16:26:48 -05:00
a2c03fec15
Make parsing more robust
Vik Paruchuri
2013-03-01 16:19:16 -05:00
afc2d66d07
Merge pull request #1578 from MITx/bug/christina/misc
Don Mitchell
2013-03-01 13:16:45 -08:00
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.
Don Mitchell
2013-03-01 16:05:58 -05:00
bba96ee1d7
Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base
David Ormsbee
2013-03-01 12:59:02 -08:00
20540fbc2d
update usage feedback
Chris Dodge
2013-03-01 15:52:27 -05:00
88bfdd01ce
Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice
Victor Shnayder
2013-03-01 12:52:26 -08:00
0047295695
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete
Chris Dodge
2013-03-01 15:48:23 -05:00
2ce4ecbc84
local merge with master - finished
Brian Talbot
2013-03-01 15:48:15 -05:00
8552b2d614
local merge with master - WIP
Brian Talbot
2013-03-01 15:47:23 -05:00
Brian Talbot