Don Mitchell
|
05ec0c11c6
|
Oops, when i alphabetized i got the value incorrectly.
Fixed cancel to not retain new entries.
|
2013-02-06 09:08:28 -05:00 |
|
Don Mitchell
|
592d7e532b
|
Keys are sorted now
|
2013-02-06 08:58:20 -05:00 |
|
Don Mitchell
|
5275db9ab9
|
Cancel kind of works (reverts but leaves in new fields :-( )
Filter out system metadata fields
|
2013-02-05 19:17:43 -05:00 |
|
Don Mitchell
|
74d37327b2
|
Also this
|
2013-02-05 17:21:49 -05:00 |
|
Don Mitchell
|
8f16d639b7
|
CRUD on policy fields w/ some validation
|
2013-02-05 17:21:02 -05:00 |
|
Don Mitchell
|
07f87d4729
|
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
|
2013-02-04 15:34:19 -05:00 |
|
Don Mitchell
|
f48af8b80c
|
Server side controller and model stubbed in. Now to wire to view.
|
2013-02-04 15:34:05 -05:00 |
|
cahrens
|
d1e819cb69
|
merged
|
2013-02-04 14:12:52 -05:00 |
|
cahrens
|
ca2a375c17
|
saving work
|
2013-02-04 12:50:16 -05:00 |
|
cahrens
|
8f3e8024b9
|
Merge branch 'master' into feature/cas/manual-policy
|
2013-02-04 10:54:22 -05:00 |
|
Christina Roberts
|
a6e0fb91ef
|
Merge pull request #1406 from MITx/bug/bug152
Move dnd code from base.js to a js file only loaded by overview.html
|
2013-02-04 06:19:17 -08:00 |
|
VikParuchuri
|
01fab2ec68
|
Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes
Feature/vik/combined xmodule changes
|
2013-02-01 15:46:33 -08:00 |
|
Vik Paruchuri
|
9310dcbe0d
|
Remove reload test
|
2013-02-01 18:31:50 -05:00 |
|
Don Mitchell
|
1595bd9b0e
|
Move dnd code from base.js to a js file only loaded by overview.html
|
2013-02-01 17:20:58 -05:00 |
|
Vik Paruchuri
|
b609bbeeed
|
Fix JS tests
|
2013-02-01 15:36:05 -05:00 |
|
John Jarvis
|
1c09d9cacb
|
For prod environments only log info and up
|
2013-02-01 13:34:29 -05:00 |
|
John Jarvis
|
f525b17b1a
|
pep8 cleanup
|
2013-02-01 13:13:16 -05:00 |
|
John Jarvis
|
8b01298969
|
Removing duplicate loggers
|
2013-02-01 13:11:14 -05:00 |
|
John Jarvis
|
4a08bc7759
|
Adding service_variant and a little pep8 cleanup
|
2013-02-01 13:10:26 -05:00 |
|
Ned Batchelder
|
6b6d8a94d0
|
Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems.
|
2013-02-01 10:50:01 -05:00 |
|
Christina Roberts
|
14ca42a5dc
|
Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists
temporary style sync up for course info lists
|
2013-02-01 06:51:35 -08:00 |
|
Calen Pennington
|
dce65f2ab7
|
Merge pull request #1404 from MITx/feature/edz/service-variant
service variant code for loading different config
|
2013-02-01 06:49:51 -08:00 |
|
Brian Talbot
|
61de4c028a
|
temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)
|
2013-02-01 09:41:51 -05:00 |
|
Vik Paruchuri
|
c4b9288c6d
|
Add comment describing why commented out code is there
|
2013-02-01 09:32:29 -05:00 |
|
Vik Paruchuri
|
78dda49764
|
Fix jasmine tests?
|
2013-02-01 09:28:52 -05:00 |
|
e0d
|
969737c58e
|
service variant code for loading different config
|
2013-01-31 21:43:35 -05:00 |
|
David Ormsbee
|
a89503431f
|
Merge pull request #1403 from MITx/style/btalbot/lms-calendartables
lms - syllabus/calendar table styling fixes
|
2013-01-31 15:17:38 -08:00 |
|
Brian Talbot
|
f6cd4c75b8
|
lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling
|
2013-01-31 18:15:20 -05:00 |
|
Vik Paruchuri
|
c5e80b9543
|
Fix open ended module tests
|
2013-01-31 17:34:33 -05:00 |
|
Vik Paruchuri
|
d6f8def733
|
Move over rubric parsing logic to rubric module
|
2013-01-31 17:18:32 -05:00 |
|
Vik Paruchuri
|
b22bad7fa1
|
Add in some removed imports (fix tests)
|
2013-01-31 17:11:44 -05:00 |
|
Vik Paruchuri
|
5eff483c76
|
Fix max score in combined xmodule tests
|
2013-01-31 17:08:13 -05:00 |
|
Vik Paruchuri
|
524047a11e
|
Fix key error in open ended child
|
2013-01-31 17:06:37 -05:00 |
|
Vik Paruchuri
|
01cdc6e7f8
|
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
|
2013-01-31 16:50:10 -05:00 |
|
cahrens
|
d52be03446
|
Add ACE Editor (contents of src-min-noconflict).
last commit: 75ba742f4f00cefadfef1ae451cfb2a4280ad367
package 01.27.2013
|
2013-01-31 14:52:06 -05:00 |
|
cahrens
|
c956555da4
|
Note the codemirror version.
|
2013-01-31 14:50:21 -05:00 |
|
Don Mitchell
|
aad5015a82
|
Merge pull request #1398 from MITx/feature/christina/misc2
Fixes date bug (#149).
|
2013-01-31 10:59:07 -08:00 |
|
Don Mitchell
|
fbd9a126ba
|
Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs
add exporting of course info
|
2013-01-31 10:55:45 -08:00 |
|
Christina Roberts
|
5f170d118f
|
Merge pull request #1395 from MITx/bug/dhm/mar13
Remove format field as it's the one for grading type.
|
2013-01-31 10:51:44 -08:00 |
|
Jay Zoldak
|
c590c24e25
|
Add vendor files to files.json for the cms jasmine tests to work.
|
2013-01-31 13:48:38 -05:00 |
|
cahrens
|
b613bdc336
|
Fixes date bug (#149).
|
2013-01-31 13:37:45 -05:00 |
|
Don Mitchell
|
f257f12124
|
Meant to add the file here
|
2013-01-31 12:56:18 -05:00 |
|
Don Mitchell
|
279747ab14
|
Fixed missing jasmine includes
|
2013-01-31 12:40:05 -05:00 |
|
Vik Paruchuri
|
a61746609c
|
Fix keyerror
|
2013-01-31 12:18:42 -05:00 |
|
Don Mitchell
|
6491363647
|
Remove format field as it's the one for grading type.
|
2013-01-31 12:11:11 -05:00 |
|
Brian Talbot
|
7d871ddfc9
|
studio - revised manual policy UI: added key tips on focus, moved error messages to bottom of pairings
|
2013-01-31 11:50:07 -05:00 |
|
Jay Zoldak
|
6fe209b0cf
|
Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests
New tests for OpenEndedGrading
|
2013-01-31 08:34:06 -08:00 |
|
Vik Paruchuri
|
ee06afcb27
|
Possibly fix self assessment tests
|
2013-01-31 11:06:12 -05:00 |
|
Chris Dodge
|
ab9d30cbc6
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs
|
2013-01-31 10:51:24 -05:00 |
|
Chris Dodge
|
fc57e7afdb
|
add testing for course info export. Plus DRY things out a bit
|
2013-01-31 10:51:20 -05:00 |
|