Commits · 52051df4d44b72b5ba1ce61f9434b4135c9b52a7 · edx / edx-platform

25 Sep, 2014 1 commit
- Annotation Tools: Thumbnail check breaks on creation · 7f8dd6a1
```
 - Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
```
  lduarte1991 committed 10 years ago
  7f8dd6a1 Browse Directory
24 Sep, 2014 2 commits
- Image Annotation Tool: Fixes _isOpenSeaDragon function · d3fffde3
  lduarte1991 committed 10 years ago
  
  d3fffde3 Browse Directory
- Annotation Tools: Non-critical highlights == undefined fixes · 29cddbca
```
i.e. they should be fixed but don’t cause the whole thing to break.

 - PR fixes

 - Reverted Fix
```
  lduarte1991 committed 10 years ago
  29cddbca Browse Directory
23 Sep, 2014 1 commit
- Image Annotation Tool: Fixes _isOpenSeaDragon function · 56340968
  lduarte1991 committed 10 years ago
  
  56340968 Browse Directory
16 Sep, 2014 1 commit
- [TNL-198] Do not generate JS and CSS source maps in production · 12f280b6
  Tim Babych committed 10 years ago
  
  12f280b6 Browse Directory
12 Sep, 2014 1 commit
- [TNL-293] Annotation Tool: Fixed TinMCE issue when changing units · cf95dc0b
```
- fixed tinymce editors condition to check only positive numbers
```
  lduarte1991 committed 10 years ago
  cf95dc0b Browse Directory
11 Sep, 2014 1 commit
- Annotation Tools: Clean-up · 32040164
  lduarte1991 committed 10 years ago
  
  32040164 Browse Directory
10 Sep, 2014 2 commits
- Annotation Tools: Adding Check for Grouping in MyNotes · d649e208
```
- Grouping instance checked instead of prototype

- adding comments
```
  lduarte1991 committed 10 years ago
  d649e208 Browse Directory
- [TNL-287] Text Annotation Tool: Reply/Grouping Bug Fix · 5dc9e79d
  lduarte1991 committed 10 years ago
  
  5dc9e79d Browse Directory
14 Aug, 2014 2 commits
- - replaced tabs with 4 spaces · f2b34d80
```
 - fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
```
  lduarte1991 committed 10 years ago
  f2b34d80 Browse Directory
- Annotation Tools: Explicit typecasting === changes and reorganizing plugins · a00a2de8
  lduarte1991 committed 10 years ago
  
  a00a2de8 Browse Directory
13 Aug, 2014 1 commit

- replaced tabs with 4 spaces · 63f1d983

 - fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons

committed 10 years ago

63f1d983 Browse Directory

11 Aug, 2014 1 commit
- Annotation Tools: Explicit typecasting === changes and reorganizing plugins · 7114b25a
  lduarte1991 committed 10 years ago
  
  7114b25a Browse Directory
08 Aug, 2014 1 commit
- Annotator Tools: Fix major logic bug in code · 71e9f448
  lduarte1991 committed 10 years ago
  
  71e9f448 Browse Directory
07 Aug, 2014 1 commit
- Annotation Tools: Adding Loading Bar to Annotations Table · c9e51b99
```
- added label below loading gif

 - fixed spacing issues

  - change the error messages in annotator code
```
  lduarte1991 committed 10 years ago
  c9e51b99 Browse Directory
06 Aug, 2014 1 commit
- Annotation Tools: Added Grouping Plug-In · 0ca9bfa7
```
- adding comments

 - spacing issues and indentation
```
  lduarte1991 committed 10 years ago
  0ca9bfa7 Browse Directory
05 Aug, 2014 3 commits
- TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool · fe009f59
```
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
```
  lduarte1991 committed 10 years ago
  fe009f59 Browse Directory
- Text Annotation Tool: Safari Colored Highlights Bug Fix · a1684d2e
```
 - fixed spacing
```
  lduarte1991 committed 10 years ago
  a1684d2e Browse Directory
- Annotations Tools: Fixing major Firefox/Tinymce bug in annotations · 0b770e1d
```
 - fixed issue in Firefox where the init gets called multiple times

 - fixed spacing issues and added more comments

 - fixed indentation, added missing parens in comment, and fixed typo
```
  lduarte1991 committed 10 years ago
  0b770e1d Browse Directory
04 Aug, 2014 1 commit

Annotation Tool: Flagging plugin should now allow instructors to remove flags from annotations · 3e99edd6

Annotation Tools: Added lots of comments, fixed spacing, fixed slice issue

Annotation Tools: i18n fixed for this tool

 - fixed Translator to Translators

Annotation Tools: Removed unnecessary class and worked with element object

committed 10 years ago

3e99edd6 Browse Directory

01 Aug, 2014 2 commits
- Show the enrollment counts for each mode on the instructor dashboard. · eb1d0463
  Dave St.Germain committed 10 years ago
  
  eb1d0463 Browse Directory
- Annotator Tools: Fixing annotator break in login and dashboard · e267409e
  lduarte1991 committed 10 years ago
  
  e267409e Browse Directory
31 Jul, 2014 8 commits
- Annotation Tools: Spacing Issues fixed for catch.js · 6a281dd8
  lduarte1991 committed 10 years ago
  
  6a281dd8 Browse Directory
- Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load · df8d51b9
```
- Made sure that all highlights were removed.

- Forgot closing parens

- added comments to fix
```
  lduarte1991 committed 10 years ago
  df8d51b9 Browse Directory
- Annotation Tools: Code clean-up, formatting, spacing · 98446d1c
  lduarte1991 committed 10 years ago
  
  98446d1c Browse Directory
- Annotation Tools: Fixed Share button to allow selection of text box · 9751244e
  lduarte1991 committed 10 years ago
  
  9751244e Browse Directory
- Annotation Tools: Fixing Share Indentation, Grep Functions and Equality · 4ce70630
  lduarte1991 committed 10 years ago
  
  4ce70630 Browse Directory
- Image Annotation Tool: Fixed Viewport Timeout Issue · eace1413
  lduarte1991 committed 10 years ago
  
  eace1413 Browse Directory
- Annotation Tool: Fixing Table Share bug (2b) · e80992cc
  lduarte1991 committed 10 years ago
  
  e80992cc Browse Directory
- Annotations Tools: Sharing Plugin Fixed with Proper URI · 28f5ed1c
  lduarte1991 committed 10 years ago
  
  28f5ed1c Browse Directory
10 Jul, 2014 1 commit
- Annotation Tool: Removed conflict between tags-annotator and flagging-annotator · a5d8669f
  lduarte1991 committed 10 years ago
  
  a5d8669f Browse Directory
30 Jun, 2014 1 commit
- Fixed IE security warning on course page. · 68a0f4e4
```
LMS-2892
```
  Waheed Ahmed committed 10 years ago
  68a0f4e4 Browse Directory
21 Jun, 2014 1 commit
- Annotations Tools: Commented OSDA code and added clarification to catch changes · cd9c6c5f
  lduarte1991 committed 10 years ago
  
  cd9c6c5f Browse Directory
19 Jun, 2014 1 commit
- Annotation Tools: Removed background-color from image annotations · 95c07383
```
- Also fixed edit bug when annotation is not created first
- Also fixed indentation issues
```
  lduarte1991 committed 10 years ago
  95c07383 Browse Directory
11 Jun, 2014 2 commits

Annotation Tool: PR #4019 · 848c7165

Reverting commit @3bfb633f and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py

committed 10 years ago

848c7165 Browse Directory

Annotation Tool: PR #3969 · fecb2e16

Text Annotation Tool: Added Instructor Filter and Clear Search

Video Annotation Tool: Added Instructor Filter

Image Annotation Tool: Added Instructor Filter

Image Annotation Tool: Annotation Mode for AB Testing

Annotation Tools PR Fixes

- forgot to overwrite the previous line

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

Annotator Tools: OpaqueKeys update for Notes

Annotation Tools: Added CommonAnnotatorMixin

Annotator Tool: Fixed delete bug and factored out settings

Removed print context

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
	lms/djangoapps/notes/views.py

committed 10 years ago

fecb2e16 Browse Directory

06 Jun, 2014 2 commits
- Reverting commit @3bfb633f and updating openseadragon.js for latest build · 894428ea
  lduarte1991 committed 10 years ago
  
  894428ea Browse Directory
- Annotator Tool: Fixed delete bug and factored out settings · 3bfb633f
```
Removed print context
```
  lduarte1991 committed 10 years ago
  3bfb633f Browse Directory
05 Jun, 2014 2 commits

Annotator Tools: OpaqueKeys update for Notes · 9c0d14ea
lduarte1991 committed 10 years ago

9c0d14ea Browse Directory

Annotation Tools: PR Fixes · 68acf66f

- 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

committed 10 years ago

68acf66f Browse Directory