Brian Clements
42250dbe29
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: aad63c257d
[formerly c3a25024ae
] [formerly bfd9f59de8
] [formerly aad63c257d
[formerly c3a25024ae
] [formerly bfd9f59de8
] [formerly e4c9a13adb
[formerly bfd9f59de8
[formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]]
Former-commit-id: e4c9a13adb
Former-commit-id: b5c4951144
[formerly 50d2c6e24c
] [formerly e2f81d3a7a49c030107992abebd7d8580750a677 [formerly bd9520f4fe
]]
Former-commit-id: cd76914370d3d1df64ffd22b1b50e22e0b336ba1 [formerly 276dd801f2
]
Former-commit-id: 55bcd816ff
2014-07-03 15:11:48 -05:00
Brian Clements
9f8aea91aa
Omaha #1798 fixed collaboration drawing issues when leader shares new map
...
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer
Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa
Former-commit-id: 309900daab
[formerly 0125117d9c
] [formerly 88ba6b47ad
] [formerly 309900daab
[formerly 0125117d9c
] [formerly 88ba6b47ad
] [formerly fc70dbc86e
[formerly 88ba6b47ad
[formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: 7ffa3c80c1
[formerly b186894f32
] [formerly a1b5881328dc0f2810d69ead13548d6326a348b7 [formerly 44f8b3dce1
]]
Former-commit-id: 90997d544f594bee31f8c51f3afea29977b1417d [formerly 0be4260b4c
]
Former-commit-id: be0185379b
2014-06-30 15:57:58 -05:00
Richard Peter
c2835d25ac
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
...
Former-commit-id: 5a74a3cf99
[formerly bcffac8875
] [formerly 706409b459
] [formerly 5a74a3cf99
[formerly bcffac8875
] [formerly 706409b459
] [formerly f4cdd661fe
[formerly 706409b459
[formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 570bf42f89
[formerly b94dc3b045
] [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966 [formerly e3c3d55883
]]
Former-commit-id: 731bb0268edd89c419ea3b8bb57b91ea5afc516a [formerly 25dd598b55
]
Former-commit-id: 50fdb66cb4
2014-06-27 16:52:39 -05:00
Brian Clements
e25a446dae
Omaha #3323 fixed collaboration disposed font issue
...
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: c2cd991296
[formerly 023d1bde0b
] [formerly dc7a76197d
] [formerly c2cd991296
[formerly 023d1bde0b
] [formerly dc7a76197d
] [formerly fe149faffa
[formerly dc7a76197d
[formerly e216af49d135ceeff5e6cd251c6742602230553c]]]]
Former-commit-id: fe149faffa
Former-commit-id: 6bae8b556c
[formerly b8dc75d192
] [formerly 54898f3b2d36260900cf96d8c93cda806a155e01 [formerly cb108f12b8
]]
Former-commit-id: f94b54e29b3d2880b30c8a131c9ec16015f7c641 [formerly 0800ea7cb7
]
Former-commit-id: ac986ca600
2014-06-27 16:33:27 -05:00
Brian Clements
1fc32ef3c5
Omaha #3281 made venue session views non-sticky (except for feed view)
...
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: 9425ad16a3
[formerly eb806a6bb3
] [formerly 741afe7d39
] [formerly 9425ad16a3
[formerly eb806a6bb3
] [formerly 741afe7d39
] [formerly 31a08efb61
[formerly 741afe7d39
[formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]]
Former-commit-id: 31a08efb61
Former-commit-id: 46526f932b
[formerly 2350f7f630
] [formerly 93c5a5d813b69eae74ceea0b7251e483a789c393 [formerly ed2823daef
]]
Former-commit-id: a6fba588dbe193fe0fe78c90743505b834dd3904 [formerly c1bfab0914
]
Former-commit-id: 55e3b3673c
2014-06-27 15:33:11 -05:00
Nate Jensen
4fc569b95a
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: ebc605e2e8
[formerly 718d941c23
] [formerly 61640d5c22
] [formerly ebc605e2e8
[formerly 718d941c23
] [formerly 61640d5c22
] [formerly 172f18a5b1
[formerly 61640d5c22
[formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]]]
Former-commit-id: 172f18a5b1
Former-commit-id: 2379acd8af
[formerly 4e8d9343dd
] [formerly 1441fd58c94eb2aaf9f5d6b380a7d531add46179 [formerly 48995ed5ca
]]
Former-commit-id: 2d2da3845b08d3d4b4e3c1d6df05ccb3616d08ad [formerly 217a0999d0
]
Former-commit-id: b54b30e037
2014-06-23 12:12:03 -05:00
Brian Clements
3ef4cf722a
Omaha #3281 peer2peer chat view improvements
...
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)
Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d
Former-commit-id: c2ac40caec
[formerly f053e9b084
] [formerly 9d626a97e5
] [formerly c2ac40caec
[formerly f053e9b084
] [formerly 9d626a97e5
] [formerly 93a1ee71c4
[formerly 9d626a97e5
[formerly a31b7f213081f384bd23d53a431ce53593254c25]]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: a5f70b0e92
[formerly 3eb4cd513c
] [formerly 19045905bf3f712c73a4de48818e485b9aaeb892 [formerly a9827ef8e8
]]
Former-commit-id: 9ad39c4d0c064523e2d3ba343082d0567e667e2a [formerly 7060fe3fba
]
Former-commit-id: bb58783ca4
2014-06-20 09:04:15 -05:00
Brian Clements
ad5e56f89a
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 27f7b754a3
[formerly 21fca2e662
] [formerly 9aa5a87c4b
] [formerly 27f7b754a3
[formerly 21fca2e662
] [formerly 9aa5a87c4b
] [formerly fd95df3bc0
[formerly 9aa5a87c4b
[formerly b84f7571415871f2983b913cf816ed227b24bbac]]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 1f176ef9b9
[formerly 74c62e0bf9
] [formerly 432bcaa1164a2f10b560fb73e9f366e8663ada6d [formerly 795fa49ced
]]
Former-commit-id: c5974f5b42889bc8aca6c62470535a1217c6644d [formerly 5560b12a5a
]
Former-commit-id: a8e31ffa21
2014-06-20 08:53:54 -05:00
Brian Clements
9a00d07136
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 8fee2a762c
[formerly 86e89665bf
] [formerly 37699395ef
] [formerly 8fee2a762c
[formerly 86e89665bf
] [formerly 37699395ef
] [formerly 97a6f5bfe8
[formerly 37699395ef
[formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 8487f6388c
[formerly 51e2606277
] [formerly c1fad1a9cd12f9a3fc09ba809d66fab6463a6e1a [formerly 60508bf674
]]
Former-commit-id: c537c3bbdc8909d2bb251174082b96954a7eb632 [formerly 4433482d56
]
Former-commit-id: cdcf7d8143
2014-06-17 11:52:58 -05:00
Brian Clements
ca995b0147
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: f38f9fae51
[formerly 8205f7cd56
] [formerly b6a2bf0ae4
] [formerly f38f9fae51
[formerly 8205f7cd56
] [formerly b6a2bf0ae4
] [formerly 84e3f967d9
[formerly b6a2bf0ae4
[formerly baab2ea12e1117446295ae60bc06228eb6139895]]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 2ffe303324
[formerly 4dc81aabfa
] [formerly d0ae674bb4714971796f2565a9a4ddf679e2c503 [formerly 5436efb886
]]
Former-commit-id: c3ef12c1785d8656503e4bcb5c340e093799684f [formerly 616315d830
]
Former-commit-id: 0dcfac1a44
2014-06-17 09:26:24 -05:00
Brian Clements
547bad711a
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: 667cda6c19
[formerly 42e6e38c2e
] [formerly adbffa5ddd
] [formerly 667cda6c19
[formerly 42e6e38c2e
] [formerly adbffa5ddd
] [formerly 91eb7d40c2
[formerly adbffa5ddd
[formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 54081d0255
[formerly b1fac777f4
] [formerly 6dcce07d15edffe9b65d033992c7dff4c59bc36b [formerly 3bdbf79eeb
]]
Former-commit-id: 0299c53f7e72fd336d2e410db8f9ab7456ee054d [formerly e13aeb0ca5
]
Former-commit-id: 338f293065
2014-06-12 15:06:46 -05:00
Mike Duff
03dea47a31
Omaha #3269 - Fix editing of Notifiers before saving
...
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: 9ecb9c413f
[formerly 522d3c70f2
] [formerly 80922824a3
] [formerly 9ecb9c413f
[formerly 522d3c70f2
] [formerly 80922824a3
] [formerly c920a24300
[formerly 80922824a3
[formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]]
Former-commit-id: c920a24300
Former-commit-id: 2b2b3c266c
[formerly 0bdefaabdd
] [formerly f350810f0a7ebafd0d7711f6b99ab4c1683573c5 [formerly b15b6514fd
]]
Former-commit-id: 065d66e16f596dc5c644abeda291d4875dffd692 [formerly 5e0aa25048
]
Former-commit-id: a87ac48a53
2014-06-12 11:21:15 -05:00
Brian Clements
0f25e9985e
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 83654c374a
[formerly 455af3612f
] [formerly b774503931
] [formerly 83654c374a
[formerly 455af3612f
] [formerly b774503931
] [formerly 8dce7e9b85
[formerly b774503931
[formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: 99aa4f0609
[formerly c4447fc6c4
] [formerly 37f456b3eef102abf5d925b72829fa1b004f3f65 [formerly 4078bbaa63
]]
Former-commit-id: 96f3e9e0d2145c1f447ab45ea7213e6832a6a06b [formerly 213aab834f
]
Former-commit-id: f0ce9a6ca8
2014-05-20 11:04:57 -05:00
Brian Clements
738a2c4513
Omaha #3180 fixed inviting strangers and multiple users in collaboration
...
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited
Former-commit-id: 5bf4c253f6
[formerly b5e961d6b4
] [formerly 0e18d45bdf
] [formerly 5bf4c253f6
[formerly b5e961d6b4
] [formerly 0e18d45bdf
] [formerly 573ffcb0bf
[formerly 0e18d45bdf
[formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: bb827663c3
[formerly 6769aff618
] [formerly 411223a0944f43546d208c57f0dc4a1e1af7c28d [formerly e4433c5e10
]]
Former-commit-id: ed80a833a4a6585be47a91576eada507814b0659 [formerly 3c6a10e154
]
Former-commit-id: 008c911f03
2014-05-19 15:54:36 -05:00
Brian Clements
8bb6a1ac40
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 02c921ed12
[formerly 729e717be1
] [formerly f545c548cc
] [formerly 02c921ed12
[formerly 729e717be1
] [formerly f545c548cc
] [formerly 1432aa1302
[formerly f545c548cc
[formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]
Former-commit-id: 1432aa1302
Former-commit-id: 0fbb5dc22a
[formerly 8674841154
] [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b
]]
Former-commit-id: db57e64f5cb253ecb97388555bf76c0cac27eaf9 [formerly 3a60b0db05
]
Former-commit-id: 89f3a0a1d2
2014-05-06 09:30:07 -05:00
Nate Jensen
2b6ad3264c
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: 54c6d5d07f
[formerly d759efcaa8
] [formerly f4d20c41f4
] [formerly 54c6d5d07f
[formerly d759efcaa8
] [formerly f4d20c41f4
] [formerly 7d142d9d9d
[formerly f4d20c41f4
[formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 9f08442039
[formerly 6f211aa9f8
] [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928 [formerly f3b68178bd
]]
Former-commit-id: 930f4906645edbcafbe567a1652cb392d52f18a5 [formerly 3f9a33bf35
]
Former-commit-id: 42a27546f9
2014-05-01 16:28:16 -05:00
Brian Clements
d3813b0f96
Issue #3070 fixed contact request handling
...
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 345fe6f866
[formerly 334ad3ca81
] [formerly 02f08d75c6
] [formerly 345fe6f866
[formerly 334ad3ca81
] [formerly 02f08d75c6
] [formerly 94aa761e19
[formerly 02f08d75c6
[formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]]
Former-commit-id: 94aa761e19
Former-commit-id: 32b8ddd64c
[formerly 84f75ca30a
] [formerly 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8
]]
Former-commit-id: 7d1e4b70e650e3930f0ba2b7d95a341ff827b93d [formerly c27f2d9e53
]
Former-commit-id: 670c4e1611
2014-04-24 16:10:27 -05:00
Brian Clements
88c8e3be8e
Issue #2955 ignore duplicate session invites
...
Former-commit-id: 9f18c5d54c
[formerly e81ee94171
] [formerly f888819646
] [formerly 9f18c5d54c
[formerly e81ee94171
] [formerly f888819646
] [formerly 4fa9afc9ae
[formerly f888819646
[formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 363632479a
[formerly 39c2a1ac37
] [formerly 8ac39537a1c44d7ebe4df3667107708e5209338d [formerly 75465b69ed
]]
Former-commit-id: 729b6df5f19a32c2faab5eaeae7c9625470cf031 [formerly 3b96c4c628
]
Former-commit-id: 9e2497714b
2014-04-24 09:25:54 -05:00
Lee Venable
cb2d378302
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: e17fa9f609
[formerly eed8c6cbba
] [formerly df05a79d63
] [formerly e17fa9f609
[formerly eed8c6cbba
] [formerly df05a79d63
] [formerly f13ac7e1b9
[formerly df05a79d63
[formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 0c67eecb00
[formerly 421a4e4677
] [formerly 0c6b693c6efe16d8a10f2143e1a25863ed0ea9e1 [formerly 222154d094
]]
Former-commit-id: d5533a155ad3c0d43ac03773bee2a4a39ca0e4aa [formerly e81836e371
]
Former-commit-id: 6c54817117
2014-04-23 18:24:25 -05:00
Nate Jensen
bfc78fc68f
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 68e3650305
[formerly 827112349a
] [formerly ad6e4712d6
] [formerly 68e3650305
[formerly 827112349a
] [formerly ad6e4712d6
] [formerly 2b20cf5440
[formerly ad6e4712d6
[formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 73a3cde77b
[formerly 418741ce55
] [formerly 56369e0fe9e69598af2bbd95632d4f6ff4857957 [formerly a0423843b3
]]
Former-commit-id: 92e3587e5640d2a1f27ca32c1843be9b9df2ba4a [formerly 1abd65120e
]
Former-commit-id: 61eca0980f
2014-04-23 15:30:44 -05:00
Brian Clements
9c6a004507
Issue #2822 shared display invitations always go to cave
...
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients
Former-commit-id: 148d158380
[formerly 117eeca83a
] [formerly f3ee7b453a
] [formerly 148d158380
[formerly 117eeca83a
] [formerly f3ee7b453a
] [formerly 6969321db0
[formerly f3ee7b453a
[formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]]
Former-commit-id: 6969321db0
Former-commit-id: 00ebd60fad
[formerly 50acaac149
] [formerly a24c2596dc9f506edbc4e849e78e744becb558ec [formerly 5d2ec9b909
]]
Former-commit-id: fbd7e100e18e887890a44088729e97f34fef0552 [formerly d9a1bba4c8
]
Former-commit-id: 8cdeb571f3
2014-04-23 14:16:42 -05:00
Nate Jensen
52cf9e0b37
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: 37371486ba
[formerly fbecf66f79
] [formerly 426f103e7b
] [formerly 37371486ba
[formerly fbecf66f79
] [formerly 426f103e7b
] [formerly 38d493ff1b
[formerly 426f103e7b
[formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 342c851b04
[formerly 2b68a49a43
] [formerly f2ca8041ae7698bcc9759ba71d21e9d90aae5740 [formerly 20f3f8ffa2
]]
Former-commit-id: 455ce998f25ebf8f278cbe9b316a5e569c7eb06a [formerly ff9101c057
]
Former-commit-id: 7c349e268e
2014-04-23 12:26:27 -05:00
Nate Jensen
c93aa94cde
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: bf06389b9e
[formerly cc1da5fb88
] [formerly fe3ff669a7
] [formerly bf06389b9e
[formerly cc1da5fb88
] [formerly fe3ff669a7
] [formerly 8df505325c
[formerly fe3ff669a7
[formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]]
Former-commit-id: 8df505325c
Former-commit-id: 9ca82ebdd7
[formerly 484b197a56
] [formerly 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10 [formerly be6818e96b
]]
Former-commit-id: 5eea4c11b89c95940f50903c81294fd99a1657b7 [formerly ad96f9d128
]
Former-commit-id: 2b71b60b2e
2014-04-22 12:50:27 -05:00
Brian Clements
e750a1e5a5
Issue #3056 made venue participant equals method case insensitive
...
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server
Former-commit-id: a5730ca7bd
[formerly bfd88f3e14
] [formerly 1adbf6253a
] [formerly a5730ca7bd
[formerly bfd88f3e14
] [formerly 1adbf6253a
] [formerly 2a9d341910
[formerly 1adbf6253a
[formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]]
Former-commit-id: 2a9d341910
Former-commit-id: 38fbf8048e
[formerly 19c2695dca
] [formerly a85a4bc02f2dd752ca54943517184b9bdbf83b43 [formerly 8677a9f359
]]
Former-commit-id: f678746e9629ae3e37e221f399d19883fbdc4848 [formerly 97c5fe6d4a
]
Former-commit-id: d74f192819
2014-04-22 11:55:36 -05:00
Brian Clements
95e4effdc3
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: 1665175d35
[formerly cdf3aa90e9
] [formerly 717cdf4280
] [formerly 1665175d35
[formerly cdf3aa90e9
] [formerly 717cdf4280
] [formerly ef61a7c281
[formerly 717cdf4280
[formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]]
Former-commit-id: ef61a7c281
Former-commit-id: 001e0b030b
[formerly e7005953eb
] [formerly 80e474ab1d11f23309bd83f864334950b90dc4ac [formerly 295ff106b6
]]
Former-commit-id: 2047ae5bb2050dbdf619f1a51871a47a0ff3718e [formerly fb24e315bf
]
Former-commit-id: fb74637aa8
2014-04-22 10:01:27 -05:00
Mike Duff
326b17ce50
Issue #2955 - Made chat invitation dialogs non-modal
...
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023
Former-commit-id: 6da65fe71a
[formerly 71cf0d04e7
] [formerly ead90bc794
] [formerly 6da65fe71a
[formerly 71cf0d04e7
] [formerly ead90bc794
] [formerly b507739637
[formerly ead90bc794
[formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]]
Former-commit-id: b507739637
Former-commit-id: ebbb721787
[formerly 75f794d54d
] [formerly 5c415e155bfe7e16d70fc0b35ad0574fc7085261 [formerly 9a082a1588
]]
Former-commit-id: 6157e38ab3e1698599dadf55b906513f06b68612 [formerly ae984e4c16
]
Former-commit-id: 6c4490b08c
2014-04-21 09:00:42 -05:00
Brian Clements
cdd2dc4286
Issue #3021 increased width of create session dialog to fit error msg
...
Former-commit-id: 78c1b34cdf
[formerly ef791fe481
] [formerly 1112ca621e
] [formerly 78c1b34cdf
[formerly ef791fe481
] [formerly 1112ca621e
] [formerly bb915796ad
[formerly 1112ca621e
[formerly f0bcc20987d814a716994f712c6132bb79963457]]]]
Former-commit-id: bb915796ad
Former-commit-id: b8f40429ec
[formerly 549941882e
] [formerly fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2
]]
Former-commit-id: df9e17c1cd4d0111d5fb577725292b44c1b93fd4 [formerly f674aa07d7
]
Former-commit-id: 9a8c3231c6
2014-04-16 14:33:02 -05:00
Brian Clements
2a8d66a9f7
Issue #2822 only allow transfer leader if participant is using shared display
...
Former-commit-id: dc1d2d39f8
[formerly db67c03382
] [formerly 5250f7a442
] [formerly dc1d2d39f8
[formerly db67c03382
] [formerly 5250f7a442
] [formerly 6ccedc1182
[formerly 5250f7a442
[formerly af9577548e40397c67f72eb60485ee8de48f169b]]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 602794b56d
[formerly 6f9ef9a515
] [formerly fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729
]]
Former-commit-id: 05d59da434ed10fbd0f9d1601a73552672294e6c [formerly 9acb5a4a5b
]
Former-commit-id: 8945b26e9b
2014-04-15 15:15:11 -05:00
Brian Clements
19d7cef419
Issue #2903 made xmpp reconnect an explicit action by user
...
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect
Former-commit-id: 3d8bcb8701
[formerly 6f7851d8c4
] [formerly 8ab1bab974
] [formerly 3d8bcb8701
[formerly 6f7851d8c4
] [formerly 8ab1bab974
] [formerly 6b22374046
[formerly 8ab1bab974
[formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]]
Former-commit-id: 6b22374046
Former-commit-id: 5b5669e1e1
[formerly ca5909e222
] [formerly 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a
]]
Former-commit-id: 54da4997513795ce82cf53a0964eb73eee1095d9 [formerly 054b47951d
]
Former-commit-id: 86081dda91
2014-04-15 15:12:33 -05:00
Mike Duff
a2316806a5
Issue #2785 - Fix loading of groups in sub request dialog
...
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722
Former-commit-id: c70da23f91
[formerly 3a6e718ff0
] [formerly 81e4c9b05d
] [formerly c70da23f91
[formerly 3a6e718ff0
] [formerly 81e4c9b05d
] [formerly d2a80ca966
[formerly 81e4c9b05d
[formerly e72a852935dcb519604b37dc873645d4b419ee43]]]]
Former-commit-id: d2a80ca966
Former-commit-id: dceb75c423
[formerly 0bf14203ff
] [formerly 97976d43b384551d73f379695ead9b9d54c82cb5 [formerly 4773c3722c
]]
Former-commit-id: 8b2b23ba29774d082ea5cf0ea4bc20efdf754a73 [formerly ddeb7fe4d2
]
Former-commit-id: 78a0ad33ef
2014-04-15 10:10:18 -05:00
Brad Gonzales
34981c24ea
Issue #2937 Connect to the venue after the feed view is available.
...
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 0380e02c77
[formerly 5fcec27765
] [formerly cc0fd1e9af
] [formerly 0380e02c77
[formerly 5fcec27765
] [formerly cc0fd1e9af
] [formerly ea03096031
[formerly cc0fd1e9af
[formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]]
Former-commit-id: ea03096031
Former-commit-id: ccc4bc5a27
[formerly e41f9defa4
] [formerly 4877a895772c022be238b72f3f06a1ed801f3390 [formerly 3b25edad9a
]]
Former-commit-id: 7532bd6c2903b0a647393634444c14f575bbb9a0 [formerly 8f72707b3a
]
Former-commit-id: 91d546d015
2014-04-10 14:01:53 -05:00
Mike Duff
dc7d97752f
Issue #2785 - Change connection order of events
...
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: 7c9a7d609e
[formerly bdde561f8a
] [formerly efefe62e0f
] [formerly 7c9a7d609e
[formerly bdde561f8a
] [formerly efefe62e0f
] [formerly 7da1547c22
[formerly efefe62e0f
[formerly a2d595f4232e86606f7e2338ece59961649080a3]]]]
Former-commit-id: 7da1547c22
Former-commit-id: 6fd58b3778
[formerly 2b67272b60
] [formerly 130275c111513af444bdaa0efc7abcffce08c460 [formerly 7145820d62
]]
Former-commit-id: 8e79399cf0153a7c7c8746851927e35e63f1b36b [formerly 3c6c0824ce
]
Former-commit-id: 2b520fe31e
2014-04-08 14:14:20 -05:00
Nate Jensen
51502f7db5
Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
...
Former-commit-id: 72c8f1d844
[formerly c0704488cc
] [formerly 6b20d38b1a
] [formerly 72c8f1d844
[formerly c0704488cc
] [formerly 6b20d38b1a
] [formerly 579d2416cb
[formerly 6b20d38b1a
[formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]]
Former-commit-id: 579d2416cb
Former-commit-id: 5821a0e0e0
[formerly d5d42f2f6b
] [formerly b937a5eaf68a15c6804ca9d1bfabddacdd99ff79 [formerly 19560ebc7c
]]
Former-commit-id: bf3a7ac4f9e4177a919e5423eb8d193e349a283a [formerly 62f1451e50
]
Former-commit-id: 691c4411fc
2014-04-02 11:23:02 -05:00
Mike Duff
a5a38133ca
Issue #2632 - Remove user from list on sign-off. Fixed check for available
...
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe
Former-commit-id: ac9678dc6e
[formerly 2a9b434883
] [formerly 538261f6d5
] [formerly ac9678dc6e
[formerly 2a9b434883
] [formerly 538261f6d5
] [formerly d5df936431
[formerly 538261f6d5
[formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]]
Former-commit-id: d5df936431
Former-commit-id: 378909ad2c
[formerly 7aa5cebfb0
] [formerly 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aa
]]
Former-commit-id: 326f3902389d6b4cb29f450dd9b92a133b682aa9 [formerly 0aea45197a
]
Former-commit-id: ce774c07a8
2014-04-02 10:08:45 -05:00
Mike Duff
5d31ddb1ca
Issue #2938 - Fix site/role change logic for messages
...
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500
Former-commit-id: 656966669d
[formerly 66181ca3a5
] [formerly 8967ddd94a
] [formerly 656966669d
[formerly 66181ca3a5
] [formerly 8967ddd94a
] [formerly 169ad502de
[formerly 8967ddd94a
[formerly 9ffc540c21245b308334040234be03d78a501656]]]]
Former-commit-id: 169ad502de
Former-commit-id: fe8961bb24
[formerly 3686e50328
] [formerly f6d2ebf70d78eeca18274f66c05c2ad2791f600b [formerly f117f575eb
]]
Former-commit-id: 4d6d18da98db131b315736ebe9f687afb4224c68 [formerly 54d17b375f
]
Former-commit-id: cc53c1ac23
2014-04-02 08:12:53 -05:00
Brad Gonzales
2637e3c237
Issue #2937 Separate room logging into a subdirectory to separate room logs from
...
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build. Fixes for Archive log access
and search.
Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174
Former-commit-id: 85911a9d01
[formerly d4659c48a6
] [formerly 404faeeca0
] [formerly 85911a9d01
[formerly d4659c48a6
] [formerly 404faeeca0
] [formerly 15e1b7a7f6
[formerly 404faeeca0
[formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: c12c4cf7e2
[formerly 1c685a9eb6
] [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5 [formerly 2f56fd3c9d
]]
Former-commit-id: 742e4cc46d2a1218def59e841a9507b8581e81ce [formerly 4940c40a7f
]
Former-commit-id: 5506e9362a
2014-03-31 11:45:22 -05:00
Lee Venable
2644d48fc0
Issue #2960 - added checks for SashForm weights
...
Former-commit-id: 0b8d762f4b
[formerly bdb18ea85b
] [formerly 19dd95ba24
] [formerly 0b8d762f4b
[formerly bdb18ea85b
] [formerly 19dd95ba24
] [formerly 3018ff1f5f
[formerly 19dd95ba24
[formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 5ffe5c01f6
[formerly f7e1ee666b
] [formerly 8994df39c007e35516677413a4a7d0c0f74e7bc6 [formerly 1504b3532e
]]
Former-commit-id: 8b5260355b4e750a39f73f261eadbf55b49f4555 [formerly 5bbb65637e
]
Former-commit-id: d1928c95d9
2014-03-28 15:30:11 -05:00
Mike Duff
db4d8b76f0
Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
...
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b
Former-commit-id: 5476afd095
[formerly d2eed9891a
] [formerly d803986440
] [formerly 5476afd095
[formerly d2eed9891a
] [formerly d803986440
] [formerly 98b5fd762e
[formerly d803986440
[formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]]
Former-commit-id: 98b5fd762e
Former-commit-id: cd626d0555
[formerly f92754f752
] [formerly 7b61ae882d35a9231f7bff856832af42ae2f309a [formerly b1d74f855e
]]
Former-commit-id: 7aadfd7a15d93ff37cbf9b952a4c1868beb41dee [formerly 531e66cbb6
]
Former-commit-id: 5e0e640336
2014-03-27 16:31:30 -05:00
Nate Jensen
64be4dae2d
Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
...
Former-commit-id: d1ca7d7c75
[formerly c7dc0baeb9
] [formerly 38e3305e60
] [formerly d1ca7d7c75
[formerly c7dc0baeb9
] [formerly 38e3305e60
] [formerly 4861f92ef6
[formerly 38e3305e60
[formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 0a9da8ca6c
[formerly 307cdc15c1
] [formerly f289ec627b5f30e10b3a962e1f08f3e13492e4e2 [formerly 7c581cb5d7
]]
Former-commit-id: 2b59d9930948c459e8f6edef62cf78dc6f8d5fda [formerly 015dc45eba
]
Former-commit-id: a36bdb3b99
2014-03-25 13:11:29 -05:00
Mike Duff
3b224f6ac9
Issue #2938 - Show status message for site/role changes, but not return from away
...
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2
Former-commit-id: 1d0edcc2c6
[formerly 758fdca514
] [formerly 1e42d8a30d
] [formerly 1d0edcc2c6
[formerly 758fdca514
] [formerly 1e42d8a30d
] [formerly a06f058ea9
[formerly 1e42d8a30d
[formerly 666a354d6f676b899bd14371517bce9de88192d2]]]]
Former-commit-id: a06f058ea9
Former-commit-id: 47402575c0
[formerly 81ac35a1b8
] [formerly 6fb4c8dc2286133134b00c03341141f90a3454df [formerly d497c533e6
]]
Former-commit-id: 2740eb49374c5a2de83bcfcf6da18c01c8648899 [formerly 97c4e48255
]
Former-commit-id: 7705874ea3
2014-03-25 11:18:09 -05:00
Nate Jensen
d085d6bfcb
Issue #2935 fix refresh issue
...
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994
Former-commit-id: c6474ef98e
[formerly d1f080fd05
] [formerly 68f9181340
] [formerly c6474ef98e
[formerly d1f080fd05
] [formerly 68f9181340
] [formerly 7b586ebd67
[formerly 68f9181340
[formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 19b2056aaf
[formerly 447b1a36bb
] [formerly 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0 [formerly 0cad1fa167
]]
Former-commit-id: 48d96d20b890321c6bbe7e22129e08fa04053556 [formerly a5b0c8b432
]
Former-commit-id: 8e3b78ba6a
2014-03-25 10:24:11 -05:00
Mike Duff
e9dae1a861
Issue #2936 - Remove the join alert from the nws collaboration feed
...
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840
Former-commit-id: 0fd2a2a426
[formerly eacc161ee4
] [formerly fd31ea7fa5
] [formerly 0fd2a2a426
[formerly eacc161ee4
] [formerly fd31ea7fa5
] [formerly ca27ceac1f
[formerly fd31ea7fa5
[formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]]
Former-commit-id: ca27ceac1f
Former-commit-id: dd804a13ff
[formerly 86fc8d74d5
] [formerly 26a0a3d7ea325414e2b4fd69c1a38bcc0d1f1c56 [formerly fc7a71889c
]]
Former-commit-id: aaf5ab7ad0f3fc0cc724c92a5e30b5288b163eed [formerly a1661a5389
]
Former-commit-id: 9075ec61a0
2014-03-24 14:59:33 -05:00
Nate Jensen
a99fd8dbbb
Issue #2895 fixed telestration when leadership returns to a previous
...
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: 1447abe995
[formerly 68b60eba47
] [formerly e75d3dfb7c
] [formerly 1447abe995
[formerly 68b60eba47
] [formerly e75d3dfb7c
] [formerly 2fc1030fad
[formerly e75d3dfb7c
[formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 52e60a68a9
[formerly 8589374171
] [formerly 389d920f6cf85e74cfa2b1864b84d9f952b0b23a [formerly ca1ec93450
]]
Former-commit-id: 2113aab9642e8adaee09df90029c31ddc9b73949 [formerly 5cb38bd511
]
Former-commit-id: 1125203c93
2014-03-18 12:52:01 -05:00
Mike Duff
6f1a28796f
Issue #2798 - Fix issue with color not changing for existing user changing site.
...
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: 3d62505600
[formerly ac65a87fe5
] [formerly 3d10260065
] [formerly 3d62505600
[formerly ac65a87fe5
] [formerly 3d10260065
] [formerly 7bdef60a55
[formerly 3d10260065
[formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]]
Former-commit-id: 7bdef60a55
Former-commit-id: e0d65b3d63
[formerly 1a3e88c5da
] [formerly 28df91565a1ef26047c815bc98382442f1c3836b [formerly 5bbe504f82
]]
Former-commit-id: 18df7f16b5a9135e21e0b5b37cd5579d82035bca [formerly b560f16623
]
Former-commit-id: 179082ebf9
2014-03-18 11:55:00 -05:00
Nate Jensen
16c7c19469
Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development
...
Former-commit-id: 84d698b111
[formerly 0e39a89ea3
] [formerly 82778ad21b
] [formerly 84d698b111
[formerly 0e39a89ea3
] [formerly 82778ad21b
] [formerly f8180587d4
[formerly 82778ad21b
[formerly b723095f6d5d59b67370c7292f88f339d349993a]]]]
Former-commit-id: f8180587d4
Former-commit-id: dd1818bcd9
[formerly 32ccf77885
] [formerly e60e13c06f98e845a0be9a81f12628aa3cec8c08 [formerly 34c5d1de25
]]
Former-commit-id: b179639787b8133c9613c1bd824d46ea7d5df645 [formerly 2c0d7d2d3e
]
Former-commit-id: 718d69723b
2014-03-12 16:05:19 -05:00
Mike Duff
11e96f8bd5
Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean.
...
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824
Former-commit-id: bb2b251cd0
[formerly 6444131768
] [formerly 8068c9aa83
] [formerly bb2b251cd0
[formerly 6444131768
] [formerly 8068c9aa83
] [formerly e01c5c3534
[formerly 8068c9aa83
[formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]]
Former-commit-id: e01c5c3534
Former-commit-id: cbc15d479a
[formerly 4fddc0c631
] [formerly ea4a4997b336401081920b43fb91017011502ca3 [formerly 832dd498fc
]]
Former-commit-id: ad32cd2a661ff65b5b8dddf880094042db699f30 [formerly fc1cc39479
]
Former-commit-id: 6e1ef1196a
2014-03-12 10:52:18 -05:00
Lee Venable
b7b1d88680
Issue #2865 - added more null and dispose checks
...
Former-commit-id: 7f6792f1c5
[formerly fe6e7328c0
] [formerly df65d7c7ce
] [formerly 7f6792f1c5
[formerly fe6e7328c0
] [formerly df65d7c7ce
] [formerly 1f9d1af221
[formerly df65d7c7ce
[formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]]
Former-commit-id: 1f9d1af221
Former-commit-id: 9b11bcedb1
[formerly 8ef7fe57c4
] [formerly ebbc4eff228045a38bf9d41b60b39929f6e27fbe [formerly 46fa017e1b
]]
Former-commit-id: 3cd64bcf0cda402268f02162ee27b86ac2bc3d26 [formerly 0931ce72c9
]
Former-commit-id: 66a87595af
2014-03-11 16:30:33 -05:00
Lee Venable
ab2cc176e3
Issue #2865 - fixed font memory leak
...
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d
Former-commit-id: 7aab4252d5
[formerly 44733489b9
] [formerly 2c67c4f6c4
] [formerly 7aab4252d5
[formerly 44733489b9
] [formerly 2c67c4f6c4
] [formerly 58d7f759b2
[formerly 2c67c4f6c4
[formerly 2555d382f26278c5f972c17da778338142cdaaec]]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 8bec7ebcb1
[formerly 86e6547a63
] [formerly 8fe2ec93b5265755e9333c787d93b1c92293eceb [formerly a5487de998
]]
Former-commit-id: 97cae7373d3e7a83f0b8e4c464d4a9dab888a084 [formerly 97a124ca58
]
Former-commit-id: 374a2da1a1
2014-03-11 10:31:50 -05:00
Brian Clements
ac70455dc6
Issue #2848 fixed session create, listen, join ordering
...
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions
Former-commit-id: 9b6c283fc9
[formerly 2456c2308f
] [formerly dc55cd5b5c
] [formerly 9b6c283fc9
[formerly 2456c2308f
] [formerly dc55cd5b5c
] [formerly aee98ecfb0
[formerly dc55cd5b5c
[formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 67db5cb4f8
[formerly 3486f1f241
] [formerly eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2
]]
Former-commit-id: 6188fed145573399f401e7319702f154913b200b [formerly 6245b550aa
]
Former-commit-id: c4e9aff9fc
2014-03-10 14:06:45 -05:00
Brian Clements
e81c8368dd
Issue #2751 ensured that room admins know real userids
...
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer
Former-commit-id: 8aff9ee95c
[formerly 2afc1a9319
] [formerly 44d161729f
] [formerly 8aff9ee95c
[formerly 2afc1a9319
] [formerly 44d161729f
] [formerly dc94769c14
[formerly 44d161729f
[formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]]
Former-commit-id: dc94769c14
Former-commit-id: cfe64d833a
[formerly acb20cfbbe
] [formerly 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab [formerly ac63129ad1
]]
Former-commit-id: f030c8528ac78571000ec83546e396d509e9d0ae [formerly 6590587d9e
]
Former-commit-id: 975bfca460
2014-03-07 15:37:29 -06:00