Merge branch 'track-button-disabled' into 'staging' (bb47b71a) · Commits · Yannis Barlas / editoria · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

editoria
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents

Snippets Groups Projects

bb47b71a

Commit bb47b71a authored 7 years ago by

Yannis Barlas

Downloads
- Plain Diff

Merge branch 'track-button-disabled' into 'staging'

fix when track changes is enabled and when it is not

See merge request !2

parents a25a91df 7ded44a8

No related branches found

No related tags found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/components/SimpleEditor/ContainerEditor.js 9 additions, 1 deletion

app/components/SimpleEditor/ContainerEditor.js
app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js 2 additions, 2 deletions

...Editor/elements/track_change/TrackChangeControlCommand.js
app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js 9 additions, 1 deletion

...pleEditor/elements/track_change/TrackChangeControlTool.js

with 20 additions and 4 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment