[GitHub] zeppelin pull request #2848: [Zeppelin-3307] - Improved shared browsing/edit...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/zeppelin/pull/2848


---

[GitHub] zeppelin pull request #2848: [Zeppelin-3307] - Improved shared browsing/edit...

[Savalek]

GitHub user Savalek opened a pull request:

https://github.com/apache/zeppelin/pull/2848

[Zeppelin-3307] - Improved shared browsing/editing for the note

### What is this PR for?
Now if the note is opened in several tabs (or several users are watching or 
editing it), then there may be problems. Loss of code entered by the user, 
reset the cursor position.
This PR adds a basic opportunity for collaborative editing. For the 
organization of joint editing, the library diff-match-patch is used.
PR does not change the logic of operation if the note is used by one person.
Also, maybe this will solve the problem with 
[ZEPPELIN-3131](https://issues.apache.org/jira/browse/ZEPPELIN-3131).

### What type of PR is it?
Improvement

### What is the Jira issue?
[ZEPPELIN-3307](https://issues.apache.org/jira/browse/ZEPPELIN-3307)

### Screenshots (if appropriate)


![gif](https://user-images.githubusercontent.com/30798933/37095049-e6c64e32-2225-11e8-96c8-517ac745a254.gif)


### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/Savalek/zeppelin ZEPPELIN-3307

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/zeppelin/pull/2848.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #2848


commit f87ab507bb8ff68e8e16a75c8f594b387d98a08d
Author: Savalek 
Date:   2018-02-21T13:05:15Z

coop_raw_1

commit 4463ff026131c2f4d996ad3037edd9820670f0c6
Author: Savalek 
Date:   2018-02-21T14:31:00Z

coop icon add

commit d7f449c7d7cfa8d4b56abde4afb2e1e65d790f93
Author: Savalek 
Date:   2018-03-07T11:47:27Z

Merge branch 'master' into ZEPPELIN-3307

# Conflicts:
#   zeppelin-server/pom.xml
#   zeppelin-web/src/app/notebook/notebook.controller.js
#   zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
#   zeppelin-web/src/components/websocket/websocket-event.factory.js
#   zeppelin-web/src/components/websocket/websocket-message.service.js

commit a1700d58b3b0a91915049555a14cd6ed946f1977
Author: Savalek 
Date:   2018-03-07T12:33:08Z

codestyle fix

commit 8651f763429f36f320c596d4bbb78f7f005c5ec2
Author: Savalek 
Date:   2018-03-07T13:35:59Z

delete debug




---