Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1630 Commits

Author SHA1 Message Date
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
Frances Botsford
1e06fd3302 fixed tinymce visual editor css 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
Frances Botsford
9bc0638f23 adding new studio skin for TinyMCE4 2014-03-21 14:41:56 -04:00
Abdallah
1c644fcf2c deleted old tinymce 2014-03-21 14:41:56 -04: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
Dave St.Germain
b0a7443570 updated pdf viewer 2014-03-20 17:00:41 -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
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
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
Frances Botsford
d685baf478 added loading pattern to studio 2014-03-18 17:11:51 -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
Dave St.Germain
dbd4e73b04 Fixes LMS-2352 by unifying :hover and :focus styles. 2014-03-14 11:49:00 -04:00
frances botsford
c87a1138a3 Merge pull request #2923 from lduarte1991/master 
CSS changes regarding TinyMCE in annotation tool & accessibility issues
 2014-03-13 12:55:55 -04:00
Dave St.Germain
da72cd355d Fixes STUD-1434 by including the CodeMirror css mode in 
codemirror-compressed.js
 2014-03-13 10:12:25 -04:00
lduarte1991
e52e544fb6 As per request #2898, changed the css for annotator tool to affect tinymc only when in annotator-wrapper. 
Also removed the outline:none for accessibility requirements and
removed two redundant css files from lms.
 2014-03-12 17:09:20 -04:00
Giulio Gratta
1cd5a80d1e replace unicode 'X' with font-awesome 'remove' 2014-03-11 12:48:58 -07:00
Dave St.Germain
aaf4515ac3 remove old version of codemirror, to prevent confusion 2014-03-10 09:43:56 -04:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
Greg Price
b4caf75cbb Make forum comment buttons activate by keyboard 
Neither edit nor delete activated on pressing the space key.
 2014-03-04 10:42:07 -05:00
Dave St.Germain
601b5a8ceb Merge pull request #2518 from edx/dcs/a11y-code-grader 
Upgrade CodeMirror to 3.21.0
 2014-03-03 17:57:46 -05:00
Greg Price
db8ad0d20b Add bok choy tests for forum comment editing 2014-03-03 14:26:25 -05:00
Dave St.Germain
08fadac817 Upgrade CodeMirror to 3.21.0 (with accessibility changes from 
http://bgrins.github.io/codemirror-accessible/)
LMS-1802
 2014-02-28 13:44:34 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save 
Native XBlock Studio Save UI
 2014-02-27 10:50:51 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature 
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
 2014-02-27 08:37:58 -05:00
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio 
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
 2014-02-26 16:17:02 -05:00
Greg Price
29e77ed25f Improve UX of pinning feature 
Students no longer see a tooltip nor any button affordance (i.e. cursor
and color change on hover/focus) on the pinning feature. For moderators,
the tooltip is now correct when a thread is pinned, the button is
accessible for keyboard-only users and screen readers, and an error
dialog now appears if an error occurs in attempting to pin/unpin.

JIRA: FOR-192
 2014-02-26 13:59:54 -05:00
Greg Price
0f38892028 Merge pull request #2701 from edx/gprice/edit-forum-comment 
Add UI for editing forum third-level content
 2014-02-26 11:45:14 -05:00
Greg Price
c3dc40d729 Add UI for editing forum third-level content 2014-02-26 10:00:50 -05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
ae34c3fe9f Mark xblock initialization status using css class (in part to make testing easier) 2014-02-25 14:01:37 -05:00
Greg Price
3f48e22448 Fix strings to avoid dangling commas 2014-02-24 14:46:41 -05:00
Jim Abramson
e3a71b1625 Merge pull request #2646 from edx/jsa/forum-delete-comments 
add ability to delete comments on responses in discussions.
 2014-02-22 19:14:59 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
jsa
7d32a90ae2 add ability to delete comments on responses in discussions. 2014-02-20 13:14:11 -05:00
marco
a8417df7ba styling for recursive xblock rendering structure to be used in the container page, pulling from general xblock styles in a separate file. 2014-02-14 12:57:06 -05:00
Julia Hansbrough
48e35d8da2 Removed unused image 2014-02-12 21:49:05 +00:00
frances botsford
ab4432db72 Merge pull request #2561 from edx/frances/studio/bug-editor-number-layout 
Fixed missing polyfill buttons and adjusted layout of number input 
UX-381
 2014-02-11 15:22:53 -05:00
Frances Botsford
34ea03c887 fixed missing polyfill buttons, adjusted layout of number input in component editor 
UX-381
 2014-02-11 15:20:00 -05:00
daniel cebrian
1a62379a43 fixed conflict between Annotator and internationalitation 2014-02-06 16:31:02 +01:00
jsa
427468565f don't show the add response button if responses are not allowed. 
JIRA: FOR-452
 2014-02-05 12:49:52 -05:00
Calen Pennington
f6731342de Make Studio load XBlock fragment js and css on the client-side 
[LMS-1421][LMS-1517]
 2014-02-04 15:38:13 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
 2014-02-04 08:55:36 -05:00
Greg Price
4e1c595472 Merge pull request #2377 from edx/gprice/forum-thread-pagination 
Add pagination of responses to forum threads
 2014-02-03 08:55:20 -08:00
Greg Price
062025eeec Add pagination of repsonses to forum threads 
Users will first be shown the first 25 responses of a viewed thread and
then have the option of loading 100 more at a time until all responses
have been loaded. This mitigates the performance impact of very large
threads by avoiding the need to render and transfer over the network
all content of a large thread at once. It will also allow students with
slower browsers to interact with large threads even if they cannot load
all of the responses.
 2014-01-31 18:17:04 -05:00