Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,086 Commits 1 Branch 0 Tags
ba00a442d73f47eaee2b1cd8375b6ae3764bc20d
Commit Graph

7858 Commits

Author SHA1 Message Date
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper 
remove course location from loc_mapper on delete
 2014-03-25 12:44:04 +05:00
Dave St.Germain
3539c56f89 Added image tags to the whitelist for matlab 2014-03-24 18:53:07 -04:00
Dave St.Germain
93844b3ad1 Merge pull request #3025 from edx/dcs/fix-matlab-response 
Fixes BLD-948 by escaping messages from xqueue, preventing malformed
 2014-03-24 13:54:36 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed 
html from getting onto the page. The client will then unescape the html
and display it.
 2014-03-24 13:28:08 -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
Alexander Kryklia
156b531293 Merge pull request #2732 from edx/alex/fix_typo 
Fix typo in transcripts_utils.
 2014-03-24 18:20:46 +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
cahrens
c8eaa53452 Fix typos. 2014-03-24 10:49:29 -04:00
zubiar-arbi
9d04a9270b remove course location from loc_mapper on delete 2014-03-24 19:26:19 +05:00
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
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
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
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
cahrens
bb0a58abf7 Code review feedback. 2014-03-21 15:00:31 -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
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
e1908b5ab2 Fire an event with the link plugin closes so we can rewrite links. 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
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
28dc8e0e1a Update unit tests. 2014-03-21 14:41:58 -04:00
Frances Botsford
7ac1e7bb75 reordered the tinymce buttons 2014-03-21 14:41:58 -04:00
Frances Botsford
b1b0d16a70 made the codemirror look more studio-like 2014-03-21 14:41:58 -04:00
cahrens
f71e333357 Change how we detect that an image has been inserted. 2014-03-21 14:41:57 -04:00
Frances Botsford
1e06fd3302 fixed tinymce visual editor css 2014-03-21 14:41:57 -04:00
cahrens
9ec3a2da23 Remove CodeMirror tabbed editor. 2014-03-21 14:41:57 -04:00
cahrens
9ac94fc4ac Fire events when CodeMirror Editor is open and closed. 
Needed to switch static links back and forth.
 2014-03-21 14:41:57 -04:00
cahrens
f6acab9d9e Modify paths for location of CodeMirror files. 2014-03-21 14:41:57 -04:00
cahrens
a14574ecad Version 1.3 of CodeMirror plugin. 2014-03-21 14:41:57 -04:00
cahrens
1ece49c346 Delete old Studio skin. 2014-03-21 14:41:57 -04:00
cahrens
0d0ace45fa Get handling of static image links working again. 2014-03-21 14:41:57 -04:00
Frances Botsford
9bc0638f23 adding new studio skin for TinyMCE4 2014-03-21 14:41:56 -04:00
cahrens
0ddc3a6556 Changes to support Bulk e-mail usage. 2014-03-21 14:41:56 -04:00
cahrens
2ae2ec9427 Include all the controls on the toolbar that we previously had. 2014-03-21 14:41:56 -04:00
Abdallah
dda5866180 new tinymce 
js changes to support new tinymce
scss changes for alignments
 2014-03-21 14:41:56 -04:00
Abdallah
1c644fcf2c deleted old tinymce 2014-03-21 14:41:56 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio 
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
 2014-03-21 13:58:01 -04:00
Usman Khalid
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions 
Catch module render exceptions
 2014-03-21 21:12:30 +05:00
David Baumgold
bba766252f Merge pull request #3015 from louyihua/master 
Fix a url processing error in 02_html5_video.js
 2014-03-21 11:44:18 -04:00
louyihua
ce1b62311b Fix a url processing error in 02_html5_video.js 
As the code in this .js will break the url's integrity when there is already a query string inside the video source's url and cause the url to be invalid in some cases (for example, when working with a url from Windows Azure's Media Service, the appended '?' will cause the url being invalid).
I modified the code by first checking whether the url has already had a query string, and if so, then use '&' instead of '?' to prevent the breaking, and it works for the url from Windows Azure's Media Service.
 2014-03-21 23:24:28 +08:00