Commit Graph

3301 Commits

Author SHA1 Message Date
jmclaus
f05c0aa8f9 HD control is hidden initially. On first play of video, when
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
2014-04-14 10:26:30 -04:00
Sarina Canelake
9a586edf02 InstDash: check Auto-Enroll and Email Students boxes by default 2014-04-11 18:43:43 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04: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
David Baumgold
15a49f8782 Merge pull request #2440 from glowe/prevent-duplicate-checks
Temporarily disable CAPA problem "Check" button.
2014-04-10 11:37:52 -04:00
Andy Armstrong
8059547ed8 Merge pull request #2981 from edx/andya/container-editing
Add "Edit" button to each leaf xblock on the container page
2014-04-10 09:29:32 -04:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination
Add repsonse pagination to inline discussions
2014-04-09 17:55:15 -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
polesye
31e9152936 BLD-753: Add i18n for LTI. 2014-04-09 12:12:52 +03:00
Greg Price
e1de25e128 Update OpenID dialog text
We want to indicate more clearly that the information that we transmit
to the third party is governed by their terms of service and privacy
policy.
2014-04-08 16:43:38 -04:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack,
remove unnecessary code, and clarify what it's doing.
2014-04-08 15:24:48 -04:00
Sarina Canelake
9a352b9125 Unicode support for course names in reverification flow 2014-04-08 13:11:41 -04:00
Sarina Canelake
034105d2e7 Put mailto and em tags outside i18n strings
Signup modal

Contact us form

courseware-error message
2014-04-08 13:09:08 -04:00
Sarina Canelake
2d08b3a394 Fix i18n'd strings to be easier for translators to understand
Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash
2014-04-08 13:09:07 -04:00
Graham Lowe
5e0849d214 Temporarily disable CAPA problem "Check" button.
- update appropriate jasmine tests so that stubbed $postWithPrefix
respects a subset of jQuery promise API.
- add customization for checking state.
- display checking state while button is disabled.
- ensure checking state lasts for at least a second.
2014-04-07 13:17:43 -04:00
marcore
8c2f3fd744 The link to TECH_SUPPORT_EMAIL should have a mailto: protocol ! 2014-04-07 18:26:09 +02: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
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
d2bac9bf8d Merge pull request #2552 from edx/giulio/edit-in-cms-links
Add "View in Studio" links throughout LMS
2014-04-04 11:25:28 -07:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Frances Botsford
e81c12c7a4 switching more wiki icons to use the right format 2014-04-02 15:09:42 -04:00
Greg Price
3af90ef256 Add repsonse pagination to inline discussions 2014-04-02 14:32:58 -04:00
Frances Botsford
4874c45d31 remove double icons in the wiki sidebar 2014-04-02 14:28:40 -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
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
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
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
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
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03: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
Greg Price
2a1ddab224 Improve inline discussion UI
1. Add space between threads
2. Change Show/Hide to Expand/Collapse and visually separate it
3. Limit a thread to 700px high and scroll if longer

Co-authored-by: marco <marcotuts@gmail.com>
2014-04-01 11:52:54 -04:00
louyihua
3b14ee8a04 Fix a decode error in course_about.html and make some string translatable
The strings in share links should be in unicode, otherwise when the name of a course is non-ascii, it will generate a decode error.
And some of these strings is actually translatable, so they should be collected into mako.po.
2014-04-01 23:49:32 +08:00
David Baumgold
cbfe12fc9c Merge pull request #3088 from fmyzjs/patch-3
Update course_about.html
2014-03-31 13:36:55 -04:00
Chris Dodge
ff8a0c6891 password history: just limit the result set range to simplify iteration logic 2014-03-31 10:30:58 -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
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Jason Zhu
a29485960d Update course_about.html
if course title use Chinese or other language got the 500 error when visit the course_about page ,and the log shows :UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-3: ordinal not in range(128)
2014-03-27 23:00:02 +08:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE.
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
2014-03-26 11:06:59 -04:00
louyihua
0316f3b758 i18n: make emails in lms translatable
The email texts in lms/templates/emails are not extracted by rake i18n:generate because the babel_mako.cfg does not include them.
And a several emails are not translatable because they do not use ugettext.
2014-03-26 22:33:21 +08:00
Gabe Mulley
3f31833178 Clean up references to answer distribution-like things
In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
2014-03-24 16:57:56 -04:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace.
All YouTube urls are defined on backend side.
2014-03-24 18:40:28 +02:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade
Upgrade TinyMCE and switch to CodeMirror plugin
2014-03-24 11:53:17 -04:00
David Baumgold
e55bca6bf1 Merge pull request #3023 from edx/db/unicode-server-error-page
Unicode strings for server error page
2014-03-24 11:24:02 -04:00
Sarina Canelake
7cf093606c i18n Inst Dash Email tab
LMS-2357
2014-03-21 17:49:13 -04:00
Sarina Canelake
71931bcf0f i18n Inst Dash Membership tab
LMS-2357
2014-03-21 17:49:12 -04:00
David Baumgold
91e120eea0 Unicode strings for server error page 2014-03-21 14:50:55 -04:00
cahrens
ffbba2ba0c Update tinymce paths. 2014-03-21 14:41:59 -04:00