cahrens
708736c42d
Unit tests around the save method (xml and markdown).
2013-01-10 14:27:50 -05:00
Diana Huang
3a29d260ae
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-10 14:12:06 -05:00
chrisndodge
010a1f2735
Merge pull request #1257 from MITx/feature/cas/speed-editor
...
Feature/cas/speed editor
2013-01-10 10:58:33 -08:00
Calen Pennington
0726294c35
Use get_child_descriptors for grades.py
2013-01-10 13:55:46 -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
cahrens
993d59b230
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-10 13:50:57 -05:00
cahrens
58837066b0
A couple renames.
2013-01-10 13:50:21 -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
Christina Roberts
a7887721af
Merge pull request #1255 from MITx/bug/btalbot/unit-editing
...
Moving Static Component View Under Modal While Editing
2013-01-10 10:35:31 -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
Brian Talbot
4128f37a1f
studio - moving a component's static view visually below modal while editing
2013-01-10 13:18:26 -05:00
Diana Huang
19bc657487
Use correct version of the grader id.
2013-01-10 12:44:54 -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
Christina Roberts
b3af587ba0
Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling
...
Course Overview Section Collapse/Expand Toggling
2013-01-10 09:04:26 -08:00
cahrens
bcafc5fdfb
Bug fix for modal cover not going way when click outside of edit ( #106 ).
2013-01-10 11:07:11 -05: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
chrisndodge
171d4c34b0
Merge pull request #1250 from MITx/bug/dhm/jan13
...
Fixed time picker race condition for grace period. Still quirky in that
2013-01-09 17:39:02 -08:00
Brian Wilson
9a221dfd29
Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-upload
2013-01-09 18:08:32 -05:00
Brian Wilson
468d703b57
Update CDD export to output only changed records.
2013-01-09 18:08:05 -05:00
Don Mitchell
96a7db62cd
Fixed time picker race condition for grace period. Still quirky in that
...
in rounds down times from :01-:09 to :00 (and perhaps others). I think
that's a bug or setting in timepicker.
2013-01-09 17:55:02 -05:00
Don Mitchell
d1c888b119
Put init code in a document ready event handler.
2013-01-09 16:37:45 -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
Christina Roberts
700ae5bf53
Merge pull request #1248 from MITx/fix/cdodge/discussion-boards
...
change over the 'get all discussion models' to use get_items() which is ...
2013-01-09 13:19:00 -08:00
Don Mitchell
603c6ce296
Get rid of extra space at beginning of markdown for templates
2013-01-09 16:17:58 -05:00
Brian Talbot
a388263298
pearson registration - giving registration call to actions on dashboard a bit more room
2013-01-09 16:06:10 -05:00
Chris Dodge
d4f30b378e
remove commented out line and add a new comment. also remove debugging trace output
2013-01-09 16:05:09 -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
Diana Huang
393ee3533c
Merge branch 'master' into diana/peer-grading-improvements
2013-01-09 15:45:02 -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
71ee11bfb0
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 15:10:56 -05:00
cahrens
914132f802
remove tiny mce link CSS
2013-01-09 15:10:41 -05:00
Brian Talbot
e725087122
studio - removing unused scrollTo plugin reference from base template
2013-01-09 15:05:07 -05:00
Brian Talbot
7921b32b63
studio - set viewport to scroll to bottom of component type list in component editor
2013-01-09 15:04:20 -05:00
Diana Huang
13c692c29b
Show back button when we see an error.
2013-01-09 14:59:59 -05:00
Diana Huang
54d91e7875
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-09 14:44:08 -05:00
Diana Huang
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -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
Brian Talbot
19fa439326
studio - firming up section-wide collapsing/expanding functionality
2013-01-09 12:31:32 -05:00
Brian Wilson
21fe582788
No longer need this extra file.
2013-01-09 11:51:55 -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
