New branch 'private/pranavk/userlist_backport' available with the following
commits:
commit 7d456c7ac4453f041f9d8821b36097db90e5ca48
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 19:43:57 2016 +0530
loleaflet: Correct comment authorship in non-multiview case
Change-Id: Ieb4958cf42576c71e0d1e744d46bb5bd19111081
commit 973bbc32d491ec4f3b850116f6f160b90cee2a6c
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 19:25:16 2016 +0530
loleaflet: Remove colors from userlist
We don't need them in this branch.
Change-Id: I95cc13783b0406e8b276567e122ce7337f13a692
commit e74bc4cce58b4f72990bafe5acb91c7f567fcc19
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Sun Sep 25 22:47:59 2016 +0530
loleaflet: Show usercolor in userlist
Change-Id: I6be05f36ffc4c00aa986b3873fce1bc5acc6fbf0
(cherry picked from commit 5891371dcacf04182827317482df6b92700aabbd)
commit a6ddcad425511dac50a1506495a316f7bf69a24a
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 19:03:26 2016 +0530
loolwsd: Add customized notifyViewInfo() for non-multiview case
For easy integration of userlist feature with this branch, lets
treat sessionId like viewId in multiview case.
Change-Id: Idb38604cf52ce6800dd868e5849161c5277c6be9
commit b2d81db5a820da9d0a6c3f768c946dc83a440364
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 18:58:11 2016 +0530
loleaflet: Infrastructure for userlist
Change-Id: Ic86c8f332e005ba009c634e51651ed51c457166d
commit 09a1284d7744c14f886c6251bfaf5cc477f3e153
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Sep 20 22:08:14 2016 +0530
loleaflet: Handle new message, 'viewinfo:'
Change-Id: I82d886e3450439bbfd2e4b381cc8f9336bcdd57e
(cherry picked from commit 626eab255a23b985507c08c74558de7a67ce40c8)
commit 379bd0b9b5d34d9611bc7fc1e5e41522a6e2d437
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Sep 1 12:40:58 2016 +0530
loleaflet: userlist l10n fix
Change-Id: Id2be29e018f1c23a8d5b61ad3fbaebc36f1222ec
(cherry picked from commit d3eda7d19857c17d98e4000f712cde61066684fe)
commit ca0b0c59935534cd316474507776e885cc3f5a30
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Sep 1 11:25:08 2016 +0530
loleaflet: User count in user list
Change-Id: Idde4e1bdf1b33590c3b9a8265e059c01943f4777
(cherry picked from commit 04064b2e23c00af284fd671a73af980bda4236cc)
commit 0d77cfbc60d4997a4d77b819e07b4dc8527f733e
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Sep 1 11:08:38 2016 +0530
loleaflet: Better algorithm for adding/removing users from list
Remove them dynamically, rather than creating a new list
everytime.
Change-Id: I3e1a8c603e092fdd727806154a3715139e4f5b2c
(cherry picked from commit 958c0e35341c73f6636ba141f8fe82ea1ceeee21)
commit c1d80d29bdc7cdfea5461152b71d4b9ea23c4c18
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Aug 30 20:23:11 2016 +0530
loleaflet: Notifications when new user joins, leaves
Change-Id: I71b9ffb82fa2a0104df6f2600558b1b094f1195f
(cherry picked from commit d223f2a0e41d8166321044d151de452870f09f3c)
commit 3000917e0dea3afa58e2f8b5aef4f0f46c375dcd
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Aug 30 20:33:28 2016 +0530
loleaflet: Include username in removeview signal
Change-Id: I6b9cdf2712d130d09c7bddcbe68042eacfacb8bb
(cherry picked from commit 394054ecbf5a89a1a69a00344f1bb63c22a4b2cc)
commit 89b3aaa2b8bcc23d5fdd0d62b4c8acf7f5b5a4bf
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Aug 30 20:22:12 2016 +0530
loleaflet: Don't use input for userlist; use menu list
Change-Id: I29244e3989fa5ca52c701c05996669cd548a0109
(cherry picked from commit aca73d2ac52e0ab4c7b64f7575447cb2b65a21c8)
commit 065e7cb6304f19a51ed58164e628799dbe87ca37
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Aug 29 16:58:38 2016 +0530
loleaflet: Show a user list in bottom toolbar
Change-Id: I5aa87a6da3c6af9da0138bdfe51fbb707a47ba3e
Reviewed-on: https://gerrit.libreoffice.org/28480
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit 3d29df6f998df339896b1355b6fa9186dcc60892)
commit d33529185407843707a37cf8d9019d3625b75b30
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Aug 29 16:34:42 2016 +0530
loleaflet: Infrastructure for user list
Change-Id: If06d014174479d3d05397422c000ca47c51c819e
Reviewed-on: https://gerrit.libreoffice.org/28477
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit 3d8b73da8be0e5727c0613db131e06509ea1a051)
commit 4b26a368668e69ea0e917419ae195ad8c6d27bf8
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Sep 20 15:59:53 2016 +0530
loolwsd: Always send the updated view info to clients
This replaces addview/remview/remallview messages in the protocol
with 'viewinfo' message which is sent whenever there is any
change in the view information.
Let the client deal with what information is redundant to it.
Change-Id: Ic470ea88a94ff281a0ae021014a9fba1b876f648
(cherry picked from commit 46107dd0c8973f48117d50111fe7a397320412c8)
commit a806bdf4d891443694227c57a17cf0d65a4b2bec
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 17:35:41 2016 +0530
Remove notify*View functions for now
Change-Id: I1af9c2c4b4fe7e647d23f0f099f8fcc88f229bf0
commit 98356cb2707795b41129c3c07d88255bf4780e3c
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Aug 30 10:49:49 2016 +0530
loolwsd: Echo back view information to clients
View information as of now includes viewid and username
associated with the view.
Change-Id: If0c4957eb56962eb4b1b1d0c1189dc300fa6b857
Reviewed-on: https://gerrit.libreoffice.org/28482
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit 7d48cd6f175e57ce701be307bfbf782b308ddee9)
commit a66be7af0f05cea94614d0c1b1187bfbc3459969
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Aug 30 11:38:07 2016 +0530
loolwsd: Handle user names with spaces; encode/decode properly
Change-Id: I209bbd63686db8112529a3442a13a6162ce14d60
Reviewed-on: https://gerrit.libreoffice.org/28484
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit db5efae2b81449186552ae6838806304e1d61a48)
commit ad1d55192cf426dd73f1b791d80b515f64a60704
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 17:21:46 2016 +0530
Fix stuff
Change-Id: Id804ad452fca78fa1af6bbebdfdaa2c587046cdc
commit ee8f7d8db6d898b94937e75e32c69b2989c47de2
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Aug 29 23:38:01 2016 +0530
loolwsd: Pass sessions' usernames to core
Change-Id: I8c81c02fafd2cb9d0048729401e082bb422e299b
Reviewed-on: https://gerrit.libreoffice.org/28481
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit 67444eeb80ad521edcab905217c4777cdeacb8c2)
commit 136d5cd30e61945adea8338d64b1471e4b189a4b
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Jul 17 12:29:15 2016 -0400
loolwsd: correct multiview creation
Change-Id: Id6675f6410793b743aec53182a4b5756b7cffa23
Reviewed-on: https://gerrit.libreoffice.org/27272
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit 6536ba2fe218d26940af12baff2f61b41ccc7300)
commit 3c3490556bd191e7d44340df450d140d20c98cc6
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed Aug 31 17:05:10 2016 +0200
Don't check for nullptr after dereferencing.
StorageBase::create() is supposed to throw when there are trouble.
(cherry picked from commit 2090f121b61c34a2285430f495aee88c24ebc2e4)
commit a2f5fa6c8d0a99dbd3854588952d8d952813a9dc
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Aug 29 19:11:37 2016 +0530
loolwsd: Receive WOPI userid, username
Change-Id: I0bd5e5a155b8f8486fbeffb1c1413d5e9c177fc3
(cherry picked from commit f8ebb54af0948dbd4b9cb7bdceb44d90b190f4f9)
commit 1e58bfaea367be183b09d69ed2228776225a38ba
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Oct 4 17:07:13 2016 +0530
Revert "loolwsd: Inform opening view about existing views"
This reverts commit 9e0638af3cabfbedb8a2b916fc27fd85f31ba0dc.
commit 9e0638af3cabfbedb8a2b916fc27fd85f31ba0dc
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Aug 29 17:03:49 2016 +0530
loolwsd: Inform opening view about existing views
Change-Id: I84de6f78ffa21f3018e987e9e0bfeafd0cfb2b52
(cherry picked from commit c67c85793b8e925ed8e64dbd2f8f810154480a39)
commit 18019339179c42f880cb2d8f4e965abf3da0d586
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Aug 14 18:02:51 2016 -0400
loolwsd: convert function-object callbacks to abstract interface
Change-Id: Ia2e832659f8deddd55b8be6507c2d7406f110085
Reviewed-on: https://gerrit.libreoffice.org/28133
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit 5af1f18e364068e4b0dc1cac5a71b6dc5afd3bb4)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
