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

7870 Commits

Author SHA1 Message Date
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API 
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
 2014-03-28 10:34:34 +02:00
Valera Rozuvan
b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc 
Update doc string for YouTube stub server.
 2014-03-28 09:15:35 +02:00
Dave St.Germain
a6bde7cc9e Fix broken test due to refactoring. 2014-03-27 16:44:07 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server. 
Included information on how to launch the server
on its own.
EOF
 2014-03-27 21:21:38 +02:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
David Baumgold
2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver 
Paver v3
 2014-03-26 13:41:05 -04: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
jmclaus
61752e69ff Added template for iFrames. [BLD-611] 2014-03-26 05:03:43 +01:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
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