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

5705 Commits

Author SHA1 Message Date
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
7ce576dc50 Changed name of "code" toolbar button to "Code block". 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
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
cahrens
f71e333357 Change how we detect that an image has been inserted. 2014-03-21 14:41:57 -04:00
cahrens
9ec3a2da23 Remove CodeMirror tabbed editor. 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
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
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
David Baumgold
c4b81111f2 Merge pull request #2963 from louyihua/master 
Fix incorrect parse of url in video_module.py
 2014-03-21 10:50:40 -04:00
louyihua
d76c3dfc36 Fix the url processing error when there is a query string inside the video source's url 
1. In video_module.py, rewrite the get_ext() function to use the built-in urlparse module to parse the input filename first and then get the file's extension name from the parsed path.
2. In test_video.py, add two test cases (one with query string while the other without) in order to test the rewritten get_ext() function.
 2014-03-21 22:47:00 +08:00
zubair-arbi
5b3a08ddcc Merge pull request #2925 from edx/zub/bugfix/std1433-importunicodename 
use unicode strings for slug and regex
 2014-03-21 19:01:26 +05:00
Anton Stupak
4bbc470844 Merge pull request #2988 from edx/anton/fix-multiple-image-inputs 
Fix image mapped inputs.
 2014-03-21 14:03:54 +02:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
Dave St.Germain
05ea675f67 Merge pull request #2959 from edx/dcs/remove-junk-from-codemirror 
Removed circuit editor setup code that had always been in codemirror-compressed.js
 2014-03-20 16:45:19 -04:00
Dave St.Germain
376b040775 Removed circuit editor setup code that had always been in 
codemirror-compressed.js
 2014-03-20 14:33:32 -04:00
Dave St.Germain
3c1df5d96c Merge pull request #2904 from edx/dcs/a11y-header 
Remove course name from page H1, and slightly improve sequence navigation
 2014-03-20 14:07:32 -04:00
Jay Zoldak
b695bceeeb Merge pull request #2997 from edx/zoldak/fix-pragma-pep8 
Fix pylint disable pragmas that were pep8 violations
 2014-03-20 13:56:00 -04:00
polesye
1f5ae87f60 BDL-810: Fix image mapped inputs. 2014-03-20 16:55:08 +02:00
Waheed Ahmed
817df15c47 Merge pull request #2967 from edx/waheed/lms2275-fix-html-tab-in-bulk-email-feature 
Fixed HTML tab in bulk email feature on firefox.
 2014-03-20 19:31:43 +05:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds 
a page level javascript SR object to enable reading of alert messages.
LMS-2158
 2014-03-20 09:53:44 -04:00
Waheed Ahmed
d364a71e8f Fixed HTML tab in bulk email feature on firefox. 
LMS-2275
 2014-03-20 18:43:02 +05:00
Dave St.Germain
da79ae2b4d Merge pull request #2946 from edx/dcs/a11y-focus-hover 
Fixes LMS-2352 by unifying :hover and :focus styles.
 2014-03-19 14:39:54 -04:00
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module. 
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
 2014-03-19 19:30:45 +02:00
louyihua
a458b90d37 Fix incorrect parse of url in video_module.py 
Sometimes the video url may look like 'http://abc.com/path/video.mp4?xxxx'.
(For example, the Windows Azure's media service will offer such type of url.)
The original code in video_module.py will produce 'mp4?xxxx' instead of 'mp4'
as the extension of a filename for such type of url, and therefore the video
will be non-playable. The fix here uses the built-in urlparse module to retrive
only the path component from a url and therefore the extension 'mp4' will be
correctly fetched.
 2014-03-19 10:30:25 +08:00
David Baumgold
ac4caf0b59 Merge pull request #2969 from edx/db/fix-mkdir-error 
Mongo modulestore: create data dir
 2014-03-18 16:52:35 -04:00
Diana Huang
865496cc2e Merge pull request #2973 from edx/diana/ab-import-export 
Fix split_test import and export.
 2014-03-18 15:41:25 -04:00
Diana Huang
6f7c73cd4f Fix split_test import and export. 
LMS-2405
 2014-03-18 14:15:13 -04:00
David Baumgold
a564d4d9bf Ensure that mongo modulestore can create its data directory if it does not exist on disk 2014-03-18 09:38:08 -04:00
Valera Rozuvan
0f0b2622eb Merge pull request #2942 from edx/valera/start_introduction_of_jslint 
Start introduction of JSLint for JavaScript
 2014-03-18 08:34:39 +02:00
Calen Pennington
c4c998b55a Merge pull request #2954 from cpennington/pure-xblocks-progress-page 
Fix LMS-2349 (Progress page broken for pure xblocks)
 2014-03-17 12:01:30 -04:00
Valera Rozuvan
54d1af1679 Update 10_main.js 
Removing JSLint configuration.
 2014-03-17 17:30:31 +02:00
Calen Pennington
a5498bcbd7 Make progress page work with pure xblocks 
[LMS-2349]
 2014-03-17 10:45:14 -04:00
Dave St.Germain
2a20b3f67e This fixes LMS-2387 by removing a resize call that prevented scrolling. 
It also enables syntax highlighting for matlab input fields, which
wasn't previously enabled.
 2014-03-17 10:35:53 -04:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Valera Rozuvan
9d21d75f6e Initial commit. 2014-03-17 08:12:45 +02:00
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language. 
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
 2014-03-14 18:30:42 +02:00
Dave St.Germain
dbd4e73b04 Fixes LMS-2352 by unifying :hover and :focus styles. 2014-03-14 11:49:00 -04:00