Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 3db4f43fe4 Merge pull request #3009 from jazkarta/upgrade-jsdraw-input Ned Batchelder 2014-03-24 10:05:08 -04:00
• 1cd6e1dc7e Move code style block button. cahrens 2014-03-24 09:43:49 -04:00
• 0953583d38 Change code editor icon to say HTML. cahrens 2014-03-24 09:41:45 -04:00
• ed51a664f4 replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar Frances Botsford 2014-03-24 09:42:12 -04:00
• ca6850284d Merge pull request #3020 from edx/sarina/LMS-2357 Sarina Canelake 2014-03-24 09:11:24 -04:00
• 043f036165 Added myself to author file William Desloge 2014-03-24 11:35:26 +01:00
• d6fd793742 Added ENABLE_MKTG_SITE to Features William Desloge 2014-03-24 11:29:51 +01:00
• c2866949fc Merge pull request #2953 from edx/anton/check-transcripts-in-china Anton Stupak 2014-03-24 11:48:14 +02:00
• bd4be00ae4 BLD-534: Add acceptance test. polesye 2014-03-17 14:20:43 +02:00
• 982f24aed1 Merge pull request #3026 from edx/markhoeber/documentation/STUD-1458 Mark Hoeber 2014-03-23 12:38:20 -04:00
• ee99ca4509 Merge pull request #3031 from edx/zoldak/disable-failing-bok-choy-test Jay Zoldak 2014-03-22 09:48:46 -04:00
• 0931c76a2a Disable failing bok-choy test_acid_block_editor test Jay Zoldak 2014-03-22 09:18:31 -04:00
• d88d86120e Merge pull request #3017 from edx/zoldak/bok-choy-version-upgrade Jay Zoldak 2014-03-22 08:32:48 -04:00
• bb8800d499 Disable intermittently failing ORA tests Jay Zoldak 2014-03-21 16:03:04 -04:00
• a00007b837 Merge pull request #3024 from edx/zoldak/update-se-version Jay Zoldak 2014-03-22 07:45:02 -04:00
• 454da6fefc i18n Inst Dash enrolled students profile table Sarina Canelake 2014-03-21 13:47:45 -04:00
• c2933d9221 i18n Inst Dash pending tasks table Sarina Canelake 2014-03-21 13:16:31 -04:00
• 7cf093606c i18n Inst Dash Email tab Sarina Canelake 2014-03-21 11:52:09 -04:00
• 8dd1210cfc i18n Inst Dash Analytics tab Sarina Canelake 2014-03-21 11:51:43 -04:00
• 71931bcf0f i18n Inst Dash Membership tab Sarina Canelake 2014-03-21 09:35:54 -04:00
• 1fe68fafa2 Merge pull request #2530 from edx/jrbl/certs_regen_handy_flags Joe Blaylock 2014-03-21 14:36:25 -07:00
• db615248cb Update Authors file to add Raees and Ammar Jay Zoldak 2014-03-21 15:52:04 -04:00
• 8135f4d413 Temporarily disable video autoplay selenium tests Jay Zoldak 2014-03-21 15:47:24 -04:00
• 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. Jay Zoldak 2014-03-21 13:06:30 -04:00
• 8f6980b212 Use compressed CodeMirror file. cahrens 2014-03-21 16:41:13 -04:00
• d752894604 Update to page help on new Pages page in Studio Mark Hoeber 2014-03-21 16:33:26 -04:00
• 9054c621fc keeping the component editor inside the component window Frances Botsford 2014-03-21 15:47:32 -04:00
• cd81b5aa2b Temporarily disable video autoplay selenium tests Jay Zoldak 2014-03-21 15:47:24 -04:00
• a9b918404b Remove unnecessary helper method. cahrens 2014-03-21 15:40:53 -04:00
• a6b18dea80 Fire events before and after the link dialog is shown. cahrens 2014-03-21 15:39:44 -04:00
• 3bcf619f0d Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2 Nimisha Asthagiri 2014-03-21 15:13:22 -04:00
• 6e5dd79ce0 Update selenium version Jay Zoldak 2014-03-21 15:03:46 -04:00
• bb0a58abf7 Code review feedback. cahrens 2014-03-21 15:00:31 -04:00
• 91e120eea0 Unicode strings for server error page David Baumgold 2014-03-21 14:50:55 -04:00
• b0c35982a6 Change the event handling for image plugin. cahrens 2014-03-21 14:33:20 -04:00
• d3828f929e Fire events before and after the image dialog is shown. cahrens 2014-03-21 14:22:27 -04:00
• d89ebedcd2 Upgrade version of TinyMCE to 4.0.16. cahrens 2014-03-20 16:28:11 -04:00
• 7ce576dc50 Changed name of "code" toolbar button to "Code block". cahrens 2014-03-20 16:17:25 -04:00
• 677f39dd09 Change the name of the button to "Edit HTML". cahrens 2014-03-20 16:16:59 -04:00
• d623a4e480 Updates from code review. cahrens 2014-03-20 16:11:45 -04:00
• fb6afc708d pep8 cahrens 2014-03-20 12:40:00 -04:00
• e1908b5ab2 Fire an event with the link plugin closes so we can rewrite links. cahrens 2014-03-20 10:46:01 -04:00
• ffbba2ba0c Update tinymce paths. cahrens 2014-03-19 21:38:27 -04:00
• 6c1d369b71 Remove unused testing templates and unused tabs. cahrens 2014-03-19 21:29:04 -04:00
• 9797354a5e Remove unnecessary code. cahrens 2014-03-19 21:12:22 -04:00
• 09643c8738 Add test for code format toolbar button. cahrens 2014-03-19 20:50:11 -04:00
• 07d54be64d Add tests for toolbar buttons and converting links. cahrens 2014-03-19 19:11:35 -04:00
• cc2fec2e1a Allow TinyMCE to create p's, else formatting doesn't work. cahrens 2014-03-19 16:52:51 -04:00
• b1f4d28e46 Test for style block being maintained. cahrens 2014-03-19 16:36:35 -04:00
• d73f65c3a8 Make sure to strip out temporary caret. cahrens 2014-03-19 16:22:30 -04:00
• f31f936041 Update acceptance test for image plugin. cahrens 2014-03-18 14:11:14 -04:00
• 28dc8e0e1a Update unit tests. cahrens 2014-03-18 12:12:16 -04:00
• 7ac1e7bb75 reordered the tinymce buttons Frances Botsford 2014-03-18 10:19:50 -04:00
• b1b0d16a70 made the codemirror look more studio-like Frances Botsford 2014-03-18 09:54:55 -04:00
• f71e333357 Change how we detect that an image has been inserted. cahrens 2014-03-17 15:26:20 -04:00
• 1e06fd3302 fixed tinymce visual editor css Frances Botsford 2014-03-17 16:36:46 -04:00
• 9ec3a2da23 Remove CodeMirror tabbed editor. cahrens 2014-03-17 14:47:36 -04:00
• 9ac94fc4ac Fire events when CodeMirror Editor is open and closed. cahrens 2014-03-17 14:47:13 -04:00
• f6acab9d9e Modify paths for location of CodeMirror files. cahrens 2014-03-17 12:33:07 -04:00
• a14574ecad Version 1.3 of CodeMirror plugin. cahrens 2014-03-14 16:16:31 -04:00
• 1ece49c346 Delete old Studio skin. cahrens 2014-03-13 17:17:54 -04:00
• 0d0ace45fa Get handling of static image links working again. cahrens 2014-03-13 17:14:50 -04:00
• 9bc0638f23 adding new studio skin for TinyMCE4 Frances Botsford 2014-03-06 11:52:13 -05:00
• 0ddc3a6556 Changes to support Bulk e-mail usage. cahrens 2014-02-21 11:09:02 -05:00
• 2ae2ec9427 Include all the controls on the toolbar that we previously had. cahrens 2014-02-20 13:10:16 -05:00
• dda5866180 new tinymce js changes to support new tinymce scss changes for alignments Abdallah 2014-02-13 18:02:42 +02:00
• 1c644fcf2c deleted old tinymce Abdallah 2014-02-13 17:49:25 +02:00
• 767feb9396 Merge pull request #2948 from carsongee/cg/cas_attribute_callback Carson Gee 2014-03-21 14:26:49 -04:00
• e86b4a12dc Changes for viewing built-in tabs in studio Nimisha Asthagiri 2014-02-28 14:57:42 -05:00
• 91c0b8ee86 UX changes for course navigation manipulation Frances Botsford 2014-02-24 11:19:56 -05:00
• c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions Usman Khalid 2014-03-21 21:12:30 +05:00
• 52b1149541 Merge pull request #3016 from edx/valera/comment_out_some_more Valera Rozuvan 2014-03-21 17:50:05 +02:00
• 8474336a3d Commenting out flaky acceptance tests. Valera Rozuvan 2014-03-21 17:46:49 +02:00
• bba766252f Merge pull request #3015 from louyihua/master David Baumgold 2014-03-21 11:44:18 -04:00
• b54a268fba Merge pull request #3014 from edx/valera/comment_out_failing_acceptance_test Valera Rozuvan 2014-03-21 17:24:34 +02:00
• ce1b62311b Fix a url processing error in 02_html5_video.js louyihua 2014-03-21 23:24:28 +08:00
• bfee966cfe Commenting out a flaky acceptance test. Valera Rozuvan 2014-03-21 16:51:44 +02:00
• c4b81111f2 Merge pull request #2963 from louyihua/master David Baumgold 2014-03-21 10:50:40 -04:00
• d76c3dfc36 Fix the url processing error when there is a query string inside the video source's url louyihua 2014-03-21 22:47:00 +08:00
• 55b0fd08e7 Merge pull request #3011 from edx/valera/delete_old_files Valera Rozuvan 2014-03-21 16:45:26 +02:00
• 32ea61857d Merge pull request #3007 from edx/frances/feature/ui-loading frances botsford 2014-03-21 10:15:11 -04:00
• 5b3a08ddcc Merge pull request #2925 from edx/zub/bugfix/std1433-importunicodename zubair-arbi 2014-03-21 19:01:26 +05:00
• 4bbc470844 Merge pull request #2988 from edx/anton/fix-multiple-image-inputs Anton Stupak 2014-03-21 14:03:54 +02:00
• ce7e7740c4 Merge pull request #3001 from edx/anton/fix-flaky-acceptance-test Anton Stupak 2014-03-21 14:03:45 +02:00
• bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment Sarina Canelake 2014-03-21 07:45:09 -04:00
• 7e9ebb09a0 Removed unused code that is over 2 years old. Valera Rozuvan 2014-03-21 13:29:51 +02:00
• e914286ba2 Fixed email in authors.txt Usman Khalid 2014-03-21 16:12:38 +05:00
• 00bf5e4fce use unicode strings for slug and regex STUD-1433 zubiar-arbi 2014-03-21 15:44:25 +05:00
• f3f1aa2943 Fix acceptance test. polesye 2014-03-20 18:02:19 +02:00
• 4ef46ef10e Upgrade jsdraw input to latest version. Chris Rossi 2014-03-20 17:06:21 -04:00
• b0a7443570 updated pdf viewer Dave St.Germain 2014-03-17 10:04:51 -04:00
• 05ea675f67 Merge pull request #2959 from edx/dcs/remove-junk-from-codemirror Dave St.Germain 2014-03-20 16:45:19 -04:00
• 066d04f595 Simple email checking for batch enrollment on inst dash Sarina Canelake 2014-03-19 09:59:14 -04:00
• b8ceb5ab7e Merge pull request #2983 from edx/will/update-xblock Will Daly 2014-03-20 14:57:15 -04:00
• 376b040775 Removed circuit editor setup code that had always been in codemirror-compressed.js Dave St.Germain 2014-03-17 12:21:00 -04:00
• 3c1df5d96c Merge pull request #2904 from edx/dcs/a11y-header Dave St.Germain 2014-03-20 14:07:32 -04:00
• b695bceeeb Merge pull request #2997 from edx/zoldak/fix-pragma-pep8 Jay Zoldak 2014-03-20 13:56:00 -04:00
• 1f5ae87f60 BDL-810: Fix image mapped inputs. polesye 2014-03-19 16:31:51 +02:00
• 385880d8ec Merge pull request #2989 from edx/talbs/fix-lms-contentbackground Brian Talbot 2014-03-20 10:38:15 -04:00
• 28d6d5678b Merge pull request #2996 from edx/anton/add-selecton-on-focus-for-time-editors Anton Stupak 2014-03-20 16:35:27 +02:00