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 |
|
Brian Talbot
|
2ce4ecbc84
|
local merge with master - finished
|
2013-03-01 15:48:15 -05:00 |
|
Brian Talbot
|
8552b2d614
|
local merge with master - WIP
|
2013-03-01 15:47: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 |
|
Brian Talbot
|
ad70581b80
|
studio - alerts: more progress including prompts
|
2013-03-01 15:43:07 -05: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 |
|
Brian Talbot
|
cb456ad228
|
studio - alerts: converted transition-based animation to keyframe/css animation and added in a demo for a fleeting notification
|
2013-02-27 12:45:44 -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 |
|
Brian Talbot
|
cc02b4714c
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-02-26 14:22:50 -05:00 |
|
Don Mitchell
|
d2e6f6dccb
|
Fixes for code review comments
|
2013-02-26 13:56:00 -05:00 |
|
Brian Talbot
|
d09927e8dd
|
studio - alerts: small styling tweaks for the close button on help notifications
|
2013-02-26 12:38:46 -05:00 |
|
Brian Talbot
|
0926395445
|
studio - alerts: added in close buttons and basic JS to control them/moved demo JS to alerts.html page
|
2013-02-26 12:32:20 -05:00 |
|
Brian Talbot
|
95ea01689f
|
studio - alerts: firmed up status-based notifications
|
2013-02-25 16:30:36 -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 |
|
Brian Talbot
|
d809df913d
|
studio - alerts: moved all states and documentation into new /alerts view
|
2013-02-25 14:45:27 -05:00 |
|
Brian Talbot
|
8179b9fadc
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-25 14:19:22 -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 |
|
Brian Talbot
|
b1f5d67a96
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-22 14:39:49 -05:00 |
|
Brian Talbot
|
60f803f369
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-22 14:29:19 -05:00 |
|
Brian Talbot
|
bb24a079a1
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-22 14:28:13 -05:00 |
|
Jay Zoldak
|
85b75badd7
|
Refactor lettuce commands for navigation to the advanced settings page
|
2013-02-22 14:07:22 -05:00 |
|
Brian Talbot
|
d7bbfbc707
|
studio - alerts: basic layout and general alert styling WIP
|
2013-02-22 13:52:24 -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 |
|
Brian Talbot
|
de2b05bf66
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-02-22 12:01:50 -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 |
|