Commit Graph

5700 Commits

Author SHA1 Message Date
Frances Botsford
b23f17dbe7 removed commented out lines 2014-04-09 10:32:12 -04:00
Andy Armstrong
07c54dcbaa Fix up edit_component so that it doesn't take an unnecessary step argument 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
Frances Botsford
636fa19033 small ui fixes in Studio - textbooks upload and loading font-size 2014-04-09 10:32:11 -04:00
Frances Botsford
2425aab979 maintain scroll position after closing the component editing modal in Studio 2014-04-09 10:32:11 -04:00
Andy Armstrong
df32f109c7 Refactor test logic for switching editor tabs 2014-04-09 10:32:11 -04:00
Frances Botsford
be8e99444a making chrome scroll up when showing the component menu on the Studio unit page 2014-04-09 10:32:11 -04:00
Andy Armstrong
4f85228e66 Make tab name comparison case-insensitive 2014-04-09 10:32:11 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page.
STUD-1306
2014-04-09 10:32:11 -04:00
zubair-arbi
adbb9f9562 Merge pull request #3216 from edx/zub/bugfix/std1506-savedate
save dates on enter key press
2014-04-09 18:51:25 +05:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
zubiar-arbi
0b884cc3b8 save dates on enter key press
STUD-1506
2014-04-09 13:02:11 +05:00
Waheed Ahmed
09972c7973 Message changed for course import when timeout.
STUD-1283
2014-04-09 11:54:06 +05:00
cahrens
e008de88e6 Fix source editor for the case of no CodeMirror editor.
In the HTML component, there is no longer a tabbed CodeMirror Editor. STUD-1516.
2014-04-08 10:43:33 -04:00
Will Daly
08413afdfd Allow import of native XBlocks in draft
Added tests for importing a pure XBlock
2014-04-08 07:52:11 -04:00
cahrens
aade444f00 Move overview drag and drop code to a utility class. 2014-04-05 17:03:18 -04:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements
Add some optional policies around password resets, such as password reus...
2014-04-04 16:14:43 -04:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Christina Roberts
dfed60fa8c Merge pull request #3163 from edx/christina/advanced-settings-font
Use monospaced font for CodeMirror editor.
2014-04-03 14:58:56 -04:00
cahrens
3d7915fa56 Use monospaced font for CodeMirror editor.
Cursor position gets off with non-monospaced font.
STUD-1456.

Vertical alignment of monospace font in advanced settings via position css adjustment
2014-04-03 13:11:08 -04:00
Christina Roberts
d6a0d6f06c Merge pull request #3180 from edx/christina/iframe_binding_bug
Check iframe src for the specific value TinyMCE uses.
2014-04-03 10:11:43 -04:00
zubair-arbi
048962874e Merge pull request #3150 from edx/waheed/stud1483-cannot-handle-more-than-9-lines-advanced-settings
Fixed studio can't handle more than 9 lines in advanced settings.
2014-04-03 18:42:39 +05:00
Alexander Kryklia
668134de4a Merge pull request #3169 from edx/alex/fix_more_flaky_tests
Alex/fix more flaky tests
2014-04-03 15:34:18 +03:00
Alexander Kryklia
41695def9e Merge pull request #3136 from edx/alex/display_native_language_2
Alex/display native language 2
2014-04-03 15:06:04 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00
Alexander Kryklia
80635a9995 Merge pull request #3149 from edx/alex/fix_flaky_test
Fix flaky acceptance test.
2014-04-03 12:20:42 +03:00
Ned Batchelder
732bf3f307 Fix hash_resource to avoid encode errors. 2014-04-02 20:13:50 -04:00
Christina Roberts
269cd19abe Merge pull request #3155 from edx/christina/tinymce-update-cdn2
Upgrade TinyMCE to 4.0.20 and replaced tabbed HTML editor
2014-04-02 13:55:50 -04:00
cahrens
cc275a9347 Check iframe src for the specific value TinyMCE uses.
STUD-1470
2014-04-02 13:48:13 -04:00
Brian Talbot
473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
2014-04-02 11:12:34 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
Abdallah
fe847720ea Upgrade to TinyMCE 4.0.16.
Detailed commit messages:
deleted old tinymce

new tinymce
js changes to support new tinymce
scss changes for alignments

Include all the controls on the toolbar that we previously had.

Changes to support Bulk e-mail usage.

adding new studio skin for TinyMCE4

Get handling of static image links working again.

Delete old Studio skin.

Version 1.3 of CodeMirror plugin.

Modify paths for location of CodeMirror files.

Fire events when CodeMirror Editor is open and closed.

Needed to switch static links back and forth.

Remove CodeMirror tabbed editor.

fixed tinymce visual editor css

Change how we detect that an image has been inserted.

made the codemirror look more studio-like

reordered the tinymce buttons

Update unit tests.

Update acceptance test for image plugin.

Make sure to strip out temporary caret.

It can get left behind in style blocks.

Test for style block being maintained.

Allow TinyMCE to create p's, else formatting doesn't work.

Add tests for toolbar buttons and converting links.

Add test for code format toolbar button.

Remove unnecessary code.

Remove unused testing templates and unused tabs.

Update tinymce paths.

Fire an event with the link plugin closes so we can rewrite links.

pep8

Updates from code review.

Change the name of the button to "Edit HTML".

Changed menu name for consistency, but we don't show it.

Changed name of "code" toolbar button to "Code block".

Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422

Fire events before and after the image dialog is shown.

We use this to rewrite links.

Change the event handling for image plugin.

Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).

Code review feedback.

Fire events before and after the link dialog is shown.

This allows us to convert the static links.

Remove unnecessary helper method.

keeping the component editor inside the component window

Use compressed CodeMirror file.

replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar

Change code editor icon to say HTML.

Move code style block button.

Update tests for minor UI changes.

Code editor button no longer shows an icon, and code style toolbar button location has moved.

Fix typos.
2014-04-02 10:35:27 -04:00
Abdallah
35be2e3032 line fix 2014-04-02 16:40:55 +03:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03:00
Alexander Kryklia
bae60527fb Set big timeout for big subtitles. 2014-04-02 15:28:53 +03:00
Alexander Kryklia
d194d0e02b Wait for big subtitles to render. 2014-04-02 15:21:57 +03:00
Alexander Kryklia
6199c8562d Fix acceptance tests. 2014-04-02 12:32:53 +03:00
Waheed Ahmed
19e9ff7cb3 Fixed studio can't handle more than 9 lines in advanced settings.
STUD-1483
2014-04-01 15:36:15 +05:00
polesye
92cd46277d BLD-950: Update captions logic on front-end. 2014-04-01 12:25:45 +03:00
Alexander Kryklia
e2de072f9b Fix flaky acceptance test. 2014-04-01 12:20:05 +03:00
Mark Hoeber
8452ee7c0d Merge pull request #3132 from edx/markhoeber/documentation/stud-1488
Added note about pages being publicly viewable
2014-03-31 16:19:08 -04:00
Andy Armstrong
2086d09ff5 Merge pull request #3121 from louyihua/translation-fix-cms
Translation fix in studio: For better translation in unit.html
2014-03-31 15:37:57 -04:00
louyihua
582971755a Translation fix in studio: For better translation
As the sentence in unit.html is splitted into three parts due to the varible release_date may be None, it breaks the integrity of a sentence.
Different language may have different word or event grammer order, so if a sentence is breaked into three parts, translators cannot adjust the word orders to create a good translation.
So this fix tries to combine the sentence together.
2014-04-01 02:23:02 +08:00
Frances Botsford
a01d296d1c moved Studio public Pages warning to a more prominent location 2014-03-31 13:42:06 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor.
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
2014-03-31 18:49:56 +03:00
Mark Hoeber
bb4f30b31a Added note about pages being publicly viewable
STUD-1488
2014-03-31 11:14:39 -04:00
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00