Mark Peters
|
e8d1ce9c41
|
Omaha #3709 Collaboration chat windows need to support changing foreground and background color
Change-Id: I1f208c3e12e0fe989ae395423ad28454be3589f7
Former-commit-id: 5bbbe31916 [formerly 5a6f3ff09c] [formerly ec62b9a6f1] [formerly ec62b9a6f1 [formerly 54a3e8d2eb]] [formerly 5bbbe31916 [formerly 5a6f3ff09c] [formerly ec62b9a6f1] [formerly ec62b9a6f1 [formerly 54a3e8d2eb]] [formerly e002132009 [formerly ec62b9a6f1 [formerly 54a3e8d2eb] [formerly e002132009 [formerly 8e00cd23205c4ab3f83c5594373f3736afe7fe83]]]]]
Former-commit-id: e002132009
Former-commit-id: a7309c9d2b [formerly 7502a7d095] [formerly db58207c6d] [formerly ce57d54fed9ba3d0d2806e58c8e0f542b3591594 [formerly e3b623b44a7ae728bf706820577b5598655114ce] [formerly db58207c6d [formerly 5fc9bdec3b]]]
Former-commit-id: 3b65b0f40d1cf4a4fcb7b3345e0e1a81115ba959 [formerly d3c168634bee505091e42265b3383c4c55f4428e] [formerly 91eedeee50 [formerly 4b8da0d859]]
Former-commit-id: 91eedeee50
Former-commit-id: a026cdaf38
|
2014-10-16 10:28:34 -05:00 |
|
Brian Clements
|
f9fd9ad168
|
Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab
Former-commit-id: b59d505a41 [formerly 847d9c9925] [formerly 158aa3f439] [formerly 158aa3f439 [formerly 180696a594]] [formerly b59d505a41 [formerly 847d9c9925] [formerly 158aa3f439] [formerly 158aa3f439 [formerly 180696a594]] [formerly 0a42113bbb [formerly 158aa3f439 [formerly 180696a594] [formerly 0a42113bbb [formerly 21924a6b536409681073f65d769bef53db049102]]]]]
Former-commit-id: 0a42113bbb
Former-commit-id: 9356ac3f94 [formerly 016b7763e8] [formerly 5c1e35dc2e] [formerly fb8dd5427008b37fe6bad7139df07fd90ce1ff4f [formerly 4ace24a1335d88e66758722a343dd206931cbc5d] [formerly 5c1e35dc2e [formerly a555477f7f]]]
Former-commit-id: f300549fc1718113c7434fcccf824c6f78fdb6ef [formerly e97dd8d4574e96113876fce9ea7291d8df9981fb] [formerly 5c756fa3f8 [formerly bf26a69d82]]
Former-commit-id: 5c756fa3f8
Former-commit-id: dbb499ca17
|
2014-10-14 15:49:36 -05:00 |
|
Brian Clements
|
13bea300ce
|
Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager
Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5
Former-commit-id: 5b24d1fd57 [formerly 7d4dbd204e] [formerly c33a5ad562] [formerly c33a5ad562 [formerly dfb43fda31]] [formerly 5b24d1fd57 [formerly 7d4dbd204e] [formerly c33a5ad562] [formerly c33a5ad562 [formerly dfb43fda31]] [formerly 2a7feaebfe [formerly c33a5ad562 [formerly dfb43fda31] [formerly 2a7feaebfe [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]]]]
Former-commit-id: 2a7feaebfe
Former-commit-id: 0d814e7b16 [formerly 844cd86c28] [formerly 4429a04d2c] [formerly ec25518bcff8e636c4518c64db05b12419fa2eb4 [formerly f8802ed9ae8429e0853425985fe3dec6fe60d41d] [formerly 4429a04d2c [formerly 38b4d2683c]]]
Former-commit-id: 0cf09df158b1638e86255d9cda7a8d8f7d6d4fc8 [formerly ab77d717ac89ffff13f622ac601eb1c2169d0af0] [formerly 258be9acb0 [formerly 53a61c3230]]
Former-commit-id: 258be9acb0
Former-commit-id: 129df50eee
|
2014-10-13 11:11:32 -05:00 |
|
Mark Peters
|
8b4a8505e3
|
Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f
Former-commit-id: cca745dade [formerly 4660b63394] [formerly f8e3c8412b] [formerly f8e3c8412b [formerly 5d87f3d22d]] [formerly cca745dade [formerly 4660b63394] [formerly f8e3c8412b] [formerly f8e3c8412b [formerly 5d87f3d22d]] [formerly fb6131869c [formerly f8e3c8412b [formerly 5d87f3d22d] [formerly fb6131869c [formerly b929d424107b0a2495f4305fd2500e362cccce4e]]]]]
Former-commit-id: fb6131869c
Former-commit-id: 2f7e1b2291 [formerly 49ef7a1031] [formerly 727a916df5] [formerly c692dbdb2f6da7d254ae10d4f671e71a189eb681 [formerly 50225ba45f08abd6c25c15f3cede8666db675c23] [formerly 727a916df5 [formerly 00004f21ed]]]
Former-commit-id: 1bbb4ea0d7c5baa2dfffe411db4c4973d2dc6240 [formerly 8caa9e43f590a54a66e3f6ee910e714b12842e43] [formerly 38cd69e6b0 [formerly 7cc0a3b62c]]
Former-commit-id: 38cd69e6b0
Former-commit-id: d71fcd6598
|
2014-10-10 14:25:38 -05:00 |
|
Brian Clements
|
5d7d78dec0
|
Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: 21a828d75c [formerly abb6b1f258] [formerly 1a6624d5d7] [formerly 1a6624d5d7 [formerly 87964cb500]] [formerly 21a828d75c [formerly abb6b1f258] [formerly 1a6624d5d7] [formerly 1a6624d5d7 [formerly 87964cb500]] [formerly f0921db20c [formerly 1a6624d5d7 [formerly 87964cb500] [formerly f0921db20c [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]]]]
Former-commit-id: f0921db20c
Former-commit-id: ea675872d5 [formerly 49e6579115] [formerly d7c864113c] [formerly 56ee0eafe4cf1c6cb941f4dfeb0be40185149bc9 [formerly d5b69cedb564d53bd3cab131f05d49d804074b08] [formerly d7c864113c [formerly eac32a0fa0]]]
Former-commit-id: c8e7b2534003b0711c2574f2eeb0250316e39c01 [formerly 219ae40cec22d5a5e877b7c88ca0a55315f52516] [formerly 51084e6548 [formerly 72c5dd03d2]]
Former-commit-id: 51084e6548
Former-commit-id: dc45bb7100
|
2014-10-09 08:38:45 -05:00 |
|
Nate Jensen
|
956e59163a
|
Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f
Former-commit-id: d53f25d499 [formerly 8b55dfa980] [formerly b690c360ac] [formerly b690c360ac [formerly 8e74892cd6]] [formerly d53f25d499 [formerly 8b55dfa980] [formerly b690c360ac] [formerly b690c360ac [formerly 8e74892cd6]] [formerly 40d4abe4cd [formerly b690c360ac [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: b650b9f5cc [formerly b4b5642b58] [formerly f78e7fe79c] [formerly 93b9e82a4e503fb0339bf43d43f5fd884a26ad9b [formerly fcfeaf6b76dea8640f9825d4afaf45c9001ac3e4] [formerly f78e7fe79c [formerly 5b2e410c6c]]]
Former-commit-id: d089dbe0d54a8a2cfd583188aeac1da988c9575c [formerly 967d00b58b43570744b7d6d9b09ff846327cd9f1] [formerly 22fa9cc6d9 [formerly 54e9b04c3d]]
Former-commit-id: a50e2235a17ed719fe9963dfae3e4718b1de683d [formerly 22fa9cc6d9]
Former-commit-id: b21f03757a
|
2014-09-03 10:00:11 -05:00 |
|
Brian Clements
|
eea1e8eb4f
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: e5b59c13a9 [formerly 9509568efa] [formerly a39a997a8d] [formerly a39a997a8d [formerly a609334abf]] [formerly e5b59c13a9 [formerly 9509568efa] [formerly a39a997a8d] [formerly a39a997a8d [formerly a609334abf]] [formerly f871058f67 [formerly a39a997a8d [formerly a609334abf] [formerly f871058f67 [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]]]
Former-commit-id: f871058f67
Former-commit-id: 86f70353ef [formerly 3061205a6b] [formerly f179d62459] [formerly 66a48e0d5a2a35124f2c5424310a5276f3f249d9 [formerly 28575adbedc1689f7fc46cd5d53fb04c3af8bd28] [formerly f179d62459 [formerly e02be806d0]]]
Former-commit-id: d6eed65b251dadf3246a6f39543cf525a2e07085 [formerly 3cb76351d8871b831667f7940cd204584bb11974] [formerly fcb9de6bf4 [formerly aa0cdd843c]]
Former-commit-id: fcb9de6bf4
Former-commit-id: 392cfad0e2
|
2014-08-26 17:22:20 -05:00 |
|
Brian Clements
|
a7794cd8bf
|
Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: 7205488e68 [formerly aad63c257d] [formerly c3a25024ae] [formerly c3a25024ae [formerly bfd9f59de8]] [formerly 7205488e68 [formerly aad63c257d] [formerly c3a25024ae] [formerly c3a25024ae [formerly bfd9f59de8]] [formerly e4c9a13adb [formerly c3a25024ae [formerly bfd9f59de8] [formerly e4c9a13adb [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]]]
Former-commit-id: e4c9a13adb
Former-commit-id: 0c3365433b [formerly b5c4951144] [formerly 50d2c6e24c] [formerly 4cd83a93955c7fb12bb1880e292dd61f8a54dc2e [formerly e2f81d3a7a49c030107992abebd7d8580750a677] [formerly 50d2c6e24c [formerly bd9520f4fe]]]
Former-commit-id: c0a5f3911b598ed7ed459d1fdcc6ca2dc8689829 [formerly cd76914370d3d1df64ffd22b1b50e22e0b336ba1] [formerly 55bcd816ff [formerly 276dd801f2]]
Former-commit-id: 55bcd816ff
Former-commit-id: 42250dbe29
|
2014-07-03 15:11:48 -05:00 |
|
Brian Clements
|
027b897067
|
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: 3172a2ac99 [formerly 309900daab] [formerly 0125117d9c] [formerly 0125117d9c [formerly 88ba6b47ad]] [formerly 3172a2ac99 [formerly 309900daab] [formerly 0125117d9c] [formerly 0125117d9c [formerly 88ba6b47ad]] [formerly fc70dbc86e [formerly 0125117d9c [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: fb0490568c [formerly 7ffa3c80c1] [formerly b186894f32] [formerly 33e8aa5aeaa287b40e35647bb46c4238e01563d2 [formerly a1b5881328dc0f2810d69ead13548d6326a348b7] [formerly b186894f32 [formerly 44f8b3dce1]]]
Former-commit-id: 0fdf2f49f3110995eb0da60b3da84c644eea4209 [formerly 90997d544f594bee31f8c51f3afea29977b1417d] [formerly be0185379b [formerly 0be4260b4c]]
Former-commit-id: be0185379b
Former-commit-id: 9f8aea91aa
|
2014-06-30 15:57:58 -05:00 |
|
Richard Peter
|
f0f5e8a823
|
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: 7bae4ec8c0 [formerly 5a74a3cf99] [formerly bcffac8875] [formerly bcffac8875 [formerly 706409b459]] [formerly 7bae4ec8c0 [formerly 5a74a3cf99] [formerly bcffac8875] [formerly bcffac8875 [formerly 706409b459]] [formerly f4cdd661fe [formerly bcffac8875 [formerly 706409b459] [formerly f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 5117322ec1 [formerly 570bf42f89] [formerly b94dc3b045] [formerly f8274dfd7d9671d940339d92689c6f4c82d0d4f8 [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966] [formerly b94dc3b045 [formerly e3c3d55883]]]
Former-commit-id: ad1a50f316aa3e8c270c757520be528573cd8dcd [formerly 731bb0268edd89c419ea3b8bb57b91ea5afc516a] [formerly 50fdb66cb4 [formerly 25dd598b55]]
Former-commit-id: 50fdb66cb4
Former-commit-id: c2835d25ac
|
2014-06-27 16:52:39 -05:00 |
|
Brian Clements
|
4aa8e9f0d6
|
Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: bba2d9cd9f [formerly c2cd991296] [formerly 023d1bde0b] [formerly 023d1bde0b [formerly dc7a76197d]] [formerly bba2d9cd9f [formerly c2cd991296] [formerly 023d1bde0b] [formerly 023d1bde0b [formerly dc7a76197d]] [formerly fe149faffa [formerly 023d1bde0b [formerly dc7a76197d] [formerly fe149faffa [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]]]
Former-commit-id: fe149faffa
Former-commit-id: 680b20fa66 [formerly 6bae8b556c] [formerly b8dc75d192] [formerly fe73953f7ef19b29957a4c927e17ac49e9f4f631 [formerly 54898f3b2d36260900cf96d8c93cda806a155e01] [formerly b8dc75d192 [formerly cb108f12b8]]]
Former-commit-id: e3bb5cfa20756617856ddbd05645b4fd4ca95205 [formerly f94b54e29b3d2880b30c8a131c9ec16015f7c641] [formerly ac986ca600 [formerly 0800ea7cb7]]
Former-commit-id: ac986ca600
Former-commit-id: e25a446dae
|
2014-06-27 16:33:27 -05:00 |
|
Brian Clements
|
ebcc53032d
|
Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: 434897d829 [formerly 9425ad16a3] [formerly eb806a6bb3] [formerly eb806a6bb3 [formerly 741afe7d39]] [formerly 434897d829 [formerly 9425ad16a3] [formerly eb806a6bb3] [formerly eb806a6bb3 [formerly 741afe7d39]] [formerly 31a08efb61 [formerly eb806a6bb3 [formerly 741afe7d39] [formerly 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]]]
Former-commit-id: 31a08efb61
Former-commit-id: 63805e9c93 [formerly 46526f932b] [formerly 2350f7f630] [formerly 961c650f35ed524817b566782f8929e04cb73cee [formerly 93c5a5d813b69eae74ceea0b7251e483a789c393] [formerly 2350f7f630 [formerly ed2823daef]]]
Former-commit-id: c795acf405a16fa0180159ab5c029160a0ce47b8 [formerly a6fba588dbe193fe0fe78c90743505b834dd3904] [formerly 55e3b3673c [formerly c1bfab0914]]
Former-commit-id: 55e3b3673c
Former-commit-id: 1fc32ef3c5
|
2014-06-27 15:33:11 -05:00 |
|
Nate Jensen
|
cbcb87301e
|
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 64a42aa367 [formerly ebc605e2e8] [formerly 718d941c23] [formerly 718d941c23 [formerly 61640d5c22]] [formerly 64a42aa367 [formerly ebc605e2e8] [formerly 718d941c23] [formerly 718d941c23 [formerly 61640d5c22]] [formerly 172f18a5b1 [formerly 718d941c23 [formerly 61640d5c22] [formerly 172f18a5b1 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]]]]
Former-commit-id: 172f18a5b1
Former-commit-id: b558afff34 [formerly 2379acd8af] [formerly 4e8d9343dd] [formerly 07b65b17ba0a07418409a23df4dcc7aed75d7619 [formerly 1441fd58c94eb2aaf9f5d6b380a7d531add46179] [formerly 4e8d9343dd [formerly 48995ed5ca]]]
Former-commit-id: 153d1b3e3505b6914d529950e2d878cc44ef6ac0 [formerly 2d2da3845b08d3d4b4e3c1d6df05ccb3616d08ad] [formerly b54b30e037 [formerly 217a0999d0]]
Former-commit-id: b54b30e037
Former-commit-id: 4fc569b95a
|
2014-06-23 12:12:03 -05:00 |
|
Brian Clements
|
7716688279
|
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: f185de0833 [formerly c2ac40caec] [formerly f053e9b084] [formerly f053e9b084 [formerly 9d626a97e5]] [formerly f185de0833 [formerly c2ac40caec] [formerly f053e9b084] [formerly f053e9b084 [formerly 9d626a97e5]] [formerly 93a1ee71c4 [formerly f053e9b084 [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: 59bab367f1 [formerly a5f70b0e92] [formerly 3eb4cd513c] [formerly 11d1ce3116d4ee515f6a907f315aebb7a124e91a [formerly 19045905bf3f712c73a4de48818e485b9aaeb892] [formerly 3eb4cd513c [formerly a9827ef8e8]]]
Former-commit-id: 5b7bab0e3ad9da45b594c54401c5f1edcff2cf2e [formerly 9ad39c4d0c064523e2d3ba343082d0567e667e2a] [formerly bb58783ca4 [formerly 7060fe3fba]]
Former-commit-id: bb58783ca4
Former-commit-id: 3ef4cf722a
|
2014-06-20 09:04:15 -05:00 |
|
Brian Clements
|
133179813e
|
Omaha #3281 collaboration views persist between perspectives
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 6499fee089 [formerly 27f7b754a3] [formerly 21fca2e662] [formerly 21fca2e662 [formerly 9aa5a87c4b]] [formerly 6499fee089 [formerly 27f7b754a3] [formerly 21fca2e662] [formerly 21fca2e662 [formerly 9aa5a87c4b]] [formerly fd95df3bc0 [formerly 21fca2e662 [formerly 9aa5a87c4b] [formerly fd95df3bc0 [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 2159e083f7 [formerly 1f176ef9b9] [formerly 74c62e0bf9] [formerly 8261597e48d1fdd1136a39b27f021c5ea4b50bbf [formerly 432bcaa1164a2f10b560fb73e9f366e8663ada6d] [formerly 74c62e0bf9 [formerly 795fa49ced]]]
Former-commit-id: 51f9d5ac21f9aab3d67bac967e200ba43fb51a3d [formerly c5974f5b42889bc8aca6c62470535a1217c6644d] [formerly a8e31ffa21 [formerly 5560b12a5a]]
Former-commit-id: a8e31ffa21
Former-commit-id: ad5e56f89a
|
2014-06-20 08:53:54 -05:00 |
|
Brian Clements
|
2cad02d6fd
|
Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 972fafcdc1 [formerly 8fee2a762c] [formerly 86e89665bf] [formerly 86e89665bf [formerly 37699395ef]] [formerly 972fafcdc1 [formerly 8fee2a762c] [formerly 86e89665bf] [formerly 86e89665bf [formerly 37699395ef]] [formerly 97a6f5bfe8 [formerly 86e89665bf [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 20f39e38e1 [formerly 8487f6388c] [formerly 51e2606277] [formerly f37711991dd233255da71a8d8dfa83885f058b11 [formerly c1fad1a9cd12f9a3fc09ba809d66fab6463a6e1a] [formerly 51e2606277 [formerly 60508bf674]]]
Former-commit-id: 8e4e3402ce984663ee7c8e757ca9c56f3e452d44 [formerly c537c3bbdc8909d2bb251174082b96954a7eb632] [formerly cdcf7d8143 [formerly 4433482d56]]
Former-commit-id: cdcf7d8143
Former-commit-id: 9a00d07136
|
2014-06-17 11:52:58 -05:00 |
|
Brian Clements
|
21fca59d8a
|
Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: 208e22d839 [formerly f38f9fae51] [formerly 8205f7cd56] [formerly 8205f7cd56 [formerly b6a2bf0ae4]] [formerly 208e22d839 [formerly f38f9fae51] [formerly 8205f7cd56] [formerly 8205f7cd56 [formerly b6a2bf0ae4]] [formerly 84e3f967d9 [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 46b6847922 [formerly 2ffe303324] [formerly 4dc81aabfa] [formerly 61e9d424ac03b2f0f5883c208fc3709bfadfba0d [formerly d0ae674bb4714971796f2565a9a4ddf679e2c503] [formerly 4dc81aabfa [formerly 5436efb886]]]
Former-commit-id: 8f06524d6170c23dd8f996d2c03ab377537a4722 [formerly c3ef12c1785d8656503e4bcb5c340e093799684f] [formerly 0dcfac1a44 [formerly 616315d830]]
Former-commit-id: d31abe083cb85166bac8a4f8d157f1721bbcf07c [formerly 0dcfac1a44]
Former-commit-id: ca995b0147
|
2014-06-17 09:26:24 -05:00 |
|
Brian Clements
|
1397ffb9d7
|
Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: d49a03a269 [formerly 667cda6c19] [formerly 42e6e38c2e] [formerly 42e6e38c2e [formerly adbffa5ddd]] [formerly d49a03a269 [formerly 667cda6c19] [formerly 42e6e38c2e] [formerly 42e6e38c2e [formerly adbffa5ddd]] [formerly 91eb7d40c2 [formerly 42e6e38c2e [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 645a24a1c1 [formerly 54081d0255] [formerly b1fac777f4] [formerly 4ddb772e9c3f68cdf8f65972f4c26bfaa496e290 [formerly 6dcce07d15edffe9b65d033992c7dff4c59bc36b] [formerly b1fac777f4 [formerly 3bdbf79eeb]]]
Former-commit-id: ca2147ae12b473309e3c5fecd5059553defc608f [formerly 0299c53f7e72fd336d2e410db8f9ab7456ee054d] [formerly 338f293065 [formerly e13aeb0ca5]]
Former-commit-id: 338f293065
Former-commit-id: 547bad711a
|
2014-06-12 15:06:46 -05:00 |
|
Mike Duff
|
c79c9201d2
|
Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: e5c5354a12 [formerly 9ecb9c413f] [formerly 522d3c70f2] [formerly 522d3c70f2 [formerly 80922824a3]] [formerly e5c5354a12 [formerly 9ecb9c413f] [formerly 522d3c70f2] [formerly 522d3c70f2 [formerly 80922824a3]] [formerly c920a24300 [formerly 522d3c70f2 [formerly 80922824a3] [formerly c920a24300 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]]]
Former-commit-id: c920a24300
Former-commit-id: 63b2d85b6b [formerly 2b2b3c266c] [formerly 0bdefaabdd] [formerly e1c738717f657b10ad47d05d7cbcaa2a006ab04c [formerly f350810f0a7ebafd0d7711f6b99ab4c1683573c5] [formerly 0bdefaabdd [formerly b15b6514fd]]]
Former-commit-id: 4ed11ed31d729a58e65623190825ad7f9752e965 [formerly 065d66e16f596dc5c644abeda291d4875dffd692] [formerly a87ac48a53 [formerly 5e0aa25048]]
Former-commit-id: 7c14b9a80a6d6cd646ea46f9150e27cebbf7badd [formerly a87ac48a53]
Former-commit-id: 03dea47a31
|
2014-06-12 11:21:15 -05:00 |
|
Brian Clements
|
3b473b98b0
|
Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: 5f857eecc1 [formerly 83654c374a] [formerly 455af3612f] [formerly 455af3612f [formerly b774503931]] [formerly 5f857eecc1 [formerly 83654c374a] [formerly 455af3612f] [formerly 455af3612f [formerly b774503931]] [formerly 8dce7e9b85 [formerly 455af3612f [formerly b774503931] [formerly 8dce7e9b85 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: 88d59908ab [formerly 99aa4f0609] [formerly c4447fc6c4] [formerly 14a2dfe2e5ba3df28b93c4680fa0031e01529b31 [formerly 37f456b3eef102abf5d925b72829fa1b004f3f65] [formerly c4447fc6c4 [formerly 4078bbaa63]]]
Former-commit-id: 42f77a355570b89ab8a39d2a33967044b8275899 [formerly 96f3e9e0d2145c1f447ab45ea7213e6832a6a06b] [formerly f0ce9a6ca8 [formerly 213aab834f]]
Former-commit-id: f0ce9a6ca8
Former-commit-id: 0f25e9985e
|
2014-05-20 11:04:57 -05:00 |
|
Brian Clements
|
bc17c05be0
|
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: 234fe807c3 [formerly 5bf4c253f6] [formerly b5e961d6b4] [formerly b5e961d6b4 [formerly 0e18d45bdf]] [formerly 234fe807c3 [formerly 5bf4c253f6] [formerly b5e961d6b4] [formerly b5e961d6b4 [formerly 0e18d45bdf]] [formerly 573ffcb0bf [formerly b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: ac4dab87ae [formerly bb827663c3] [formerly 6769aff618] [formerly dd6e07e90dff0d24ca90605d4df1d73810a9f0bf [formerly 411223a0944f43546d208c57f0dc4a1e1af7c28d] [formerly 6769aff618 [formerly e4433c5e10]]]
Former-commit-id: 1ef8858cdbc1ab331a10e3817372eec1488eae05 [formerly ed80a833a4a6585be47a91576eada507814b0659] [formerly 008c911f03 [formerly 3c6a10e154]]
Former-commit-id: 008c911f03
Former-commit-id: 738a2c4513
|
2014-05-19 15:54:36 -05:00 |
|
Brian Clements
|
c0c87e6f22
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: bad8aa9f9a [formerly 02c921ed12] [formerly 729e717be1] [formerly 729e717be1 [formerly f545c548cc]] [formerly bad8aa9f9a [formerly 02c921ed12] [formerly 729e717be1] [formerly 729e717be1 [formerly f545c548cc]] [formerly 1432aa1302 [formerly 729e717be1 [formerly f545c548cc] [formerly 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]]
Former-commit-id: 1432aa1302
Former-commit-id: b81b5605bb [formerly 0fbb5dc22a] [formerly 8674841154] [formerly 4dca079e913bd1c3ba819e06f3ad0cc7f5bff379 [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e] [formerly 8674841154 [formerly 5583c3903b]]]
Former-commit-id: 4f27ba7dd91739399284144828fccfd57b4932c2 [formerly db57e64f5cb253ecb97388555bf76c0cac27eaf9] [formerly 89f3a0a1d2 [formerly 3a60b0db05]]
Former-commit-id: 89f3a0a1d2
Former-commit-id: 8bb6a1ac40
|
2014-05-06 09:30:07 -05:00 |
|
Nate Jensen
|
dd381f8eef
|
Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: a04c94cd3a [formerly 54c6d5d07f] [formerly d759efcaa8] [formerly d759efcaa8 [formerly f4d20c41f4]] [formerly a04c94cd3a [formerly 54c6d5d07f] [formerly d759efcaa8] [formerly d759efcaa8 [formerly f4d20c41f4]] [formerly 7d142d9d9d [formerly d759efcaa8 [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: d628a35190 [formerly 9f08442039] [formerly 6f211aa9f8] [formerly 5f39592127424fdbfd541cb9ad900156ca7b08d9 [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928] [formerly 6f211aa9f8 [formerly f3b68178bd]]]
Former-commit-id: 284f15cfa02f77249746a7ed93cb8d07343d9c84 [formerly 930f4906645edbcafbe567a1652cb392d52f18a5] [formerly 42a27546f9 [formerly 3f9a33bf35]]
Former-commit-id: 42a27546f9
Former-commit-id: 2b6ad3264c
|
2014-05-01 16:28:16 -05:00 |
|
Brian Clements
|
c58689428b
|
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: 24d78df3a3 [formerly 345fe6f866] [formerly 334ad3ca81] [formerly 334ad3ca81 [formerly 02f08d75c6]] [formerly 24d78df3a3 [formerly 345fe6f866] [formerly 334ad3ca81] [formerly 334ad3ca81 [formerly 02f08d75c6]] [formerly 94aa761e19 [formerly 334ad3ca81 [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]]]
Former-commit-id: 94aa761e19
Former-commit-id: 2da5a84931 [formerly 32b8ddd64c] [formerly 84f75ca30a] [formerly 3e664a0f7c1ed60cb3291437113ff9152b3eeacd [formerly 71f1e691809a438edfee89c10c322f7e092afc10] [formerly 84f75ca30a [formerly 12304655e8]]]
Former-commit-id: f438f5a8062d9a7b8b61327dbe83e586ffc4c733 [formerly 7d1e4b70e650e3930f0ba2b7d95a341ff827b93d] [formerly 670c4e1611 [formerly c27f2d9e53]]
Former-commit-id: 670c4e1611
Former-commit-id: d3813b0f96
|
2014-04-24 16:10:27 -05:00 |
|
Brian Clements
|
339f29b782
|
Issue #2955 ignore duplicate session invites
Former-commit-id: d9b4a08588 [formerly 9f18c5d54c] [formerly e81ee94171] [formerly e81ee94171 [formerly f888819646]] [formerly d9b4a08588 [formerly 9f18c5d54c] [formerly e81ee94171] [formerly e81ee94171 [formerly f888819646]] [formerly 4fa9afc9ae [formerly e81ee94171 [formerly f888819646] [formerly 4fa9afc9ae [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 8261f7b7b0 [formerly 363632479a] [formerly 39c2a1ac37] [formerly f74bf5f8fb8a1759b7aa393ac59440d655eb4bd5 [formerly 8ac39537a1c44d7ebe4df3667107708e5209338d] [formerly 39c2a1ac37 [formerly 75465b69ed]]]
Former-commit-id: f590f420cac3fd1a99d49736b3c99b3dff3e2dac [formerly 729b6df5f19a32c2faab5eaeae7c9625470cf031] [formerly 9e2497714b [formerly 3b96c4c628]]
Former-commit-id: 9e2497714b
Former-commit-id: 88c8e3be8e
|
2014-04-24 09:25:54 -05:00 |
|
Lee Venable
|
6950d530ab
|
Issue #3040 - Fixed contact request and group name issues.
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: 4240501e8c [formerly e17fa9f609] [formerly eed8c6cbba] [formerly eed8c6cbba [formerly df05a79d63]] [formerly 4240501e8c [formerly e17fa9f609] [formerly eed8c6cbba] [formerly eed8c6cbba [formerly df05a79d63]] [formerly f13ac7e1b9 [formerly eed8c6cbba [formerly df05a79d63] [formerly f13ac7e1b9 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 8cfca23cc2 [formerly 0c67eecb00] [formerly 421a4e4677] [formerly 9d190430537ae32fe9dcd3a63196e8a205243135 [formerly 0c6b693c6efe16d8a10f2143e1a25863ed0ea9e1] [formerly 421a4e4677 [formerly 222154d094]]]
Former-commit-id: 4161d06b26dc823e97c9556d7e8c9f5362de475c [formerly d5533a155ad3c0d43ac03773bee2a4a39ca0e4aa] [formerly 6c54817117 [formerly e81836e371]]
Former-commit-id: 6c54817117
Former-commit-id: cb2d378302
|
2014-04-23 18:24:25 -05:00 |
|
Nate Jensen
|
9f6b04dfbe
|
Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: 4acadd611b [formerly 68e3650305] [formerly 827112349a] [formerly 827112349a [formerly ad6e4712d6]] [formerly 4acadd611b [formerly 68e3650305] [formerly 827112349a] [formerly 827112349a [formerly ad6e4712d6]] [formerly 2b20cf5440 [formerly 827112349a [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]]]
Former-commit-id: 2b20cf5440
Former-commit-id: ed07b603b4 [formerly 73a3cde77b] [formerly 418741ce55] [formerly 15f4d0ad0a59ffeb57fac31b48121a3883d5836a [formerly 56369e0fe9e69598af2bbd95632d4f6ff4857957] [formerly 418741ce55 [formerly a0423843b3]]]
Former-commit-id: 54aabb374f0d1a47a80aed02d317894493861804 [formerly 92e3587e5640d2a1f27ca32c1843be9b9df2ba4a] [formerly 61eca0980f [formerly 1abd65120e]]
Former-commit-id: 61eca0980f
Former-commit-id: bfc78fc68f
|
2014-04-23 15:30:44 -05:00 |
|
Brian Clements
|
38a621d020
|
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: 1f5f46785e [formerly 148d158380] [formerly 117eeca83a] [formerly 117eeca83a [formerly f3ee7b453a]] [formerly 1f5f46785e [formerly 148d158380] [formerly 117eeca83a] [formerly 117eeca83a [formerly f3ee7b453a]] [formerly 6969321db0 [formerly 117eeca83a [formerly f3ee7b453a] [formerly 6969321db0 [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]]]
Former-commit-id: 6969321db0
Former-commit-id: 3ce9ece9e1 [formerly 00ebd60fad] [formerly 50acaac149] [formerly 2d7e8a5eb239dc7ffb00cbe0c5f342fd535dae50 [formerly a24c2596dc9f506edbc4e849e78e744becb558ec] [formerly 50acaac149 [formerly 5d2ec9b909]]]
Former-commit-id: fdbf0ceebbc19c7433b43fc60f20c944777fe96c [formerly fbd7e100e18e887890a44088729e97f34fef0552] [formerly 8cdeb571f3 [formerly d9a1bba4c8]]
Former-commit-id: 52373e678dd828b595eb30d5b08ff56a843ab997 [formerly 8cdeb571f3]
Former-commit-id: 9c6a004507
|
2014-04-23 14:16:42 -05:00 |
|
Nate Jensen
|
71357aa270
|
Issue #3060 safety checks for SWT widgets being disposed
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: a9bb37c76c [formerly 37371486ba] [formerly fbecf66f79] [formerly fbecf66f79 [formerly 426f103e7b]] [formerly a9bb37c76c [formerly 37371486ba] [formerly fbecf66f79] [formerly fbecf66f79 [formerly 426f103e7b]] [formerly 38d493ff1b [formerly fbecf66f79 [formerly 426f103e7b] [formerly 38d493ff1b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 438fa9e278 [formerly 342c851b04] [formerly 2b68a49a43] [formerly ac83a7cd8d072f71574972564f5e73086558784d [formerly f2ca8041ae7698bcc9759ba71d21e9d90aae5740] [formerly 2b68a49a43 [formerly 20f3f8ffa2]]]
Former-commit-id: daabb3e317e6fe16e4e62c189961c47699a75b70 [formerly 455ce998f25ebf8f278cbe9b316a5e569c7eb06a] [formerly 7c349e268e [formerly ff9101c057]]
Former-commit-id: 7c349e268e
Former-commit-id: 52cf9e0b37
|
2014-04-23 12:26:27 -05:00 |
|
Nate Jensen
|
7119bd963f
|
Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: c371d1b937 [formerly bf06389b9e] [formerly cc1da5fb88] [formerly cc1da5fb88 [formerly fe3ff669a7]] [formerly c371d1b937 [formerly bf06389b9e] [formerly cc1da5fb88] [formerly cc1da5fb88 [formerly fe3ff669a7]] [formerly 8df505325c [formerly cc1da5fb88 [formerly fe3ff669a7] [formerly 8df505325c [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]]]
Former-commit-id: 8df505325c
Former-commit-id: a819e0e983 [formerly 9ca82ebdd7] [formerly 484b197a56] [formerly 003afe7b0dd2f78a11b1ed491e28e1b4755032a7 [formerly 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10] [formerly 484b197a56 [formerly be6818e96b]]]
Former-commit-id: abb3172eb0e7e43c97990db80a3917d58bcfdfdd [formerly 5eea4c11b89c95940f50903c81294fd99a1657b7] [formerly 2b71b60b2e [formerly ad96f9d128]]
Former-commit-id: 2b71b60b2e
Former-commit-id: c93aa94cde
|
2014-04-22 12:50:27 -05:00 |
|
Brian Clements
|
fd04b886bd
|
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: b0436d483a [formerly a5730ca7bd] [formerly bfd88f3e14] [formerly bfd88f3e14 [formerly 1adbf6253a]] [formerly b0436d483a [formerly a5730ca7bd] [formerly bfd88f3e14] [formerly bfd88f3e14 [formerly 1adbf6253a]] [formerly 2a9d341910 [formerly bfd88f3e14 [formerly 1adbf6253a] [formerly 2a9d341910 [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]]]
Former-commit-id: 2a9d341910
Former-commit-id: 6776872d3f [formerly 38fbf8048e] [formerly 19c2695dca] [formerly be927b593a6bbbca71f49688ece47509fc975883 [formerly a85a4bc02f2dd752ca54943517184b9bdbf83b43] [formerly 19c2695dca [formerly 8677a9f359]]]
Former-commit-id: 9d1f5e00a06930c1269b643eed445ea2da3c4b13 [formerly f678746e9629ae3e37e221f399d19883fbdc4848] [formerly d74f192819 [formerly 97c5fe6d4a]]
Former-commit-id: 92746480363a898f4fa8e8918fd2eccdf4193a3d [formerly d74f192819]
Former-commit-id: e750a1e5a5
|
2014-04-22 11:55:36 -05:00 |
|
Brian Clements
|
e01393773c
|
Issue #3038 added initialized flag to session feed view
differentiates between roster population and new joins
Former-commit-id: 1dd924a344 [formerly 1665175d35] [formerly cdf3aa90e9] [formerly cdf3aa90e9 [formerly 717cdf4280]] [formerly 1dd924a344 [formerly 1665175d35] [formerly cdf3aa90e9] [formerly cdf3aa90e9 [formerly 717cdf4280]] [formerly ef61a7c281 [formerly cdf3aa90e9 [formerly 717cdf4280] [formerly ef61a7c281 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]]]
Former-commit-id: ef61a7c281
Former-commit-id: 84738fd336 [formerly 001e0b030b] [formerly e7005953eb] [formerly c9f733b98a9b16af4614618868ac0c1bf97d6712 [formerly 80e474ab1d11f23309bd83f864334950b90dc4ac] [formerly e7005953eb [formerly 295ff106b6]]]
Former-commit-id: f15997242a2a1cbd40238d6b79d222ec4917a138 [formerly 2047ae5bb2050dbdf619f1a51871a47a0ff3718e] [formerly fb74637aa8 [formerly fb24e315bf]]
Former-commit-id: fb74637aa8
Former-commit-id: 95e4effdc3
|
2014-04-22 10:01:27 -05:00 |
|
Mike Duff
|
1acc01b3f9
|
Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023
Former-commit-id: f4f6283d2d [formerly 6da65fe71a] [formerly 71cf0d04e7] [formerly 71cf0d04e7 [formerly ead90bc794]] [formerly f4f6283d2d [formerly 6da65fe71a] [formerly 71cf0d04e7] [formerly 71cf0d04e7 [formerly ead90bc794]] [formerly b507739637 [formerly 71cf0d04e7 [formerly ead90bc794] [formerly b507739637 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]]]
Former-commit-id: b507739637
Former-commit-id: 5a89a38bdb [formerly ebbb721787] [formerly 75f794d54d] [formerly 4eb4b1d4ec96e9267f15a3bdc7fdb64df0319cae [formerly 5c415e155bfe7e16d70fc0b35ad0574fc7085261] [formerly 75f794d54d [formerly 9a082a1588]]]
Former-commit-id: e6748562707dafa3ff73a5ced66ee6c2f4b1a74b [formerly 6157e38ab3e1698599dadf55b906513f06b68612] [formerly 6c4490b08c [formerly ae984e4c16]]
Former-commit-id: 6c4490b08c
Former-commit-id: 326b17ce50
|
2014-04-21 09:00:42 -05:00 |
|
Brian Clements
|
0772439e8a
|
Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: f684f0ba15 [formerly 78c1b34cdf] [formerly ef791fe481] [formerly ef791fe481 [formerly 1112ca621e]] [formerly f684f0ba15 [formerly 78c1b34cdf] [formerly ef791fe481] [formerly ef791fe481 [formerly 1112ca621e]] [formerly bb915796ad [formerly ef791fe481 [formerly 1112ca621e] [formerly bb915796ad [formerly f0bcc20987d814a716994f712c6132bb79963457]]]]]
Former-commit-id: bb915796ad
Former-commit-id: da3a638064 [formerly b8f40429ec] [formerly 549941882e] [formerly 86b243932dabc6aa511aae83de1899d7650098fa [formerly fd6c03748bfb24190c526a992357f258a7c91630] [formerly 549941882e [formerly 5c46c768d2]]]
Former-commit-id: 84d2ad62bc839a16b0cc2b8c7eb462e93741ae76 [formerly df9e17c1cd4d0111d5fb577725292b44c1b93fd4] [formerly 9a8c3231c6 [formerly f674aa07d7]]
Former-commit-id: 9a8c3231c6
Former-commit-id: cdd2dc4286
|
2014-04-16 14:33:02 -05:00 |
|
Brian Clements
|
b093b80cd6
|
Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: 333d7dcc62 [formerly dc1d2d39f8] [formerly db67c03382] [formerly db67c03382 [formerly 5250f7a442]] [formerly 333d7dcc62 [formerly dc1d2d39f8] [formerly db67c03382] [formerly db67c03382 [formerly 5250f7a442]] [formerly 6ccedc1182 [formerly db67c03382 [formerly 5250f7a442] [formerly 6ccedc1182 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]]]
Former-commit-id: 6ccedc1182
Former-commit-id: f6dff38a66 [formerly 602794b56d] [formerly 6f9ef9a515] [formerly f9ad23259e02a9c98bec3c6ac5bf461d32158c9e [formerly fffe96d7c192b1e0ed78a1625828ff61c7efe072] [formerly 6f9ef9a515 [formerly e8907aa729]]]
Former-commit-id: 62d9f2ac204d6390f0b001b33d13210a691ee214 [formerly 05d59da434ed10fbd0f9d1601a73552672294e6c] [formerly 8945b26e9b [formerly 9acb5a4a5b]]
Former-commit-id: 8945b26e9b
Former-commit-id: 2a8d66a9f7
|
2014-04-15 15:15:11 -05:00 |
|
Brian Clements
|
03aa181ed2
|
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: 7851991135 [formerly 3d8bcb8701] [formerly 6f7851d8c4] [formerly 6f7851d8c4 [formerly 8ab1bab974]] [formerly 7851991135 [formerly 3d8bcb8701] [formerly 6f7851d8c4] [formerly 6f7851d8c4 [formerly 8ab1bab974]] [formerly 6b22374046 [formerly 6f7851d8c4 [formerly 8ab1bab974] [formerly 6b22374046 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]]]
Former-commit-id: 6b22374046
Former-commit-id: 31fddf3a59 [formerly 5b5669e1e1] [formerly ca5909e222] [formerly 509c510e6c0fbbec98be1eaeed13f6ff08c1f56d [formerly 3329c6cc7af41bc830f1a278385881ed9ff2d11c] [formerly ca5909e222 [formerly 7cf5f06f2a]]]
Former-commit-id: c9b5100b1da676cb4cb5ef8dee8cc8bea9adddf2 [formerly 54da4997513795ce82cf53a0964eb73eee1095d9] [formerly 86081dda91 [formerly 054b47951d]]
Former-commit-id: 86081dda91
Former-commit-id: 19d7cef419
|
2014-04-15 15:12:33 -05:00 |
|
Mike Duff
|
a359562522
|
Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722
Former-commit-id: 8a4ff61155 [formerly c70da23f91] [formerly 3a6e718ff0] [formerly 3a6e718ff0 [formerly 81e4c9b05d]] [formerly 8a4ff61155 [formerly c70da23f91] [formerly 3a6e718ff0] [formerly 3a6e718ff0 [formerly 81e4c9b05d]] [formerly d2a80ca966 [formerly 3a6e718ff0 [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]]]
Former-commit-id: d2a80ca966
Former-commit-id: 1c325ae535 [formerly dceb75c423] [formerly 0bf14203ff] [formerly 5c7a4c71abbecedb3aa0c21693baaf0dec59b071 [formerly 97976d43b384551d73f379695ead9b9d54c82cb5] [formerly 0bf14203ff [formerly 4773c3722c]]]
Former-commit-id: 767efe440edb9bb40e18f13e9a1b243ccfe87487 [formerly 8b2b23ba29774d082ea5cf0ea4bc20efdf754a73] [formerly 78a0ad33ef [formerly ddeb7fe4d2]]
Former-commit-id: 78a0ad33ef
Former-commit-id: a2316806a5
|
2014-04-15 10:10:18 -05:00 |
|
Brad Gonzales
|
e316eb8353
|
Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 1bf427df2b [formerly 0380e02c77] [formerly 5fcec27765] [formerly 5fcec27765 [formerly cc0fd1e9af]] [formerly 1bf427df2b [formerly 0380e02c77] [formerly 5fcec27765] [formerly 5fcec27765 [formerly cc0fd1e9af]] [formerly ea03096031 [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]]]
Former-commit-id: ea03096031
Former-commit-id: f58b285c7c [formerly ccc4bc5a27] [formerly e41f9defa4] [formerly e642cef69032186e6737d99673df7f1b5d2fbca1 [formerly 4877a895772c022be238b72f3f06a1ed801f3390] [formerly e41f9defa4 [formerly 3b25edad9a]]]
Former-commit-id: 51052d2720d1ccd480e0b41238f1d3fb5f6a92db [formerly 7532bd6c2903b0a647393634444c14f575bbb9a0] [formerly 91d546d015 [formerly 8f72707b3a]]
Former-commit-id: 91d546d015
Former-commit-id: 34981c24ea
|
2014-04-10 14:01:53 -05:00 |
|
Mike Duff
|
6ac1042202
|
Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: 5018590601 [formerly 7c9a7d609e] [formerly bdde561f8a] [formerly bdde561f8a [formerly efefe62e0f]] [formerly 5018590601 [formerly 7c9a7d609e] [formerly bdde561f8a] [formerly bdde561f8a [formerly efefe62e0f]] [formerly 7da1547c22 [formerly bdde561f8a [formerly efefe62e0f] [formerly 7da1547c22 [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]]]
Former-commit-id: 7da1547c22
Former-commit-id: 0e3ed09a1b [formerly 6fd58b3778] [formerly 2b67272b60] [formerly 677ea0dc27d3f1e062e4d469dd627ac0115a66c4 [formerly 130275c111513af444bdaa0efc7abcffce08c460] [formerly 2b67272b60 [formerly 7145820d62]]]
Former-commit-id: 8324ef6a6467b60380c5dff458cc77d4ee36a83e [formerly 8e79399cf0153a7c7c8746851927e35e63f1b36b] [formerly 2b520fe31e [formerly 3c6c0824ce]]
Former-commit-id: 2b520fe31e
Former-commit-id: dc7d97752f
|
2014-04-08 14:14:20 -05:00 |
|
Nate Jensen
|
7cde3b1f78
|
Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
Former-commit-id: ed18aedfee [formerly 72c8f1d844] [formerly c0704488cc] [formerly c0704488cc [formerly 6b20d38b1a]] [formerly ed18aedfee [formerly 72c8f1d844] [formerly c0704488cc] [formerly c0704488cc [formerly 6b20d38b1a]] [formerly 579d2416cb [formerly c0704488cc [formerly 6b20d38b1a] [formerly 579d2416cb [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]]]
Former-commit-id: 579d2416cb
Former-commit-id: 7e8c7e739b [formerly 5821a0e0e0] [formerly d5d42f2f6b] [formerly f1e8c8d20d694029199f592528a7e952c2e0daf9 [formerly b937a5eaf68a15c6804ca9d1bfabddacdd99ff79] [formerly d5d42f2f6b [formerly 19560ebc7c]]]
Former-commit-id: fa09d55fb93d1471a2cc4ec7ac6ac1baa62d0c16 [formerly bf3a7ac4f9e4177a919e5423eb8d193e349a283a] [formerly 691c4411fc [formerly 62f1451e50]]
Former-commit-id: 691c4411fc
Former-commit-id: 51502f7db5
|
2014-04-02 11:23:02 -05:00 |
|
Mike Duff
|
8564bffff9
|
Issue #2632 - Remove user from list on sign-off. Fixed check for available
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe
Former-commit-id: 9f34e00d7f [formerly ac9678dc6e] [formerly 2a9b434883] [formerly 2a9b434883 [formerly 538261f6d5]] [formerly 9f34e00d7f [formerly ac9678dc6e] [formerly 2a9b434883] [formerly 2a9b434883 [formerly 538261f6d5]] [formerly d5df936431 [formerly 2a9b434883 [formerly 538261f6d5] [formerly d5df936431 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]]]
Former-commit-id: d5df936431
Former-commit-id: 67ff8b4545 [formerly 378909ad2c] [formerly 7aa5cebfb0] [formerly 05a81a38bbb6d1d3726990772de2ab76cbf4f4cf [formerly 42269ff35b4c62e12785ae2a916e17bf654fe7c6] [formerly 7aa5cebfb0 [formerly 92f1a3a9aa]]]
Former-commit-id: 0fddd6047b8b3863e8d34942c2cb2b94d8c6691c [formerly 326f3902389d6b4cb29f450dd9b92a133b682aa9] [formerly ce774c07a8 [formerly 0aea45197a]]
Former-commit-id: ce774c07a8
Former-commit-id: a5a38133ca
|
2014-04-02 10:08:45 -05:00 |
|
Mike Duff
|
6ee09cada6
|
Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500
Former-commit-id: 918ce90850 [formerly 656966669d] [formerly 66181ca3a5] [formerly 66181ca3a5 [formerly 8967ddd94a]] [formerly 918ce90850 [formerly 656966669d] [formerly 66181ca3a5] [formerly 66181ca3a5 [formerly 8967ddd94a]] [formerly 169ad502de [formerly 66181ca3a5 [formerly 8967ddd94a] [formerly 169ad502de [formerly 9ffc540c21245b308334040234be03d78a501656]]]]]
Former-commit-id: 169ad502de
Former-commit-id: 1bf5296ac3 [formerly fe8961bb24] [formerly 3686e50328] [formerly 0530eed373d7b866ba878ce2eabefabbf13902a5 [formerly f6d2ebf70d78eeca18274f66c05c2ad2791f600b] [formerly 3686e50328 [formerly f117f575eb]]]
Former-commit-id: 66c8ed23b9f2e33efeedac6aeceafa6c914a4e42 [formerly 4d6d18da98db131b315736ebe9f687afb4224c68] [formerly cc53c1ac23 [formerly 54d17b375f]]
Former-commit-id: cc53c1ac23
Former-commit-id: 5d31ddb1ca
|
2014-04-02 08:12:53 -05:00 |
|
Brad Gonzales
|
495cc358af
|
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: 2bf330935d [formerly 85911a9d01] [formerly d4659c48a6] [formerly d4659c48a6 [formerly 404faeeca0]] [formerly 2bf330935d [formerly 85911a9d01] [formerly d4659c48a6] [formerly d4659c48a6 [formerly 404faeeca0]] [formerly 15e1b7a7f6 [formerly d4659c48a6 [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: 40dc41ae6e [formerly c12c4cf7e2] [formerly 1c685a9eb6] [formerly ceb7ccb67ec42d2f0d020581bc76a1156c1ff415 [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5] [formerly 1c685a9eb6 [formerly 2f56fd3c9d]]]
Former-commit-id: c55c77ed104cc2dfe627b6c9074e4279771f8f00 [formerly 742e4cc46d2a1218def59e841a9507b8581e81ce] [formerly 5506e9362a [formerly 4940c40a7f]]
Former-commit-id: 5506e9362a
Former-commit-id: 2637e3c237
|
2014-03-31 11:45:22 -05:00 |
|
Lee Venable
|
7dddbb922f
|
Issue #2960 - added checks for SashForm weights
Former-commit-id: 5eb3a137a3 [formerly 0b8d762f4b] [formerly bdb18ea85b] [formerly bdb18ea85b [formerly 19dd95ba24]] [formerly 5eb3a137a3 [formerly 0b8d762f4b] [formerly bdb18ea85b] [formerly bdb18ea85b [formerly 19dd95ba24]] [formerly 3018ff1f5f [formerly bdb18ea85b [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 9cf5ea875e [formerly 5ffe5c01f6] [formerly f7e1ee666b] [formerly 3f34ee33a68191d1c2dea86866b50e70fe31fcbb [formerly 8994df39c007e35516677413a4a7d0c0f74e7bc6] [formerly f7e1ee666b [formerly 1504b3532e]]]
Former-commit-id: ee627da1b93ae293b4fb8e63efe70112e3a94eac [formerly 8b5260355b4e750a39f73f261eadbf55b49f4555] [formerly d1928c95d9 [formerly 5bbb65637e]]
Former-commit-id: d1928c95d9
Former-commit-id: 2644d48fc0
|
2014-03-28 15:30:11 -05:00 |
|
Mike Duff
|
a8e8dd0451
|
Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b
Former-commit-id: cf52ba27a7 [formerly 5476afd095] [formerly d2eed9891a] [formerly d2eed9891a [formerly d803986440]] [formerly cf52ba27a7 [formerly 5476afd095] [formerly d2eed9891a] [formerly d2eed9891a [formerly d803986440]] [formerly 98b5fd762e [formerly d2eed9891a [formerly d803986440] [formerly 98b5fd762e [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]]]
Former-commit-id: 98b5fd762e
Former-commit-id: 9138df77b8 [formerly cd626d0555] [formerly f92754f752] [formerly 2fb8227b9ab14758e44f060685c62a92e542d8d7 [formerly 7b61ae882d35a9231f7bff856832af42ae2f309a] [formerly f92754f752 [formerly b1d74f855e]]]
Former-commit-id: 235ae3f3f9be4da11524918f760776b2d03c98ab [formerly 7aadfd7a15d93ff37cbf9b952a4c1868beb41dee] [formerly 5e0e640336 [formerly 531e66cbb6]]
Former-commit-id: 5e0e640336
Former-commit-id: db4d8b76f0
|
2014-03-27 16:31:30 -05:00 |
|
Nate Jensen
|
0b128770e3
|
Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: 249f56e06a [formerly d1ca7d7c75] [formerly c7dc0baeb9] [formerly c7dc0baeb9 [formerly 38e3305e60]] [formerly 249f56e06a [formerly d1ca7d7c75] [formerly c7dc0baeb9] [formerly c7dc0baeb9 [formerly 38e3305e60]] [formerly 4861f92ef6 [formerly c7dc0baeb9 [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 2164b59651 [formerly 0a9da8ca6c] [formerly 307cdc15c1] [formerly c19460410d9a6b6b6cbbd2043fc97661dfeaf15c [formerly f289ec627b5f30e10b3a962e1f08f3e13492e4e2] [formerly 307cdc15c1 [formerly 7c581cb5d7]]]
Former-commit-id: c9a190f018f598222de48dd0488e85d6c0ca861a [formerly 2b59d9930948c459e8f6edef62cf78dc6f8d5fda] [formerly a36bdb3b99 [formerly 015dc45eba]]
Former-commit-id: a36bdb3b99
Former-commit-id: 64be4dae2d
|
2014-03-25 13:11:29 -05:00 |
|
Mike Duff
|
59465950ec
|
Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2
Former-commit-id: 05c4412aa3 [formerly 1d0edcc2c6] [formerly 758fdca514] [formerly 758fdca514 [formerly 1e42d8a30d]] [formerly 05c4412aa3 [formerly 1d0edcc2c6] [formerly 758fdca514] [formerly 758fdca514 [formerly 1e42d8a30d]] [formerly a06f058ea9 [formerly 758fdca514 [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]]]
Former-commit-id: a06f058ea9
Former-commit-id: b047f7ff5c [formerly 47402575c0] [formerly 81ac35a1b8] [formerly e7fcf7f5966681d912778265f1da3bd05367933e [formerly 6fb4c8dc2286133134b00c03341141f90a3454df] [formerly 81ac35a1b8 [formerly d497c533e6]]]
Former-commit-id: 0b709cc77ff9e2d3cf77d05556d8aec2eaa5f313 [formerly 2740eb49374c5a2de83bcfcf6da18c01c8648899] [formerly 7705874ea3 [formerly 97c4e48255]]
Former-commit-id: 7705874ea3
Former-commit-id: 3b224f6ac9
|
2014-03-25 11:18:09 -05:00 |
|
Nate Jensen
|
d7c4d7486a
|
Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994
Former-commit-id: e5bf712521 [formerly c6474ef98e] [formerly d1f080fd05] [formerly d1f080fd05 [formerly 68f9181340]] [formerly e5bf712521 [formerly c6474ef98e] [formerly d1f080fd05] [formerly d1f080fd05 [formerly 68f9181340]] [formerly 7b586ebd67 [formerly d1f080fd05 [formerly 68f9181340] [formerly 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]]]
Former-commit-id: 7b586ebd67
Former-commit-id: e948352253 [formerly 19b2056aaf] [formerly 447b1a36bb] [formerly 2204b624fa1e73c825b038623dc2645b41614960 [formerly 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0] [formerly 447b1a36bb [formerly 0cad1fa167]]]
Former-commit-id: 945ba2195dcc4cbb89f03d099c646acbb0acd50a [formerly 48d96d20b890321c6bbe7e22129e08fa04053556] [formerly 8e3b78ba6a [formerly a5b0c8b432]]
Former-commit-id: 8e3b78ba6a
Former-commit-id: d085d6bfcb
|
2014-03-25 10:24:11 -05:00 |
|
Mike Duff
|
8a59589bed
|
Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840
Former-commit-id: 594f482c05 [formerly 0fd2a2a426] [formerly eacc161ee4] [formerly eacc161ee4 [formerly fd31ea7fa5]] [formerly 594f482c05 [formerly 0fd2a2a426] [formerly eacc161ee4] [formerly eacc161ee4 [formerly fd31ea7fa5]] [formerly ca27ceac1f [formerly eacc161ee4 [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]]]
Former-commit-id: ca27ceac1f
Former-commit-id: ce56f7d7c2 [formerly dd804a13ff] [formerly 86fc8d74d5] [formerly c71ce0e40560248fe7b6a4140d9eb633de22f82b [formerly 26a0a3d7ea325414e2b4fd69c1a38bcc0d1f1c56] [formerly 86fc8d74d5 [formerly fc7a71889c]]]
Former-commit-id: 9f88107f20922bcf3a90b96391fb238c0b6b46d9 [formerly aaf5ab7ad0f3fc0cc724c92a5e30b5288b163eed] [formerly 9075ec61a0 [formerly a1661a5389]]
Former-commit-id: 64c65f684e253b5f5667e9a229e9bc9831b71368 [formerly 9075ec61a0]
Former-commit-id: e9dae1a861
|
2014-03-24 14:59:33 -05:00 |
|
Nate Jensen
|
256ad070d1
|
Issue #2895 fixed telestration when leadership returns to a previous
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: 8a4ec70775 [formerly 1447abe995] [formerly 68b60eba47] [formerly 68b60eba47 [formerly e75d3dfb7c]] [formerly 8a4ec70775 [formerly 1447abe995] [formerly 68b60eba47] [formerly 68b60eba47 [formerly e75d3dfb7c]] [formerly 2fc1030fad [formerly 68b60eba47 [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 661bc0d29d [formerly 52e60a68a9] [formerly 8589374171] [formerly 59d6d697e2efc7ec95c573ffbda6729fd31c7e36 [formerly 389d920f6cf85e74cfa2b1864b84d9f952b0b23a] [formerly 8589374171 [formerly ca1ec93450]]]
Former-commit-id: 9b1ad4c8423dfea5568410975e7e420e0b7b36ab [formerly 2113aab9642e8adaee09df90029c31ddc9b73949] [formerly 1125203c93 [formerly 5cb38bd511]]
Former-commit-id: 1125203c93
Former-commit-id: a99fd8dbbb
|
2014-03-18 12:52:01 -05:00 |
|