Commit Graph

7963 Commits

Author SHA1 Message Date
Will Daly
ffeb2f22bc Merge pull request #3242 from edx/will/studio-import-private-fix
Allow import of native XBlocks in draft
2014-04-08 10:02:31 -04:00
Oleg Marshev
015bd57d02 Remove double quoting. 2014-04-08 15:21:31 +03: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
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Oleg Marshev
882a1e0f29 Change resource_link_id on import (BLD-768).
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
2014-04-08 13:03:22 +03:00
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +03:00
Will Daly
5b305476a3 Merge pull request #3225 from edx/will/studio-import-xblock-fixes
Explicitly re-save XBlock fields during import
2014-04-07 15:23:53 -04:00
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542
Change behavior of cohort addition interface
2014-04-07 12:54:38 -04:00
Will Daly
38f819d181 Explicitly re-save XBlock fields during import 2014-04-07 11:49:27 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
2014-04-07 11:40:51 -04:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader
Accessible PDF textbook viewer
2014-04-07 10:32:28 -04:00
Waheed Ahmed
c0b50c7f62 Change user.is_authenticated to user.is_authenticated() in roles.py.
LMS-2442
2014-04-07 12:20:20 +05: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
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Anton Stupak
ec6388b87d Merge pull request #3153 from edx/anton/caption_refactor
Refactor video caption module.
2014-04-04 13:03:02 +03:00
Julia Hansbrough
dd7bae432d Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics
XModule datadog metrics
2014-04-03 16:04:06 -04:00
Julia Hansbrough
aa41635f79 XModule datadog metrics 2014-04-03 18:31:44 +00:00
David Baumgold
63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing
Upgrade pyparsing to 2.0.1
2014-04-03 13:02:54 -04:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Jay Zoldak
b0859941e6 Merge pull request #3181 from edx/zoldak/fix-acid
Add synchronization for rendering to studio xblock tests
2014-04-03 09:24:09 -04:00
polesye
2f572a86ea Refactor video caption module. 2014-04-03 15:40:59 +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
Valera Rozuvan
65a9ce24dd Merge pull request #3170 from edx/valera/remove_ipython_dependent_methods
Remove a method call which depends on IPython.
2014-04-02 23:18:51 +03:00
David Baumgold
cb5e3c8111 Upgrade pyparsing to 2.0.1 2014-04-02 16:09:53 -04:00
Calen Pennington
af486423c8 Merge pull request #3179 from cpennington/problem-check-metrics
Rename metrics so that we capture checks as well as scores and number of attempts
2014-04-02 15:34:00 -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
Jay Zoldak
86cfda32b3 Add synchronization for rendering to studio xblock tests 2014-04-02 13:54:33 -04:00
Valera Rozuvan
638da490ad Remove a method call which depends on IPython.
Because IPython is not part of edx-platform dependencies, the
method assert_in has to be defined.
2014-04-02 16:36:24 +00:00
Calen Pennington
7e23e2655a Rename metrics so that we capture checks as well as scores and number of attempts 2014-04-02 11:54:30 -04:00
cahrens
e4de5d2eda Match our default code editor font size of 13. 2014-04-02 11:12:34 -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
cahrens
b04a0d9986 Update default font size to 14 for bulk e-mail editor (LMS). 2014-04-02 11:12:34 -04:00
Brian Talbot
cc15a267ae revising default (minified) TinyMCE content CSS to be scoped to .mce-content-body element 2014-04-02 11:12:34 -04:00
Brian Talbot
6443486dd0 scoping TinyMCE editing CSS to just tinyMCE context-based elements 2014-04-02 11:12:33 -04:00
cahrens
9d9b2b8e18 Directions for creating codemirror-compressed.js 2014-04-02 11:12:33 -04:00
cahrens
aaf842f83a Add dialog plugin code to compressed JS file and CSS file.
Needed for TinyMCE CodeMirror plugin.
2014-04-02 11:12:33 -04:00
Frances Botsford
786b416bad removing tinymce button border only on active to counteract fun LMS button styles 2014-04-02 11:12:33 -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
cahrens
9c1a42b852 Use postMessage to communicate between the iframe and TinyMCE.
This gets around cross-origin issues on the CDN.

Delete plugin.min.js as the Jake command will minimize into the full file.
2014-04-02 11:06:49 -04:00
David Baumgold
a8b77b99dd Merge pull request #3171 from abdoosh00/unicode-fixes
unicode fixes
2014-04-02 10:45:28 -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
Jay Zoldak
186e3b8612 Temporarily disable studio acid block tests that are failing 2014-04-02 10:21:05 -04:00
David Baumgold
d44b117b4b Merge pull request #3148 from louyihua/localization-fix
Make new-style chinese language codes works for translation
2014-04-02 09:49:54 -04:00
Calen Pennington
f5c919841d Merge pull request #3162 from cpennington/problem-check-metrics
Capture metrics for problem attempts and histograms of problem grades
2014-04-02 09:41:14 -04:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03:00
Alexander Kryklia
90437fa5e0 Display transcript translations for student in their source language. 2014-04-02 10:47:37 +03:00
louyihua
80e1270587 Make new-style chinese language codes works for translation
The old-style chinese language codes used in django 1.4 series are now deprecated, as discussed here:  https://code.djangoproject.com/ticket/18419.
Although majority of browsers still use the old-style language codes, some new browsers such as IE11 in Windows 8.1 start to use the new-style names instead of old-style ones which makes the current chinese translations of edX can't work properly under these browsers.
As there is no easy way for edX to change a higher version of django, I think we could do some mapping here so that the users who use IE11 in Windows 8.1 or other browsers that use the new-style names can view correct translations.
Also, this fix will make users who use one of the language codes:  zh-hk ,  zh-sg  and  zh-mo  can see the correct translations.
2014-04-02 13:12:44 +08:00