Brian Talbot
eb1658730a
studio - alerts: revised border styling on all elements and button/color inheritance
2013-03-04 12:30:04 -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
Peter Baratta
66657db0be
Added support for superscripts in variables and fixed bug with normal subscripted variables raised to powers
2013-03-04 09:49:41 -07: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
Calen Pennington
908bfa3c09
Remove the old poll module test case
2013-03-04 09:02:59 -05:00
Calen Pennington
ee6c3d6b7e
Make advertised_start work when it's not parseable as a date
2013-03-04 09:02:51 -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
Brian Talbot
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
2013-03-03 20:44:48 -05: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
Brian Talbot
bc0b1b0958
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
2013-03-02 22:06:55 -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
Vik Paruchuri
7ee58fb21c
Add in a todo
2013-03-01 17:09:28 -05:00
Will Daly
548f9b85a8
Changed response_msg argument default to ''
2013-03-01 17:07:23 -05:00
Arthur Barrett
20174fd24a
Removing failing jasmine tests for now.
2013-03-01 17:06:12 -05:00
Vik Paruchuri
55e19f8227
Fix the way that peer grading tab is initialized to make it work with studio
2013-03-01 17:02:38 -05:00
Your Name
e1ef6a8323
clean up commments
2013-03-01 16:43:55 -05:00
Vik Paruchuri
4400f94196
Fix some xml issues in yaml
2013-03-01 16:41:18 -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
Vik Paruchuri
f8b0338dee
Change name of annotatable, add in sass for advanced module
2013-03-01 16:26:48 -05:00
Vik Paruchuri
a2c03fec15
Make parsing more robust
2013-03-01 16:19:16 -05: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
Brian Talbot
2ce4ecbc84
local merge with master - finished
2013-03-01 15:48:15 -05:00
Brian Talbot
8552b2d614
local merge with master - WIP
2013-03-01 15:47: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
Brian Talbot
ad70581b80
studio - alerts: more progress including prompts
2013-03-01 15:43:07 -05:00
Vik Paruchuri
7a8e43a9c5
Json parsing fixes
2013-03-01 15:40:46 -05:00
