Commits · 3c2206f89d076e3aecfb97474a4c34e78bcae30a · Yannis Barlas / editoria

Jan 14, 2017
- Merged in overlapping-commnets-experimental (pull request #22) · 3c2206f8
  Yannis Barlas authored 8 years ago
```
Overlapping commnets experimental
```
  3c2206f8
- cleanup & comments · 921e6df6
  john authored 8 years ago
  
  921e6df6
- resolve choosing active comment logic · 3ba766c9
  john authored 8 years ago
  
  3ba766c9
- round active comment border · 4f06972a
  john authored 8 years ago
  
  4f06972a
- Merged in ink-icon (pull request #21) · 145f3655
  Yannis Barlas authored 8 years ago
```
improve appearance of upload icon next to dropdown caret
```
  145f3655
- improve appearance of upload icon next to dropdown caret · 62672ff1
  john authored 8 years ago
  
  62672ff1
- Merged in save-button-fix (pull request #20) · a8c74a76
  Yannis Barlas authored 8 years ago
```
fix save button not working
```
  a8c74a76
- cleanup · 61a48654
  john authored 8 years ago
  
  61a48654
- fix save button not working · caf5667e
  john authored 8 years ago
  
  caf5667e
- Merged in ink-fixes (pull request #19) · 5b0f7031
  Yannis Barlas authored 8 years ago
```
handle ink imports with surrounding html tag
```
  5b0f7031
- handle ink imports with surrounding html tag · 4d1415d5
  john authored 8 years ago
  
  4d1415d5
- minor logic fix · edd8e538
  john authored 8 years ago
  
  edd8e538
- add todo · b8de600d
  john authored 8 years ago
  
  b8de600d
- override substance inline node creation to allow overlapping comments with the same id · 86d219f2
  john authored 8 years ago
  
  86d219f2
- fix: can create new comment · a0c2a304
  Yannis Barlas authored 8 years ago
  
  a0c2a304
- add and remove background color from active comments · e012dfd4
  Yannis Barlas authored 8 years ago
  
  e012dfd4
- do not show bubble when on the border of a comment · 7689097e
  Yannis Barlas authored 8 years ago
  
  7689097e
- remove active comment when selection larger than comment · 8d20c95b
  Yannis Barlas authored 8 years ago
  
  8d20c95b
- do not focus textarea on comment bubble click · d8ab57a0
  Yannis Barlas authored 8 years ago
  
  d8ab57a0
- hide bubble when you have clicked to add a new commnet · 9b8c27fd
  chris authored 8 years ago
  
  9b8c27fd
- fix overlapping bugs · c6483118
  chris authored 8 years ago
  
  c6483118
- distinguish overlapping comments · 1f1d7bdb
  chris authored 8 years ago
  
  1f1d7bdb
- fix when creating a new comment · 460abe78
  chris authored 8 years ago
  
  460abe78
- distinguish active commnet in overlapping · 99be98f2
  chris authored 8 years ago
  
  99be98f2
- hide bubble · a354f067
  chris authored 8 years ago
  
  a354f067
- overlapping comments working · aef0388d
  chris authored 8 years ago
  
  aef0388d
- check if annotation is comment when creating a new one instead of command states are active · e0d72cc3
  chris authored 8 years ago
  
  e0d72cc3
- create overlapping comments · 1e3f7084
  chris authored 8 years ago
  
  1e3f7084
Jan 13, 2017
- Merged in track-changes (pull request #18) · ddb5866d
  Yannis Barlas authored 8 years ago
```
Track changes
```
  ddb5866d
- disable undo/redo handlers for now · 9b3d4112
  john authored 8 years ago
  
  9b3d4112
- attempt to fix bug with comments losing correct position when track change view mode is toggled · 99976dfa
  john authored 8 years ago
  
  99976dfa
- add tooltip with creator username over tracked change · d085173d
  john authored 8 years ago
  
  d085173d
- fix bug with deletion not being accepted · 966c6a81
  john authored 8 years ago
  
  966c6a81
- do not open line height for tracked changes if the user cannot resolve them · 31a06083
  john authored 8 years ago
  
  31a06083
- fix selection to old one · 5e524d1d
  chris authored 8 years ago
  
  5e524d1d
Jan 12, 2017
- if author don't add line height · 55f43f3b
  chris authored 8 years ago
  
  55f43f3b
- no double accept/reject containers when selecting part of the track annotation · 2f0d3697
  john authored 8 years ago
  
  2f0d3697
- fix track changes view button being disabled in read only mode · 2d374275
  john authored 8 years ago
  
  2d374275
- fix cursor over track changes toggle · cf2bcd2c
  john authored 8 years ago
  
  cf2bcd2c
- fix surface not being focused · bdf4f754
  john authored 8 years ago
  
  bdf4f754