Commit Graph

2102 Commits

Author SHA1 Message Date
zubair-arbi
87408d2399 Revert "remove location of item from loc_mapper and cache"
This reverts commit d2b8b4f0dd.
2014-04-29 18:53:35 +05:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy
Configure youtube stub for bok-choy
2014-04-28 17:32:33 +05:00
David Baumgold
7aa627b1fa Merge pull request #3145 from carsongee/cg/course_import_validation
Add test in import code to make sure two overlapping courses aren't imported
2014-04-25 16:03:55 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00: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
cahrens
29d32d35ff Tests for raw editor and minor wording changes. 2014-04-24 14:18:13 -04:00
cahrens
ad3d8c7871 Add support for raw HTML editor.
STUD-1562
2014-04-24 14:18:12 -04:00
Andy Armstrong
f4e4082b7d Make TinyMCE more tolerant about HTML elements
STUD-1565
2014-04-24 14:17:42 -04:00
zubiar-arbi
7b5c647c8e properly remove users from instructor/staff groups on a course delete
STUD-1555
2014-04-24 17:11:19 +05:00
zubair-arbi
c9b419d5ad Merge pull request #3250 from edx/zub/bugfix/std1441-editdiscussioncomp
remove location of item from loc_mapper
2014-04-23 14:40:17 +05:00
zubiar-arbi
d2b8b4f0dd remove location of item from loc_mapper and cache 2014-04-23 13:29:39 +05: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
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
Nick Parlante
f1eefc1117 Merge pull request #1499 from edx/nick/shuffle-question
Shuffle feature for multiple choice questions
2014-04-14 22:02:14 -07:00
Nick Parlante
ab7d3b526b Multiple-choice features
Features by Jeff Ericson and Nick Parlante squashed
down to one commit.

-shuffle of choices within a choicegroup (Nick)
-answer-pool subsetting within a choicegroup (Jeff)
-masking of choice names within a choicegroup, (Nick)
 used by shuffle and answer-pool
-targeted-feedback within a multiplechoiceresponse (Jeff)
-delay-between-submissions capa feature (Jeff)
2014-04-14 15:48:29 -07:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control
Video: Refactor speed control.
2014-04-11 19:38:04 +03:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions.
JIRA: FOR-429
2014-04-10 15:44:30 -04:00
Jay Zoldak
9957b1aa8e Disable discussion service setting for lettuce tests 2014-04-10 11:51:20 -04:00
Carson Gee
13af6fc1ee Refactored terminology and added loop break for optimization 2014-04-09 14:10:52 -04:00
Andy Armstrong
2bf64d76d7 Remove feature flag for testing on container pages 2014-04-09 13:52:21 -04:00
Carson Gee
4844a50405 Add test in import code to make sure two overlapping courses aren't imported 2014-04-09 12:54:12 -04:00
Andy Armstrong
a3e26e6824 Implement next round of code reviews 2014-04-09 12:15:38 -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
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
dce075a852 Changes based upon code review comments 2014-04-09 10:32:12 -04:00
Andy Armstrong
df32f109c7 Refactor test logic for switching editor tabs 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
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
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
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03: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
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
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
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
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
zubiar-arbi
2b389a2dfa raise ItemNotFoundError if course not found in modulestore (course_listing)
STUD-1455
2014-03-31 14:12:38 +05:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page.
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00