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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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