Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,917 Commits 1 Branch 0 Tags
04fcebaf4740586c67fdbebf0c8a31db26d95f83
Commit Graph

719 Commits

Author SHA1 Message Date
Brian Talbot
71ea2fe27b updating static common/static/sass bourbon/neat files 2014-06-11 21:19:26 -04:00
Jim Abramson
b6bf1b8848 Merge pull request #4056 from edx/jsa/search-spell-correction-fixes 
clarify and internationalize the search spell correction message.
 2014-06-11 13:14:56 -04:00
jsa
5dfd4d4dcc clarify and internationalize the search spell correction message. 2014-06-11 12:41:34 -04:00
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
Julia Hansbrough
7beaf4ed8a Merge pull request #4019 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tools Reverting commit @3bfb633 and updating openseadragon.js for latest build
 2014-06-06 17:30:03 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
Julia Hansbrough
d2b2699166 Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tool: Urgent update for ChinaX AB Testing
 2014-06-06 13:55:10 -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
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -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
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -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
jsa
03977a4666 crude fix for intermittent jasmine test failures 2014-04-29 14:26:12 -04:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00
Greg Price
643069c64c Remove cruft from user profile threads 
This removes the vote button from threads on the user profile, which was
the only interaction available on the page other than the link to view
the thread in the main discussion view.
 2014-04-23 16:07:36 -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
Diana Huang
19b6718c2e Merge pull request #3392 from edx/release 
Release
 2014-04-18 09:34:26 -04:00
Greg Price
92151e3bd6 Render markup in inline threads on expand/collapse 
This was a bug in 3af90ef.
 2014-04-17 15:13:00 -04:00
Diana Huang
639c42dbe2 Merge branch 'release' 2014-04-17 14:02:56 -04:00
Greg Price
862a16cac0 Show full body when expanding inline forum thread 
This was a bug in 3af90ef.

JIRA: FOR-559
 2014-04-17 12:36:03 -04: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
Brian Talbot
5940f1ff1a Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class 
Studio: revising .fake-link utility class to use Sass placeholder and syncing commenting style

LMS: updating Sass ui-disabled placholder syntax and creating utility is-disabled class

Studio: adding in basic action Sass placeholder for use in enabling/disabling UI

Studio: applying action Sass placeholder to publish/create-draft Unit view actions

STUD-1497
 2014-04-16 14:44:30 -04:00
Andy Armstrong
1b2d1858fa Fix duplicate save and cancel buttons in Studio 
STUD-1531

Also add support for refreshing the modal on custom save
 2014-04-15 15:28:22 -04:00
Andy Armstrong
a3b2809601 Fix duplicate save and cancel buttons in Studio 
STUD-1531

Also add support for refreshing the modal on custom save
 2014-04-15 14:04:55 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release' 
Conflicts:
	cms/templates/widgets/source-edit.html
 2014-04-14 14:17:03 -04:00