cahrens
1cd6e1dc7e
Move code style block button.
2014-03-24 09:44:00 -04:00
cahrens
0953583d38
Change code editor icon to say HTML.
2014-03-24 09:44:00 -04:00
Frances Botsford
ed51a664f4
replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar
2014-03-24 09:42:12 -04:00
Sarina Canelake
ca6850284d
Merge pull request #3020 from edx/sarina/LMS-2357
...
Finish i18n of beta instructor dashboard
2014-03-24 09:11:24 -04:00
William Desloge
043f036165
Added myself to author file
2014-03-24 11:35:26 +01:00
William Desloge
d6fd793742
Added ENABLE_MKTG_SITE to Features
2014-03-24 11:29:51 +01:00
Anton Stupak
c2866949fc
Merge pull request #2953 from edx/anton/check-transcripts-in-china
...
Video: Add acceptance test to verify transcripts for non-Youtube countries.
2014-03-24 11:48:14 +02:00
polesye
bd4be00ae4
BLD-534: Add acceptance test.
2014-03-24 08:47:12 +02:00
Mark Hoeber
982f24aed1
Merge pull request #3026 from edx/markhoeber/documentation/STUD-1458
...
Update to page help on new Pages page in Studio
2014-03-23 12:38:20 -04:00
Jay Zoldak
ee99ca4509
Merge pull request #3031 from edx/zoldak/disable-failing-bok-choy-test
...
Disable failing bok-choy test_acid_block_editor test
2014-03-22 09:48:46 -04:00
Jay Zoldak
0931c76a2a
Disable failing bok-choy test_acid_block_editor test
2014-03-22 09:18:31 -04:00
Jay Zoldak
d88d86120e
Merge pull request #3017 from edx/zoldak/bok-choy-version-upgrade
...
Update edx-platform page objects and tests
2014-03-22 08:32:48 -04:00
Jay Zoldak
bb8800d499
Disable intermittently failing ORA tests
2014-03-22 07:50:44 -04:00
Jay Zoldak
a00007b837
Merge pull request #3024 from edx/zoldak/update-se-version
...
Update selenium version
2014-03-22 07:45:02 -04:00
Sarina Canelake
454da6fefc
i18n Inst Dash enrolled students profile table
...
LMS-2357
2014-03-21 17:49:13 -04:00
Sarina Canelake
c2933d9221
i18n Inst Dash pending tasks table
...
LMS-2357
2014-03-21 17:49:13 -04:00
Sarina Canelake
7cf093606c
i18n Inst Dash Email tab
...
LMS-2357
2014-03-21 17:49:13 -04:00
Sarina Canelake
8dd1210cfc
i18n Inst Dash Analytics tab
...
LMS-2357
2014-03-21 17:49:12 -04:00
Sarina Canelake
71931bcf0f
i18n Inst Dash Membership tab
...
LMS-2357
2014-03-21 17:49:12 -04:00
Joe Blaylock
1fe68fafa2
Merge pull request #2530 from edx/jrbl/certs_regen_handy_flags
...
Certificates: Additional flags for regenerate_user
2014-03-21 14:36:25 -07:00
Jay Zoldak
db615248cb
Update Authors file to add Raees and Ammar
2014-03-21 17:10:22 -04:00
Jay Zoldak
8135f4d413
Temporarily disable video autoplay selenium tests
2014-03-21 17:10:22 -04:00
Jay Zoldak
806a6b9f99
Update edx-platform page objects and tests to be compatible with new bok-choy version
...
Change expectedFailure decorators to skip, because that still takes
a screenshot as if it were an error and at least one of those
take a super long time when running locally on devstack.
2014-03-21 17:10:15 -04:00
cahrens
8f6980b212
Use compressed CodeMirror file.
2014-03-21 16:41:42 -04:00
Mark Hoeber
d752894604
Update to page help on new Pages page in Studio
...
STUD-1458
Modified the edit-tabs template and the preview-lms-staticpages image
used in the modal.
2014-03-21 16:33:26 -04:00
Frances Botsford
9054c621fc
keeping the component editor inside the component window
2014-03-21 15:47:32 -04:00
Jay Zoldak
cd81b5aa2b
Temporarily disable video autoplay selenium tests
2014-03-21 15:47:24 -04:00
cahrens
a9b918404b
Remove unnecessary helper method.
2014-03-21 15:40:53 -04:00
cahrens
a6b18dea80
Fire events before and after the link dialog is shown.
...
This allows us to convert the static links.
2014-03-21 15:39:44 -04:00
Nimisha Asthagiri
3bcf619f0d
Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2
...
Frances/feature/studio nav manipulation2
2014-03-21 15:13:22 -04:00
Jay Zoldak
6e5dd79ce0
Update selenium version
2014-03-21 15:03:46 -04:00
cahrens
bb0a58abf7
Code review feedback.
2014-03-21 15:00:31 -04:00
David Baumgold
91e120eea0
Unicode strings for server error page
2014-03-21 14:50:55 -04:00
cahrens
b0c35982a6
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).
2014-03-21 14:49:12 -04:00
cahrens
d3828f929e
Fire events before and after the image dialog is shown.
...
We use this to rewrite links.
2014-03-21 14:49:11 -04:00
cahrens
d89ebedcd2
Upgrade version of TinyMCE to 4.0.16.
...
Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422
2014-03-21 14:49:11 -04:00
cahrens
7ce576dc50
Changed name of "code" toolbar button to "Code block".
2014-03-21 14:42:00 -04:00
cahrens
677f39dd09
Change the name of the button to "Edit HTML".
...
Changed menu name for consistency, but we don't show it.
2014-03-21 14:42:00 -04:00
cahrens
d623a4e480
Updates from code review.
2014-03-21 14:42:00 -04:00
cahrens
fb6afc708d
pep8
2014-03-21 14:42:00 -04:00
cahrens
e1908b5ab2
Fire an event with the link plugin closes so we can rewrite links.
2014-03-21 14:41:59 -04:00
cahrens
ffbba2ba0c
Update tinymce paths.
2014-03-21 14:41:59 -04:00
cahrens
6c1d369b71
Remove unused testing templates and unused tabs.
2014-03-21 14:41:59 -04:00
cahrens
9797354a5e
Remove unnecessary code.
2014-03-21 14:41:59 -04:00
cahrens
09643c8738
Add test for code format toolbar button.
2014-03-21 14:41:59 -04:00
cahrens
07d54be64d
Add tests for toolbar buttons and converting links.
2014-03-21 14:41:59 -04:00
cahrens
cc2fec2e1a
Allow TinyMCE to create p's, else formatting doesn't work.
2014-03-21 14:41:59 -04:00
cahrens
b1f4d28e46
Test for style block being maintained.
2014-03-21 14:41:58 -04:00
cahrens
d73f65c3a8
Make sure to strip out temporary caret.
...
It can get left behind in style blocks.
2014-03-21 14:41:58 -04:00
cahrens
f31f936041
Update acceptance test for image plugin.
2014-03-21 14:41:58 -04:00
