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
Vik Paruchuri
386ab10edb
Apparently meld is weird at indenting
2013-03-01 15:31:42 -05:00
Vik Paruchuri
a09a4febce
Fix category generation
2013-03-01 15:30:22 -05:00
Vik Paruchuri
fb37d46bd8
Minor bugfixes
2013-03-01 15:28:33 -05:00
Vik Paruchuri
d039776218
Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio
...
Conflicts:
cms/djangoapps/contentstore/views.py
2013-03-01 15:25:53 -05: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
Arthur Barrett
67b73242ea
added advanced component button with ability to specify components in course policy.
2013-03-01 15:11:42 -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
Julian Arni
3203360e9e
Removed console.logs
2013-03-01 14:57:38 -05:00
cahrens
29330cc922
Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc.
...
#213
2013-03-01 14:55:38 -05:00
Vik Paruchuri
9f020e228b
Add in some dummy values
2013-03-01 14:50:40 -05:00
Julian Arni
b39bbec23e
Fixed many more broken references in css
2013-03-01 14:43:28 -05:00
cahrens
d001f21bfe
Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow.
2013-03-01 14:39:49 -05:00
David Ormsbee
11f864f489
Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime
...
Limit remembered logins to 7 days, so that old cookies will eventually expire
2013-03-01 11:37:46 -08:00
Julian Arni
6ccd496add
Fixing broken split-button-arrow-focus link
2013-03-01 14:22:41 -05:00
Calen Pennington
f4032caeaf
Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/conditional_module.py
2013-03-01 14:13:58 -05:00
Vik Paruchuri
a818191297
Prelim support for combinedopenended and peergrading types
2013-03-01 14:12:04 -05:00
Arthur Barrett
530051037d
adding annotatable module template
2013-03-01 13:58:39 -05:00
Vik Paruchuri
c24ba23e54
Move self assessment templates
2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8
Switch around template locations
2013-03-01 13:43:01 -05:00
Arthur Barrett
82544f2ae1
start adding jasmine tests to module
2013-03-01 13:39:51 -05:00
Julian Arni
09ff623561
Updated version of JSME.
2013-03-01 13:38:35 -05:00
Arthur Barrett
6dba2394b2
enable studio authoring (raw) for xmodule
2013-03-01 13:32:56 -05:00
Vik Paruchuri
b3d0abbd05
Start to move around templates
2013-03-01 13:31:54 -05:00
