Brian Wilson
d6a74a644d
Merge branch 'master' into release
...
Conflicts:
cms/static/js/views/modals/edit_xblock.js
2014-05-13 11:10:48 -04:00
Andy Armstrong
e75f273329
Apply Sarina's code review suggestions
2014-05-09 13:39:17 -04:00
Andy Armstrong
6d08a0b47b
Improve the translatability of the paging header
2014-05-09 12:07:49 -04:00
Adam
efcd13e836
Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox
...
fix wiki hide button not working in firefox (STUD-1581)
2014-05-09 07:04:03 -05:00
Waheed Ahmed
998af82baa
Fixed cheatsheet for open ended editor.
...
STUD-1583
2014-05-07 12:58:35 +05:00
marcotuts
b0781cdd4a
Merge pull request #3614 from edx/waheed/fix-simple-problem-editor
...
Fixed simple problem editor text showing up in advanced editor
2014-05-06 12:17:37 -04:00
frances botsford
3530721671
Merge pull request #3577 from edx/frances/fix/404-and-500-page-layout
...
Fix for Studio 404 and 500 page layouts
STUD-864
2014-05-06 11:44:51 -04:00
Waheed Ahmed
b873cfc26d
Fixed simple editor text showing in advanced editor.
2014-05-06 20:35:38 +05:00
Christina Roberts
df262d4fc7
Merge pull request #3229 from edx/christina/container-dnd
...
Drag and drop on container page
2014-05-06 11:09:29 -04:00
Frances Botsford
5890bc842c
removing larger size for CodeMirror for funky visual behavior on Checkbox problems in release
2014-05-06 10:47:59 -04:00
cahrens
acd9d7d904
These files are not being used.
2014-05-05 11:36:04 -04:00
Andy Armstrong
7693659e48
Address Christina's review comments
2014-05-05 11:34:55 -04:00
Andy Armstrong
de80f892e2
Clean up coverage and code quality issues
2014-05-02 16:20:17 -04:00
Andy Armstrong
e20a7fc53c
Fix Jasmine tests
...
Also, rewrite them to be easier to comprehend, and to not use magic constants (or to use fewer, at least).
2014-05-02 16:20:17 -04:00
Andy Armstrong
f3a23f3973
Only show drag handles in draft mode
2014-05-02 16:20:12 -04:00
Frances Botsford
fb4cab435e
fix for Studio 404 and 500 page layouts
...
STUD-864
2014-05-02 16:19:59 -04:00
cahrens
37da399997
Update unit test based on changes in master.
2014-05-02 15:09:25 -04:00
Andy Armstrong
c1fd0ca34e
Switch the container page to use the new view
2014-05-02 15:09:23 -04:00
Frances Botsford
fd7142bcde
dnd container page styling
2014-05-02 15:09:23 -04:00
cahrens
fb150bcf64
Drag and drop on container page.
...
STUD-1309
2014-05-02 15:09:15 -04:00
Adam Palay
7c13ba0c3b
Disable draft and edit links during ajax calls
...
STUD-1485
STUD-1499
2014-05-02 09:11:46 -04:00
Adam Palay
c806c8a954
fix wiki hide button not working in firefox (STUD-1581)
2014-04-29 15:17:53 -04:00
Frances Botsford
8ed92f3c5b
temporary fix for xblock settings scroll
...
UX-623
2014-04-29 10:27:21 -04:00
David Baumgold
0a022e13ba
Merge pull request #3371 from carsongee/cg/pdf_textbook_urls
...
Switch PDF Textbooks to use portable URLs
2014-04-25 13:46:28 -04:00
Andy Armstrong
f6fc10f34b
Merge pull request #3463 from aboudreault/xblock-initialization-issue
...
XBlocks are something initialized before all resources (url) are loaded
2014-04-25 13:09:49 -04:00
Alan Boudreault
901920b0cd
no need for $.when() here..
2014-04-25 11:51:08 -04:00
Waheed Ahmed
49ef8c5686
Added code to remove css on closing cheatsheet.
2014-04-25 11:35:52 +05:00
Alan Boudreault
4d1d1a75ce
Wait that all resources are loaded and fragments rendered before initializing the xblock
2014-04-24 15:54:23 -04:00
Waheed Ahmed
df96c17e65
Fixed toggle cheatsheet not working on component editors.
...
STUD-1514
2014-04-23 11:08:12 +05:00
polesye
127bf7ed3f
BLD-1000: Download handout.
2014-04-22 21:44:36 +03:00
Brian Talbot
5940f1ff1a
Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class
...
Studio: revising .fake-link utility class to use Sass placeholder and syncing commenting style
LMS: updating Sass ui-disabled placholder syntax and creating utility is-disabled class
Studio: adding in basic action Sass placeholder for use in enabling/disabling UI
Studio: applying action Sass placeholder to publish/create-draft Unit view actions
STUD-1497
2014-04-16 14:44:30 -04:00
Carson Gee
6136ed2e13
Switch PDF Textbooks to use portable URLs
2014-04-16 13:05:25 -04:00
Andy Armstrong
a3b2809601
Fix duplicate save and cancel buttons in Studio
...
STUD-1531
Also add support for refreshing the modal on custom save
2014-04-15 14:04:55 -04:00
Nimisha Asthagiri
fe4bd4cbad
Merge pull request #3234 from edx/nimisha/container-duplicate-delete
...
Nimisha/container duplicate delete
2014-04-10 22:10:33 -04:00
Nimisha Asthagiri
dd3c8c268c
Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag).
2014-04-10 21:22:15 -04:00
jsa
72c3c87c84
in Studio, render compact placeholders for inline discussions.
...
JIRA: FOR-429
2014-04-10 15:44:30 -04:00
Frances Botsford
df0973e771
addressing review feedback
2014-04-09 16:45:22 -04:00
Andy Armstrong
a3e26e6824
Implement next round of code reviews
2014-04-09 12:15:38 -04:00
Andy Armstrong
d55ad61801
Make the LaText source compiler link visible
2014-04-09 10:59:51 -04:00
Andy Armstrong
2ae28c5db7
Improve unit testing of xblock editing
2014-04-09 10:32:13 -04:00
Andy Armstrong
9de6f1016c
Fix typo in textbook_spec.js
2014-04-09 10:32:13 -04:00
Andy Armstrong
a6aae729b7
Address the next round of review comments.
2014-04-09 10:32:13 -04:00
Andy Armstrong
88d95d119c
Rebuild the way modals are constructed to support nesting.
2014-04-09 10:32:13 -04:00
Andy Armstrong
b779b8a6fb
Add unit tests for custom tabs and modal titles
2014-04-09 10:32:13 -04:00
Andy Armstrong
230c0b5b73
Add more improvements from the review.
2014-04-09 10:32:12 -04:00
Frances Botsford
b23f17dbe7
removed commented out lines
2014-04-09 10:32:12 -04:00
Andy Armstrong
415fe8d396
Clean up the logic for the edit modal's title
2014-04-09 10:32:12 -04:00
Andy Armstrong
dce075a852
Changes based upon code review comments
2014-04-09 10:32:12 -04:00
Andy Armstrong
052949d700
Fix unit tests
2014-04-09 10:32:12 -04:00
Frances Botsford
ee42902ee6
removed edit-dialog and uploads css, changed component edit icon to pencil, small css fixes
2014-04-09 10:32:11 -04:00
