Commit Graph

1486 Commits

Author SHA1 Message Date
Chris Dodge
bcea53d4b7 do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary). 2013-03-02 19:36:11 -05:00
chrisndodge
7fa77769c8 Merge pull request #1543 from MITx/feature/ichuang/turn-on-tracking-in-cms
turn on tracking in CMS / Studio
2013-03-01 12:47:01 -08:00
Don Mitchell
5fa1da5324 Merge pull request #1577 from MITx/bug/christina/misc
Bug fix for #215 (quotes not rendering in text fields).
2013-03-01 12:09:20 -08:00
cahrens
29330cc922 Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc.
#213
2013-03-01 14:55:38 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
Christina Roberts
69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor
Fix latex high-level source editor in current version of cms / studio
2013-02-28 10:02:09 -08:00
Chris Dodge
8a7211da05 remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument. 2013-02-28 09:40:30 -05:00
ichuang
b75ccbdcce address Christina's comments re js in latex2edx source-edit.html 2013-02-28 04:21:43 +00:00
Chris Dodge
905199b5eb restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive. 2013-02-27 22:37:13 -05:00
Brian Talbot
73ae818958 studio - fixing padding of codeMirror fields to match height of others given new line height 2013-02-27 13:08:56 -05:00
Brian Talbot
cdd6ce708e studio - reducing line height for codemirror JSON lines 2013-02-27 13:07:58 -05:00
Brian Talbot
524f48b68e studio - fixing padding of codeMirror fields to match height of others given new line height 2013-02-27 13:03:36 -05:00
Brian Talbot
45520fe124 studio - fixing line heights not syncing with code mirror lines and cursor 2013-02-27 12:59:25 -05:00
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Don Mitchell
d2e6f6dccb Fixes for code review comments 2013-02-26 13:56:00 -05:00
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
ichuang
4f33f7ffbc turn on tracking (helps with debugging) 2013-02-24 05:07:23 +00:00
ichuang
b6cf206fc7 fix latex high-level-source editor 2013-02-24 01:55:57 +00:00
Jay Zoldak
3a6f43f320 Create additional BDD spec tests for Course Advanced Settings editor 2013-02-22 16:27:05 -05:00
Jay Zoldak
85b75badd7 Refactor lettuce commands for navigation to the advanced settings page 2013-02-22 14:07:22 -05:00
Jay Zoldak
af2690fcaf Update lettuce test framework to use a course factory instead of the studio UI for creating courses 2013-02-22 12:36:27 -05:00
Don Mitchell
c11d627c88 Chrome/Safari don't use keypress for backspace and delete. 2013-02-22 11:00:27 -05:00
Mark L. Chang
f1c8301e4f added question marks 2013-02-21 22:47:48 -05:00
Jay Zoldak
e337292b5f Fix existing advanced settings lettuce tests. 2013-02-21 18:20:42 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings
Fix/cdodge/serializing ints as empty strings
2013-02-21 12:12:44 -08:00
Jay Zoldak
c10dc838b2 Fix tip on JSON key value pairs 2013-02-21 15:01:12 -05:00
Don Mitchell
e5efcf65d3 remove console.log 2013-02-21 13:34:11 -05:00
Don Mitchell
851a99cb13 remove commented out code 2013-02-21 13:32:29 -05:00
Don Mitchell
697bd5c97b also this one 2013-02-21 13:28:43 -05:00
Don Mitchell
116c74c075 Highlighting of field labels and smarter decision as to when to show the
save cancel bar.
2013-02-21 13:27:36 -05:00
Jay Zoldak
9eb2766943 Change test modulestore naming differentiation scheme to uuid 2013-02-21 13:07:14 -05:00
Chris Dodge
bc1ee3dbfa Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 12:56:20 -05:00
Chris Dodge
041d28f0e9 use better variable names to assert that the expected item was indeed loaded 2013-02-21 12:56:17 -05:00
Chris Dodge
fa3402a977 template name got changed. Need to reflect that on test. 2013-02-21 12:25:10 -05:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests
Make sure temp directories are properly cleaned up so running tests does...
2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling
Feature/cdodge/metadata inheritence crawling
2013-02-21 08:29:54 -08:00
Chris Dodge
a7f6545cbc add unit test 2013-02-21 11:22:20 -05:00
cahrens
cc63f9c2db Unique IDs, other cleanup. 2013-02-20 17:11:34 -05:00
Brian Talbot
8b5f088eb9 studio - fixed alignment of new section field and controls 2013-02-20 16:43:13 -05:00
Brian Talbot
4b850f4da9 studio - notifications: made icon/copy area more bulletproof for longer lines of text 2013-02-20 16:24:50 -05:00
Chris Dodge
bd188f92ef put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case 2013-02-20 16:20:39 -05:00
cahrens
c572ba862a Delete unused method. 2013-02-20 15:47:07 -05:00
cahrens
d9fb067355 Test point for formatting of JSON entry. 2013-02-20 15:34:53 -05:00
cahrens
dd959d1123 Longer warning got merged out. 2013-02-20 15:01:41 -05:00
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -05:00
Brian Talbot
e157fd26c8 studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields 2013-02-20 14:58:19 -05:00
Brian Talbot
ef3492aa40 studio - resolving local merge 2013-02-20 14:48:21 -05:00
Brian Talbot
c7f5b74225 studio - manual policy editor: converting to new page layout and styling 2013-02-20 14:46:54 -05:00