Commit Graph

22300 Commits

Author SHA1 Message Date
Alexander Kryklia
e3902cbebc Merge pull request #3198 from edx/alex/fix_flaky_video_test_12
Fix flaky test #12
2014-04-03 14:31:06 +03:00
Alexander Kryklia
2a39d28348 Fix flaky test #12
"CC button works correctly w/o english transcript in HTML5 mode of Video component"
2014-04-03 12:45:38 +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
11d078a9cc Merge pull request #3192 from edx/ned/fix-encode-error-when-hashing-resources
Fix hash_resource to avoid encode errors.
2014-04-02 22:03:00 -04:00
Ned Batchelder
732bf3f307 Fix hash_resource to avoid encode errors. 2014-04-02 20:13:50 -04:00
Mark Hoeber
f275f5424b Merge pull request #3165 from edx/markhoeber/documentation/doc-188
Initial Reorg of Setting up Course
2014-04-02 16:26:49 -04:00
Mark Hoeber
69ed998474 Reorganizatio of Setting up Course
DOC-188
2014-04-02 16:26:20 -04:00
Ned Batchelder
bda1471cdf Merge pull request #3178 from edx/ned/private-requirements-in-paver
Paver should install requirements/private.txt
2014-04-02 16:23:42 -04: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
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
Mark Hoeber
42a1f6e35b Merge pull request #3116 from edx/ahodges/documentation/launching
Ahodges/documentation/launching
2014-04-02 13:47:18 -04:00
Alison Hodges
e79cc796fa Initial draft and images for LMS-2381 2014-04-02 13:46:49 -04:00
David Baumgold
092d620185 Merge pull request #3147 from mtyaka/password-reset-email-http
Don't hardcode https protocol in password reset email.
2014-04-02 13:46:45 -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
Ned Batchelder
beb1d74029 Paver should install requirements/private.txt 2014-04-02 11:52:46 -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
Mark Hoeber
b7dc8d18e2 Merge pull request #3137 from edx/markhoeber/documentation/doc-97
Changes for doc-97 - Subsection grading
2014-04-02 11:06:36 -04:00
Matjaz Gregoric
1cb7628d8b Don't hardcode https protocol in password reset email.
Use http or https, depending on the value of `is_secure`.
This is similar to how links in some other email templates work.
2014-04-02 16:46:01 +02: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
1851c0501a Merge pull request #3174 from edx/zoldak/disable-acid
Temporarily disable studio acid block tests that are failing
2014-04-02 10:22:12 -04:00
Jay Zoldak
186e3b8612 Temporarily disable studio acid block tests that are failing 2014-04-02 10:21:05 -04:00
Mark Hoeber
c822abca9f Grading Documentation Update
DOC-97
DOC-176

Added note about grading subsections only, and vertical bars
representing subsections in progress tab
2014-04-02 10:20:22 -04:00
srpearce
d283eac0af Merge pull request #3044 from edx/sylviapearce/documentation/DOC-191
Sylviapearce/documentation/doc 191
2014-04-02 10:04:21 -04:00
Sylvia Pearce
05ef8d892b Instructor- and student-facing documentation for ORA2 2014-04-02 10:03:12 -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
35be2e3032 line fix 2014-04-02 16:40:55 +03:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +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
Calen Pennington
630a0b08ba Capture metrics for problem attempts and histograms of problem grades 2014-04-01 16:35:28 -04:00
Calen Pennington
1bd0bcb8c0 Merge pull request #3091 from cpennington/ora-metrics
Add metrics around old ORA requests
2014-04-01 16:09:11 -04:00
Sarina Canelake
4b1228be92 Merge pull request #3119 from louyihua/translation-fix
Fix a decode error in course_about.html and make some string translatable
2014-04-01 15:43:10 -04:00
Calen Pennington
2689967905 Merge pull request #3158 from cpennington/enrollment-metrics
Emit datadog events for all course enrollments, not just those outside of verified courses
2014-04-01 14:05:10 -04:00
Calen Pennington
0513e144b1 Actually push json parsing all the way down to the bottom of the GradingService get and post methods 2014-04-01 14:04:17 -04:00
Calen Pennington
c9a5e9b88d Record metrics about the staff grading service 2014-04-01 14:04:17 -04:00
Calen Pennington
f2b554db2a Record metrics about the peer grading service 2014-04-01 14:04:17 -04:00
Calen Pennington
6430e7e98c Make GradingServices always return dictionaries, rather than sometimes returning strings 2014-04-01 14:04:16 -04:00
Calen Pennington
bdee9a9857 Correctly catch RubricParsingErrors 2014-04-01 14:04:16 -04:00