Vik Paruchuri
a2c03fec15
Make parsing more robust
2013-03-01 16:19:16 -05:00
Don Mitchell
afc2d66d07
Merge pull request #1578 from MITx/bug/christina/misc
...
Don't usurp ValidatingView's error handling.
2013-03-01 13:16:45 -08:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
David Ormsbee
bba96ee1d7
Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base
...
reapply Ike's pull-request in a new branch. The PR branch got mangled on...
2013-03-01 12:59:02 -08:00
Chris Dodge
20540fbc2d
update usage feedback
2013-03-01 15:52:27 -05:00
Chris Dodge
0047295695
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete
2013-03-01 15:48:23 -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
Vik Paruchuri
7a8e43a9c5
Json parsing fixes
2013-03-01 15:40:46 -05:00
Vik Paruchuri
386ab10edb
Apparently meld is weird at indenting
2013-03-01 15:31:42 -05:00
Vik Paruchuri
a09a4febce
Fix category generation
2013-03-01 15:30:22 -05:00
Vik Paruchuri
fb37d46bd8
Minor bugfixes
2013-03-01 15:28:33 -05:00
Vik Paruchuri
d039776218
Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio
...
Conflicts:
cms/djangoapps/contentstore/views.py
2013-03-01 15:25:53 -05:00
Chris Dodge
724c6c9eaa
reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident.
2013-03-01 15:25:36 -05:00
cahrens
d7c28bfa11
Don't usurp ValidatingView's error handling.
...
#219
2013-03-01 15:24:56 -05:00
Arthur Barrett
67b73242ea
added advanced component button with ability to specify components in course policy.
2013-03-01 15:11:42 -05: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
Vik Paruchuri
9f020e228b
Add in some dummy values
2013-03-01 14:50:40 -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
Vik Paruchuri
a818191297
Prelim support for combinedopenended and peergrading types
2013-03-01 14:12:04 -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
Chris Dodge
816b0edfb0
add another command line argument to allow users to only simulate a delete (i.e. show what items would be deleted). This is a handy sanity checker.
2013-02-25 16:00:35 -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
