Arthur Barrett
|
dfc9176f6b
|
fixed typo
|
2013-03-06 14:40:35 -05:00 |
|
Arthur Barrett
|
ddbab36439
|
Added instructions/documentation to the studio template for content authors.
|
2013-03-06 14:33:04 -05:00 |
|
Arthur Barrett
|
5029d3a3dd
|
Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule
|
2013-03-06 13:51:18 -05:00 |
|
Arthur Barrett
|
fd49aceb29
|
fixed highlight style for cascade.
|
2013-03-06 13:36:11 -05:00 |
|
Arthur Barrett
|
9b32400b3a
|
tweaked commentary textarea size so it looks correct in ff
|
2013-03-06 13:18:52 -05:00 |
|
Arthur Barrett
|
0424b53336
|
show the annotation callout at the span center rather than at the mouse
|
2013-03-06 00:05:41 -05:00 |
|
Arthur Barrett
|
3393e6385d
|
set a default height on the commentary textbox to show 5 lines of text
|
2013-03-06 00:05:36 -05:00 |
|
Arthur Barrett
|
2ed7394f27
|
visually distinguish instructions from guided discussion section
|
2013-03-06 00:05:28 -05:00 |
|
Vik Paruchuri
|
102c594e7b
|
Remove string and old import
|
2013-03-05 15:01:12 -05:00 |
|
Vik Paruchuri
|
9475c6edac
|
Address review comments
|
2013-03-05 14:41:08 -05:00 |
|
Arthur Barrett
|
5bbb70ef8a
|
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
|
2013-03-05 13:47:02 -05:00 |
|
Arthur Barrett
|
c9b2a6a203
|
updated CSS to use the new advanced icon
|
2013-03-05 10:52:39 -05:00 |
|
Arthur Barrett
|
fa3961d4dd
|
merged openended and advanced categories per discussion at today's standup
|
2013-03-05 10:51:59 -05:00 |
|
Brian Talbot
|
ef9f963f49
|
studio - advanced modules: added in advanced module button icon per artie/vik work
|
2013-03-05 10:39:21 -05:00 |
|
Vik Paruchuri
|
d03fe79e07
|
Small metadata naming fix
|
2013-03-05 10:36:22 -05:00 |
|
Arthur Barrett
|
7a0aead0d9
|
annotation now hides automatically on mouseleave events. click to hide/show or re-position the annotation.
|
2013-03-04 17:21:32 -05:00 |
|
Brian Talbot
|
cc3b9557f9
|
studio - open ended and annotations: added in component button icon assets and styling
|
2013-03-04 17:02:59 -05:00 |
|
Arthur Barrett
|
b0abfa07c8
|
style the guided discussion text so it is boxed like the instructions text.
|
2013-03-04 14:23:41 -05:00 |
|
Arthur Barrett
|
2e6115c734
|
constrain the annotation call-out horizontally so it is always visible in the window
|
2013-03-04 14:19:28 -05:00 |
|
Vik Paruchuri
|
7ee58fb21c
|
Add in a todo
|
2013-03-01 17:09:28 -05:00 |
|
Arthur Barrett
|
20174fd24a
|
Removing failing jasmine tests for now.
|
2013-03-01 17:06:12 -05:00 |
|
Vik Paruchuri
|
55e19f8227
|
Fix the way that peer grading tab is initialized to make it work with studio
|
2013-03-01 17:02:38 -05:00 |
|
Vik Paruchuri
|
4400f94196
|
Fix some xml issues in yaml
|
2013-03-01 16:41:18 -05:00 |
|
Vik Paruchuri
|
f8b0338dee
|
Change name of annotatable, add in sass for advanced module
|
2013-03-01 16:26:48 -05:00 |
|
Vik Paruchuri
|
a2c03fec15
|
Make parsing more robust
|
2013-03-01 16:19:16 -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 |
|
Arthur Barrett
|
67b73242ea
|
added advanced component button with ability to specify components in course policy.
|
2013-03-01 15:11:42 -05:00 |
|
Vik Paruchuri
|
9f020e228b
|
Add in some dummy values
|
2013-03-01 14:50:40 -05:00 |
|
Vik Paruchuri
|
a818191297
|
Prelim support for combinedopenended and peergrading types
|
2013-03-01 14:12:04 -05:00 |
|
Arthur Barrett
|
530051037d
|
adding annotatable module template
|
2013-03-01 13:58:39 -05:00 |
|
Vik Paruchuri
|
c24ba23e54
|
Move self assessment templates
|
2013-03-01 13:45:55 -05:00 |
|
Vik Paruchuri
|
b0c2559de8
|
Switch around template locations
|
2013-03-01 13:43:01 -05:00 |
|
Arthur Barrett
|
82544f2ae1
|
start adding jasmine tests to module
|
2013-03-01 13:39:51 -05:00 |
|
Arthur Barrett
|
6dba2394b2
|
enable studio authoring (raw) for xmodule
|
2013-03-01 13:32:56 -05:00 |
|
Vik Paruchuri
|
b3d0abbd05
|
Start to move around templates
|
2013-03-01 13:31:54 -05:00 |
|
VikParuchuri
|
d186e5d186
|
Merge pull request #1538 from MITx/diana/fix-import-export
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
|
2013-03-01 09:32:08 -08:00 |
|
Calen Pennington
|
3908ada4ca
|
Merge pull request #1575 from MITx/feature/edz/lock-requirements
locking django-nose and numpy versions
|
2013-03-01 09:20:09 -08:00 |
|
e0d
|
a3ed2d156d
|
locking django-nose and numpy versions
|
2013-03-01 12:08:20 -05:00 |
|
David Ormsbee
|
d6957f3e7e
|
Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode
Fix capa save button msgs & add simple capa survey mode
|
2013-03-01 08:26:21 -08:00 |
|
David Ormsbee
|
e1fcf4c317
|
Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries
Reduce SQL queries in courseware by model caching a User's groups
|
2013-03-01 08:24:30 -08:00 |
|
Calen Pennington
|
c581ecd897
|
Merge pull request #1573 from MITx/feature/edz/lock-capa-deps-versions
locking deps versions based on pip freeze in production.
|
2013-03-01 08:10:56 -08:00 |
|
John Hess
|
b400b575d0
|
Merge pull request #1567 from MITx/jth/admindash
Improved /admin_dashboard
|
2013-03-01 07:56:32 -08:00 |
|
David Ormsbee
|
1d4defd0ea
|
Fix bug where we weren't combining org_staff with built-in staff for group checking
|
2013-03-01 10:54:57 -05:00 |
|
e0d
|
4e10eb10e3
|
locking deps versions based on pip freeze in production.
|
2013-03-01 10:15:07 -05:00 |
|
David Ormsbee
|
bfe2809a87
|
Merge branch 'master' into bugfix/dave/too_many_sql_queries
Conflicts:
lms/djangoapps/courseware/access.py
|
2013-03-01 10:11:35 -05:00 |
|
Calen Pennington
|
32e5f72c16
|
Remove .redcar folder
|
2013-03-01 08:15:38 -05:00 |
|