chrisndodge
288e1ec9c2
Merge pull request #1169 from MITx/fix/cdodge/course-id-on-mongo-system
...
pin requests to a known version, as we believe there's been an upgrade w...
2012-12-17 10:00:04 -08:00
Chris Dodge
02b0f011a5
pin requests to a known version, as we believe there's been an upgrade which is incompatible to our usage
2012-12-17 12:58:34 -05:00
Calen Pennington
c546c36858
Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine
...
Do not copy already compiled coffee to js files from xmodule video and a...
2012-12-17 09:39:43 -08:00
chrisndodge
c74be27a91
Merge pull request #1167 from MITx/fix/cdodge/course-id-on-mongo-system
...
fix crash of custom tags when running against Mongo datastores. Mongo's ...
2012-12-17 07:50:06 -08:00
Chris Dodge
d18f42224c
fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store
2012-12-17 10:41:54 -05:00
chrisndodge
39d292a058
Merge pull request #1166 from MITx/bug/dhm/dec12
...
Fixed course info bug (and simplified parsing). Incidentally fixed 2
2012-12-15 14:03:58 -08:00
Don Mitchell
7223c8ce13
Found cut/paste error which was causing intermittent bug due to
...
overloaded template name.
2012-12-15 16:36:23 -05:00
Don Mitchell
521fa938b3
Fixed course info bug (and simplified parsing). Incidentally fixed 2
...
other course info bugs (not editing/deleting right element if > 10,
putting new elements at end rather than beginning of list).
Made Location more robust against parsing errors.
2012-12-15 15:56:51 -05:00
Chris Dodge
f5d07b1521
just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build.
2012-12-15 15:15:45 -05:00
chrisndodge
368abbe669
Merge pull request #1165 from MITx/bug/btalbot/pullrequest1160-untangling
...
cms pull request 1160 - CSS resolutions
2012-12-15 11:50:07 -08:00
Brian Talbot
2ee488733c
cms pull request 1160 - brought back all css changes lost in this request - mostly overview related
2012-12-15 00:25:29 -05:00
Don Mitchell
2a353068ab
Merge pull request #1163 from MITx/feature/christina/misc
...
Feature/christina/misc
2012-12-14 14:29:53 -08:00
Christina Roberts
e57b5b1431
Merge pull request #1160 from MITx/feature/btalbot/cms-gradable
...
Overview page allows user to specify grading policy per subsection
2012-12-14 14:09:28 -08:00
Don Mitchell
ac7b0334a6
Code review changes.
2012-12-14 16:51:40 -05:00
Christina Roberts
dbd9ac6e59
Merge pull request #1162 from MITx/fix/cdodge/security-holes
...
add some permissions asserting
2012-12-14 13:37:12 -08:00
chrisndodge
9d2062875f
Merge pull request #1161 from MITx/bug/btalbot/cms-pagestext
...
pages - made intro text visible again and styled it some
2012-12-14 13:29:07 -08:00
cahrens
e3b302f5fe
Merge branch 'feature/cale/cms-master' into feature/christina/misc
2012-12-14 16:28:50 -05:00
Chris Dodge
ab9b208605
add some permissions asserting
2012-12-14 16:26:15 -05:00
cahrens
808cf8c692
Some JavaScript cleanup (also addresses Studio #60 ).
2012-12-14 16:24:01 -05:00
Brian Talbot
7d1a08d481
pages - made intro text visible again and styled it some
2012-12-14 16:15:01 -05:00
chrisndodge
795b38f0fb
Merge pull request #1159 from MITx/bug/btalbot/cms-tooltips
...
tooltips - removed bad js reference and added in unit tooltips
2012-12-14 12:22:01 -08:00
Don Mitchell
0b762fa35f
Remove ability to set gradability at the section level (commented out
...
until we decide the inheritance)
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings
Fix menu dismissa
Fix ambiguous selection
2012-12-14 15:19:14 -05:00
Brian Talbot
e4f4f32c1b
tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html and added tooltips to unit actions
2012-12-14 15:18:45 -05:00
Don Mitchell
0fc16dffee
Gradable impl'd for overview page
2012-12-14 12:29:57 -05:00
chrisndodge
fbffe13d53
Merge pull request #1157 from MITx/bug/btalbot/cms-editingui
...
Course Info and Settings Editor UI Bug Fixes
2012-12-14 09:02:27 -08:00
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
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
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
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
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
Brian Talbot
59f1b1d1f5
styling - re-aligned unit controls for unit editing and styled standard delete button
2012-12-13 15:15:30 -05:00
Brian Talbot
15942aae05
styling - re-aligned unit edit controls and added visual divider
2012-12-13 15:02:38 -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
