Commits · dfad040e3d1dd48263ff22d26f0cfcf5577d1472 · Yannis Barlas / editoria

Jan 20, 2017
- Merge branch 'dependency-bump' into 'staging' · dfad040e
  Yannis Barlas authored 8 years ago
```
change to npm version of pubsweet backend

See merge request !1
```
  dfad040e
Jan 19, 2017
- change to npm version of pubsweet backend · 52140809
  john authored 8 years ago
  
  52140809
Jan 15, 2017
- Merged in track-change-fixes (pull request #26) · a3f9f994
  Yannis Barlas authored 8 years ago
```
Track change fixes
```
  a3f9f994
- fix image not showing until selected · 4ffdf4c9
  Yannis Barlas authored 8 years ago
  
  4ffdf4c9
- delete images normally even if track changes is on · fd335f35
  Yannis Barlas authored 8 years ago
  
  fd335f35
- Merged in images (pull request #25) · 6f36ff67
  Yannis Barlas authored 8 years ago
```
Images
```
  6f36ff67
- dodge merge conflict · 0d29aa17
  Yannis Barlas authored 8 years ago
  
  0d29aa17
- restore gitkeep files · 592ab291
  Yannis Barlas authored 8 years ago
  
  592ab291
- minor ui fixes · 2f2e1957
  Yannis Barlas authored 8 years ago
  
  2f2e1957
Jan 14, 2017
- Error handling for images · 81066148
  Alexandros Georgantas authored 8 years ago
  
  81066148
- Merged in cleanup-warnings (pull request #24) · a18aa64f
  Yannis Barlas authored 8 years ago
```
camelcase css for react warning
```
  a18aa64f
- camelcase css for react warning · 7003cabc
  john authored 8 years ago
  
  7003cabc
- Merged in admin-fixes (pull request #23) · 12200454
  Yannis Barlas authored 8 years ago
```
Admin fixes
```
  12200454
- admin can change workflow states · f8814ea6
  john authored 8 years ago
  
  f8814ea6
- admin can edit documents · 4d6ba84e
  john authored 8 years ago
  
  4d6ba84e
- admin can use the team manager · c4e73bf3
  john authored 8 years ago
  
  c4e73bf3
- 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