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

22819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Carson Gee
767feb9396 Merge pull request #2948 from carsongee/cg/cas_attribute_callback 
Adding ability to give an attribute callback for CAS
 2014-03-21 14:26:49 -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
Frances Botsford
91c0b8ee86 UX changes for course navigation manipulation 2014-03-21 13:18:31 -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
Valera Rozuvan
52b1149541 Merge pull request #3016 from edx/valera/comment_out_some_more 
Commenting out flaky acceptance tests.
 2014-03-21 17:50:05 +02:00
Valera Rozuvan
8474336a3d Commenting out flaky acceptance tests. 2014-03-21 17:46:49 +02: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
Valera Rozuvan
b54a268fba Merge pull request #3014 from edx/valera/comment_out_failing_acceptance_test 
Commenting out a flaky acceptance test.
 2014-03-21 17:24:34 +02: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
Valera Rozuvan
bfee966cfe Commenting out a flaky acceptance test. 2014-03-21 16:51:44 +02: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
Valera Rozuvan
55b0fd08e7 Merge pull request #3011 from edx/valera/delete_old_files 
Removed unused code that is over 2 years old.
 2014-03-21 16:45:26 +02:00
frances botsford
32ea61857d Merge pull request #3007 from edx/frances/feature/ui-loading 
added loading pattern to studio
 2014-03-21 10:15:11 -04: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
Anton Stupak
ce7e7740c4 Merge pull request #3001 from edx/anton/fix-flaky-acceptance-test 
Video: Fix flaky acceptance test.
 2014-03-21 14:03:45 +02:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment 
Simple email checking for batch enrollment on inst dash
 2014-03-21 07:45:09 -04:00
Valera Rozuvan
7e9ebb09a0 Removed unused code that is over 2 years old. 2014-03-21 13:29:51 +02:00
Usman Khalid
e914286ba2 Fixed email in authors.txt 2014-03-21 16:12:38 +05:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
polesye
f3f1aa2943 Fix acceptance test. 2014-03-21 10:46:50 +02:00
Chris Rossi
4ef46ef10e Upgrade jsdraw input to latest version. 2014-03-20 17:06:21 -04:00