Commit Graph

370 Commits

Author SHA1 Message Date
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings
Removed print context
2014-06-06 12:39:35 -04:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -04:00
lduarte1991
68acf66f6c Annotation Tools: PR Fixes
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
2014-06-05 13:05:37 -04:00
lduarte1991
b22643adc2 Image Annotation Tool: Annotation Mode for AB Testing
Annotation Tools PR Fixes

- forgot to overwrite the previous line
2014-06-05 12:47:48 -04:00
lduarte1991
8429897c82 Text Annotation Tool: Added Instructor Filter and Clear Search 2014-06-05 12:47:48 -04:00
Adam
a415b507d0 Merge pull request #3942 from edx/adam/protocol
load js without specifying protocol
2014-06-03 14:09:20 -04:00
Dave St.Germain
b073cfaece Fixes BLD-1104 2014-06-03 10:30:58 -04:00
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes
Making sure extension comes after annotator css
2014-06-02 10:45:29 -04:00
lduarte1991
de5edcffbb Diacritic Plugin for Annotator TooL: Added CSS and JS files
- UI Fixes for Diacritic Mark Plugin
2014-06-02 10:45:29 -04:00
Adam Palay
cdad4a3257 load js without specifying protocol 2014-05-30 14:02:43 -04:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails
Changes requested in PR
2014-05-23 14:59:31 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
2014-05-23 14:58:18 -04:00
lduarte1991
008bbc224b Image Annotation Tool: Add static images for openseadragon navigation 2014-05-23 14:57:48 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
lduarte1991
c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors
Small plugin fixes
2014-05-23 14:57:16 -04:00
Dave St.Germain
285c07fc22 Addressed review feedback. 2014-05-22 10:40:31 -04:00
Dave St.Germain
232df30b3e support aria-grabbed and aria-dropeffect 2014-05-22 09:51:50 -04:00
Dave St.Germain
f4391b5eb9 fixing drag and drop 2014-05-22 09:51:50 -04:00
lduarte1991
0c1b045f3c Using Edx version of tinymce 2014-05-16 14:02:25 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466"
This reverts commit 59e3cae4c9.
2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
2014-05-09 16:14:42 -04:00
lduarte1991
edeebe7bea Fixes from @singingwolfboy in PR #3466 2014-05-08 11:37:49 -04:00
cahrens
fb150bcf64 Drag and drop on container page.
STUD-1309
2014-05-02 15:09:15 -04:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
David Baumgold
3b49c17c06 Merge pull request #3382 from TheJJ/patch-1
fixed retry invokation for calling setState
2014-04-23 13:34:33 -04:00
Jonas Jelten
3de30aba2e fixed retry invokation for calling setState
to successfully call a function with parameters by setTimeout,
it needs to be a function that will be called by setTimeout internally.

this patch actually enables multiple tries for calling the setState function.
2014-04-18 23:00:25 +02:00
Adam Palay
6d356a4512 change .ui-disabled to .is-disabled 2014-04-17 11:15:02 -04:00
Adam Palay
7636ad3240 Add javascript backup if pointer-event is not supported by browser
(STUD-1498)
2014-04-16 14:44:50 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer"
This reverts commit b0a7443570.
2014-04-08 12:59:04 -04:00
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542
Change behavior of cohort addition interface
2014-04-07 12:54:38 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
2014-04-07 11:40:51 -04:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader
Accessible PDF textbook viewer
2014-04-07 10:32:28 -04:00
cahrens
e4de5d2eda Match our default code editor font size of 13. 2014-04-02 11:12:34 -04:00
Brian Talbot
473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
2014-04-02 11:12:34 -04:00
cahrens
b04a0d9986 Update default font size to 14 for bulk e-mail editor (LMS). 2014-04-02 11:12:34 -04:00
Brian Talbot
cc15a267ae revising default (minified) TinyMCE content CSS to be scoped to .mce-content-body element 2014-04-02 11:12:34 -04:00
cahrens
9d9b2b8e18 Directions for creating codemirror-compressed.js 2014-04-02 11:12:33 -04:00
cahrens
aaf842f83a Add dialog plugin code to compressed JS file and CSS file.
Needed for TinyMCE CodeMirror plugin.
2014-04-02 11:12:33 -04:00
Frances Botsford
786b416bad removing tinymce button border only on active to counteract fun LMS button styles 2014-04-02 11:12:33 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
cahrens
9c1a42b852 Use postMessage to communicate between the iframe and TinyMCE.
This gets around cross-origin issues on the CDN.

Delete plugin.min.js as the Jake command will minimize into the full file.
2014-04-02 11:06:49 -04:00
Abdallah
fe847720ea Upgrade to TinyMCE 4.0.16.
Detailed commit messages:
deleted old tinymce

new tinymce
js changes to support new tinymce
scss changes for alignments

Include all the controls on the toolbar that we previously had.

Changes to support Bulk e-mail usage.

adding new studio skin for TinyMCE4

Get handling of static image links working again.

Delete old Studio skin.

Version 1.3 of CodeMirror plugin.

Modify paths for location of CodeMirror files.

Fire events when CodeMirror Editor is open and closed.

Needed to switch static links back and forth.

Remove CodeMirror tabbed editor.

fixed tinymce visual editor css

Change how we detect that an image has been inserted.

made the codemirror look more studio-like

reordered the tinymce buttons

Update unit tests.

Update acceptance test for image plugin.

Make sure to strip out temporary caret.

It can get left behind in style blocks.

Test for style block being maintained.

Allow TinyMCE to create p's, else formatting doesn't work.

Add tests for toolbar buttons and converting links.

Add test for code format toolbar button.

Remove unnecessary code.

Remove unused testing templates and unused tabs.

Update tinymce paths.

Fire an event with the link plugin closes so we can rewrite links.

pep8

Updates from code review.

Change the name of the button to "Edit HTML".

Changed menu name for consistency, but we don't show it.

Changed name of "code" toolbar button to "Code block".

Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422

Fire events before and after the image dialog is shown.

We use this to rewrite links.

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).

Code review feedback.

Fire events before and after the link dialog is shown.

This allows us to convert the static links.

Remove unnecessary helper method.

keeping the component editor inside the component window

Use compressed CodeMirror file.

replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar

Change code editor icon to say HTML.

Move code style block button.

Update tests for minor UI changes.

Code editor button no longer shows an icon, and code style toolbar button location has moved.

Fix typos.
2014-04-02 10:35:27 -04:00
Dave St.Germain
1cd932c92b Fixes LMS-2474 by ensuring that readElts reads always reads an element 2014-04-01 11:57:42 -04:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02: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
cahrens
0953583d38 Change code editor icon to say HTML. 2014-03-24 09:44:00 -04:00