chrisndodge
|
ea38482946
|
Merge pull request #1156 from MITx/feature/christina/misc
Bug fix for Studio #55.
|
2012-12-14 09:00:38 -08:00 |
|
Brian Talbot
|
4e152952af
|
cms settings - revised course overview textarea to display as codemirror field on page load
|
2012-12-14 11:57:46 -05:00 |
|
cahrens
|
cd6946088e
|
Merge branch 'feature/cale/cms-master' into feature/christina/misc
|
2012-12-14 11:50:56 -05:00 |
|
cahrens
|
dd7ed956dd
|
Bug fix for Studio #55.
|
2012-12-14 11:37:45 -05:00 |
|
Brian Talbot
|
91713cbe18
|
editing UI - added in preventDefault() to all editing actions on course info
|
2012-12-14 11:14:09 -05:00 |
|
Brian Talbot
|
c7feaa1373
|
editing - revised unit editor styling
|
2012-12-14 10:54:44 -05:00 |
|
Carlos Andrés Rocha
|
a725bae313
|
Merge pull request #1155 from MITx/style/btalbot/university-logos-gtown
Revised Georgetown University seal/logo for edx.org use
|
2012-12-14 07:04:38 -08:00 |
|
Christina Roberts
|
fef3fd871e
|
Merge pull request #1154 from MITx/feature/dhm/cms-settings
Fixed 2nd fn which had regex infinite loop
|
2012-12-14 06:58:43 -08:00 |
|
Brian Talbot
|
4602a9d654
|
universities - revised Georgetown University seal/logo for homepage/university page use
|
2012-12-14 09:52:00 -05:00 |
|
Don Mitchell
|
b9d9c7b8c0
|
Fixed infinite loop in the 2nd video string parser which I'd fixed in
the first yesterday. Fixed formatting of compounded video string errors.
|
2012-12-14 09:48:04 -05:00 |
|
Don Mitchell
|
1eacd5e346
|
Fix infinite loop in videosourceSample. Had fixed same one in
parse_videosource but neglected to fix this one.
|
2012-12-14 09:45:25 -05:00 |
|
chrisndodge
|
d965221ec7
|
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
debugged tooltip latency/vanishing issue
|
2012-12-14 06:26:48 -08:00 |
|
Don Mitchell
|
6c64032fcf
|
Overview should be ready to test.
|
2012-12-14 09:22:54 -05:00 |
|
David Ormsbee
|
7dd2f48efc
|
Merge pull request #1127 from MITx/bugfix/kevin/mathjax-rendering
Bugfix/kevin/mathjax rendering
|
2012-12-14 05:07:24 -08:00 |
|
chrisndodge
|
f87e5cefab
|
Merge pull request #1152 from MITx/feature/dhm/cms-settings
Don't save null about items to db as it chokes lms.
|
2012-12-13 17:20:56 -08:00 |
|
Carlos Andrés Rocha
|
909ab2b5f6
|
Merge pull request #1146 from MITx/content/rocha/job-page-update
Add member services job descriptions
[Finished #40869383]
|
2012-12-13 14:42:38 -08:00 |
|
Don Mitchell
|
e2918c2dbd
|
Don't save null about items to db as it chokes lms.
|
2012-12-13 17:23:40 -05:00 |
|
Don Mitchell
|
e0849e8b5a
|
Cache to debug other branch
|
2012-12-13 16:34:58 -05:00 |
|
Chris Dodge
|
bb3b7cb3a9
|
add back the course info tab in the CMS
|
2012-12-13 16:28:47 -05:00 |
|
chrisndodge
|
5709ee014b
|
Merge pull request #1150 from MITx/bug/btalbot/cms-placeholdit
bug - removed placeholdit image references in template HTML
|
2012-12-13 12:50:33 -08:00 |
|
Brian Talbot
|
fb47f30918
|
bug - removed placeholdit image references in template HTML
|
2012-12-13 15:48:39 -05:00 |
|
chrisndodge
|
094856e229
|
Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups
Various Style/UI Tweaks
|
2012-12-13 12:41:10 -08:00 |
|
David Ormsbee
|
97ab513a10
|
Merge pull request #1130 from MITx/feature/cale/fix-discussion-breakage
Ignore discussion modules with missing keys when building the global dis...
|
2012-12-13 12:20:57 -08:00 |
|
David Ormsbee
|
85f198e36a
|
Merge pull request #1148 from MITx/fix/rocha/divide-create-dev-env-script
Extract installation of system dependencies from create dev script
|
2012-12-13 12:17:32 -08:00 |
|
Brian Talbot
|
59f1b1d1f5
|
styling - re-aligned unit controls for unit editing and styled standard delete button
|
2012-12-13 15:15:30 -05:00 |
|
Carlos Andrés Rocha
|
3025a88d73
|
Extract installation of system dependencies from create dev script
|
2012-12-13 15:11:53 -05:00 |
|
Brian Talbot
|
15942aae05
|
styling - re-aligned unit edit controls and added visual divider
|
2012-12-13 15:02:38 -05:00 |
|
David Ormsbee
|
8fdf7f6cfd
|
Merge pull request #1138 from MITx/bug/tom/pearson-ie7
Bug/tom/pearson ie7
|
2012-12-13 11:31:26 -08:00 |
|
Carlos Andrés Rocha
|
ede96d777d
|
Add member services job descriptions
[#40869383]
|
2012-12-13 14:27:04 -05:00 |
|
Jay Zoldak
|
c485e441a9
|
Do not copy already compiled coffee to js files from xmodule video and also do not save them in git
|
2012-12-13 14:26:27 -05:00 |
|
Brian Talbot
|
2524992965
|
styling - settings UI tweaks
|
2012-12-13 14:24:09 -05:00 |
|
Brian Talbot
|
090e83b709
|
styling - resolved FF top whitespace bug
|
2012-12-13 14:16:51 -05:00 |
|
Christina Roberts
|
c182b8ef08
|
Merge pull request #1145 from MITx/feature/dhm/cms-settings
Feature/dhm/cms settings
|
2012-12-13 11:12:04 -08:00 |
|
Brian Talbot
|
f33efe3dde
|
settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer
|
2012-12-13 13:45:57 -05:00 |
|
Brian Talbot
|
34441759dd
|
settings - added in preventDefault() for all grading controls that needed it
|
2012-12-13 13:44:03 -05:00 |
|
Don Mitchell
|
62f544479c
|
Merge pull request #1143 from MITx/feature/christina/misc
Protect against graceperiodjson being null.
|
2012-12-13 10:42:18 -08:00 |
|
cahrens
|
e77a67a93a
|
Protect against graceperiodjson being null.
r.don
|
2012-12-13 13:36:37 -05:00 |
|
Brian Talbot
|
6b17659195
|
styling - settings layout and delete buttons
|
2012-12-13 13:35:58 -05:00 |
|
Brian Talbot
|
3b784f2145
|
styling - setting form field layout
|
2012-12-13 13:21:43 -05:00 |
|
Brian Talbot
|
69c26a08e3
|
settings/style - general UI clean up - wip
|
2012-12-13 13:06:56 -05:00 |
|
Don Mitchell
|
9cc1b348fa
|
Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings
|
2012-12-13 13:02:03 -05:00 |
|
Don Mitchell
|
9b9bdb44a3
|
Fix video string parse for empty and completely malformed strings
|
2012-12-13 12:58:59 -05:00 |
|
Don Mitchell
|
a39d609eea
|
more
|
2012-12-13 12:35:17 -05:00 |
|
Don Mitchell
|
595edac4c2
|
Caching changes to fix critical bug on other branch
|
2012-12-13 12:33:22 -05:00 |
|
Chris Dodge
|
10b417c85e
|
initial checkin of export
|
2012-12-13 11:53:52 -05:00 |
|
Brian Talbot
|
7d823d9ed9
|
resolving styling merge conflicts
|
2012-12-13 11:43:48 -05:00 |
|
Brian Talbot
|
9f863fd96e
|
styling - adjusting collapse button CSS lost in cms-master rebase
|
2012-12-13 11:37:51 -05:00 |
|
chrisndodge
|
aee4fd912c
|
Merge pull request #1142 from MITx/feature/dhm/cms-settings
fix up some test failures
|
2012-12-13 08:30:58 -08:00 |
|
Chris Dodge
|
4ebc9a589d
|
fix up some test failures
|
2012-12-13 11:29:00 -05:00 |
|
Tom Giannattasio
|
2be1f852e7
|
clean up of users page
|
2012-12-13 11:28:59 -05:00 |
|