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 |
|
cahrens
|
31f9084b61
|
Tom cruft to be deleted.
|
2013-01-09 11:12:52 -05:00 |
|
cahrens
|
64387a4f0c
|
Tom cruft to be deleted, problem editor CSS moved to correct location.
|
2013-01-09 11:06:18 -05:00 |
|
Don Mitchell
|
cc4482b4c9
|
Merge pull request #1245 from MITx/feature/cdodge/cache-toc
add some simple in-mem caching for course TOC. This is a problem when ru...
|
2013-01-09 08:01:38 -08:00 |
|
cahrens
|
67b72a92bc
|
Merge remote-tracking branch 'origin/feature/cas/speed-editor' into feature/cas/speed-editor
|
2013-01-09 10:50:16 -05:00 |
|
cahrens
|
5daa6e7b73
|
Tom cruft to be deleted.
|
2013-01-09 10:49:59 -05:00 |
|
Don Mitchell
|
b8f530e865
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-09 10:49:20 -05:00 |
|
Chris Dodge
|
9b72d11473
|
add some comments to the change
|
2013-01-09 10:47:29 -05:00 |
|
Don Mitchell
|
2d8ddb0dcb
|
Ever slightly more rigorous test. actually look for the markdown field
in the model as well as the ancillary info
|
2013-01-09 10:47:03 -05:00 |
|
chrisndodge
|
8760e7669e
|
Merge pull request #1244 from MITx/bug/dhm/jan13
Bug 107: create update not working
|
2013-01-09 07:42:20 -08: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 |
|
Diana Huang
|
950d398387
|
Updates to the CSS
|
2013-01-09 10:19:42 -05:00 |
|
Brian Wilson
|
6342564f82
|
Merge branch 'master' into feature/brian/pearson-reg
|
2013-01-09 09:59:49 -05:00 |
|
Don Mitchell
|
62a70170cf
|
Updated unit test for the create operation related to bug 107
|
2013-01-09 09:55:50 -05:00 |
|
Don Mitchell
|
2019c9d037
|
Bug 107
|
2013-01-09 09:47:43 -05:00 |
|
cahrens
|
d53669fcb9
|
Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor
|
2013-01-09 09:41:35 -05:00 |
|
cahrens
|
b704645f99
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-09 09:40:34 -05:00 |
|
cahrens
|
b97955965a
|
Warn user when going to XML Editor. Cleanup and comments.
|
2013-01-09 09:39:46 -05:00 |
|
Don Mitchell
|
21f5c2d89a
|
Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing
Set up the framework for running lettuce tests against studio
|
2013-01-09 06:30:03 -08:00 |
|
chrisndodge
|
2b87940828
|
Merge pull request #1241 from MITx/bug/dhm/jan13
Fix iframe conversion problem (111)
|
2013-01-09 06:14:27 -08:00 |
|
chrisndodge
|
21fc7340d6
|
Merge pull request #1243 from MITx/fix/cdodge/missing-setting-for-cms
add required video setting
|
2013-01-09 06:12:50 -08:00 |
|
Chris Dodge
|
b8074b8bb4
|
add required video setting
|
2013-01-09 09:11:43 -05:00 |
|
Calen Pennington
|
941d55cee3
|
Merge pull request #1229 from MITx/feature/ichuang/update-symmath-server
Feature/ichuang/update symmath server
|
2013-01-09 06:10:32 -08: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 Talbot
|
2a1e102fca
|
studio - resolving merge conflict with cms/templates/unit.html
|
2013-01-09 08:56:58 -05:00 |
|
Brian Talbot
|
f60a9d8d35
|
studio - problem speed editor: tweaking presentation of problem sub menu further
|
2013-01-09 08:54:40 -05: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 |
|
Don Mitchell
|
83b7997d12
|
Added unit tests and generalized a catch
|
2013-01-08 16:43:42 -05:00 |
|
David Ormsbee
|
ecb3dd6134
|
Merge pull request #1239 from MITx/bugfix/dave/forum_missing_vertical
Fix parent lookups when the same named tag exists in multiple courses
|
2013-01-08 13:38:23 -08:00 |
|
David Ormsbee
|
1122cdb286
|
Added more comments in response to code review.
|
2013-01-08 16:37:31 -05:00 |
|
Diana Huang
|
f0f25296b2
|
Update documentation
|
2013-01-08 15:54:49 -05:00 |
|
Brian Talbot
|
75447eb80d
|
studio - problem speed editor: revised html and DOM for problem sub menu
|
2013-01-08 15:43:02 -05:00 |
|
cahrens
|
c7feee5b67
|
Delete speed-editor.js and cruft from unit.html.
|
2013-01-08 15:39:45 -05:00 |
|
Don Mitchell
|
1708dc4080
|
Use html rather than xml parsing for course updates
|
2013-01-08 15:13:37 -05:00 |
|
cahrens
|
4ac15daf44
|
Fix formatting.
|
2013-01-08 15:04:48 -05:00 |
|
cahrens
|
94696786c0
|
Merge in Don's change.
|
2013-01-08 14:57:15 -05:00 |
|
cahrens
|
f616aecd81
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
Conflicts:
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
|
2013-01-08 14:56:59 -05:00 |
|