Vik Paruchuri
4047106e48
Some progress with rendering
2013-01-10 18:59:57 -05:00
Vik Paruchuri
867deae6e3
Bugfixes
2013-01-10 18:59:57 -05:00
Vik Paruchuri
0be51cfa2d
Xmodule combined now working
2013-01-10 18:59:57 -05:00
Vik Paruchuri
e0d12bcbfe
Add in some descriptions
2013-01-10 18:59:57 -05:00
Vik Paruchuri
5858ec5e0d
Begin making integrated module
2013-01-10 18:59:57 -05:00
Vik Paruchuri
60f9143fa5
Minor change
2013-01-10 18:59:57 -05:00
Brian Wilson
7d279efd0e
add functionality for exporting EAD files to Pearson (and add dump_all option to CDD-dumping).
2013-01-10 18:31:41 -05:00
Diana Huang
4257a0230a
Merge branch 'master' into feature/diana/rubric-input
2013-01-10 17:57:07 -05:00
Don Mitchell
495814c01a
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-10 17:00:13 -05:00
Don Mitchell
c289575b49
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-10 16:40:32 -05:00
Don Mitchell
fa2a243068
Explanation markup
2013-01-10 16:40:05 -05:00
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -05:00
Calen Pennington
a74dfdb2e7
Remove circular dependencies that connect student.models and django_comment_client
2013-01-10 15:19:38 -05:00
Brian Wilson
83fdab79ba
pearson_make_tc_user: add support for incremental changes, and changes to 'internal' fields for debugging.
2013-01-10 15:16:13 -05:00
Don Mitchell
c74605abf0
Merge pull request #1258 from MITx/fix/cdodge/export-create-recursive-folders
...
the parent directory might not already exist, so we have to call makedir...
2013-01-10 11:46:21 -08:00
Chris Dodge
dc8f23d6ae
the parent directory might not already exist, so we have to call makedir with recursive=true to auto-create any parent folders
2013-01-10 14:41:19 -05:00
cahrens
708736c42d
Unit tests around the save method (xml and markdown).
2013-01-10 14:27:50 -05:00
Calen Pennington
89a0b82e5c
Decrease the number of queries needed for LMS courseware
...
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
2013-01-10 13:55:46 -05:00
Don Mitchell
70e5344949
Merge pull request #1256 from MITx/fix/cdodge/import-ordering-error
...
make sure we commit the course module first when importing. There's a sn...
2013-01-10 10:40:30 -08:00
Chris Dodge
76059b52e7
make sure we commit the course module first when importing. There's a sneaky little ordering dependency where we can't save a static tabe until the course module has been saved. This is because - when saving a static tab - we have to scribble on the course module's metadata to point to it.
2013-01-10 13:24:40 -05:00
Christina Roberts
e5d73107bd
Merge pull request #1254 from MITx/bug/dhm/jan13
...
update timepicker to fix minutes bug
2013-01-10 09:25:38 -08:00
Don Mitchell
04582f4e7c
Update timepicker b/c it wasn't handling minutes from 01-09 and they'd
...
fixed it
2013-01-10 11:05:14 -05:00
chrisndodge
ee9b9d0422
Merge pull request #1249 from MITx/feature/cas/speed-editor
...
Feature/cas/speed editor
2013-01-09 17:52:46 -08:00
Brian Wilson
468d703b57
Update CDD export to output only changed records.
2013-01-09 18:08:05 -05:00
Don Mitchell
7f836e77a7
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 16:28:36 -05:00
Don Mitchell
35e353e06b
Oops, xxp was going to (x) xp :-( now ( ) xxp :-)
2013-01-09 16:28:25 -05:00
cahrens
2caa5a518f
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 16:20:51 -05:00
cahrens
b3d168b6f2
Make editor names consistent.
2013-01-09 16:20:38 -05:00
Don Mitchell
603c6ce296
Get rid of extra space at beginning of markdown for templates
2013-01-09 16:17:58 -05:00
Don Mitchell
d0e06e1a35
With improved unit tests to test machavellian (sic) patterns
2013-01-09 16:03:09 -05:00
Chris Dodge
e11706ef07
change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores
2013-01-09 15:53:22 -05:00
Diana Huang
6bebb1b7a5
Merge branch 'master' into feature/diana/rubric-input
2013-01-09 15:45:22 -05:00
Don Mitchell
373c8eb2a7
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 15:36:28 -05:00
Don Mitchell
8245ebac83
On menu based markdown conversion,
...
be picky about x as marker for correct requiring it to be first
non-whitespace char on line, followed by whitespace, followed eventually
but another non-whitespace char
strip trailing newline from selection.
2013-01-09 15:36:16 -05:00
cahrens
914132f802
remove tiny mce link CSS
2013-01-09 15:10:41 -05:00
cahrens
1252181fe1
Code review cleanup.
2013-01-09 14:11:13 -05:00
Brian Wilson
cc8e8ba6c6
Pearson reg: relax validation of phone country codes.
2013-01-09 13:31:04 -05:00
Don Mitchell
144c6bca8b
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 11:38:23 -05:00
Don Mitchell
fff9afdeb8
Minor cleanups
2013-01-09 11:38:01 -05:00
Brian Wilson
8ad9bc5949
Move Pearson URL to settings. Fix Register button. Other small changes.
2013-01-09 11:26:54 -05:00
cahrens
64387a4f0c
Tom cruft to be deleted, problem editor CSS moved to correct location.
2013-01-09 11:06:18 -05:00
Chris Dodge
9b72d11473
add some comments to the change
2013-01-09 10:47:29 -05:00
Chris Dodge
fd600e5be2
add some simple in-mem caching for course TOC. This is a problem when running against Mongo since courses are created/disposed very frequently
2013-01-09 10:38:32 -05:00
cahrens
d53669fcb9
Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor
2013-01-09 09:41:35 -05:00
cahrens
b97955965a
Warn user when going to XML Editor. Cleanup and comments.
2013-01-09 09:39:46 -05:00
Calen Pennington
5a95dd28b1
Merge pull request #1227 from MITx/feature/ichuang/fix-capa-contextualize-text-for-option-response-and-mc
...
fix capa to add contextualize_text for optionresponse and multiplechoice
2013-01-09 06:08:45 -08:00
Brian Wilson
a5cce4769e
add accommodation listing, and revise error messages
2013-01-09 02:14:02 -05:00
Brian Wilson
25f08374ca
hook up more registration status boxes
2013-01-08 17:42:15 -05:00
David Ormsbee
1122cdb286
Added more comments in response to code review.
2013-01-08 16:37:31 -05:00
cahrens
94696786c0
Merge in Don's change.
2013-01-08 14:57:15 -05:00
