Mike Duff
2f818f826e
Issue #2798 - Fix issue with color not changing for existing user changing site.
...
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: 8da72343b5
[formerly 3d62505600
] [formerly ac65a87fe5
] [formerly ac65a87fe5
[formerly 3d10260065
]] [formerly 8da72343b5
[formerly 3d62505600
] [formerly ac65a87fe5
] [formerly ac65a87fe5
[formerly 3d10260065
]] [formerly 7bdef60a55
[formerly ac65a87fe5
[formerly 3d10260065
] [formerly 7bdef60a55
[formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]]]
Former-commit-id: 7bdef60a55
Former-commit-id: 6c644e5b90
[formerly e0d65b3d63
] [formerly 1a3e88c5da
] [formerly 39646e99cc9b22639e0870da50df478d68162167 [formerly 28df91565a1ef26047c815bc98382442f1c3836b] [formerly 1a3e88c5da
[formerly 5bbe504f82
]]]
Former-commit-id: d6e0842d7e253f6838c6efc7eaa827a69caed768 [formerly 18df7f16b5a9135e21e0b5b37cd5579d82035bca] [formerly 179082ebf9
[formerly b560f16623
]]
Former-commit-id: 179082ebf9
Former-commit-id: 6f1a28796f
2014-03-18 11:55:00 -05:00
Nate Jensen
f4c5e239f6
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: 0d8a18bfe2
[formerly 84d698b111
] [formerly 0e39a89ea3
] [formerly 0e39a89ea3
[formerly 82778ad21b
]] [formerly 0d8a18bfe2
[formerly 84d698b111
] [formerly 0e39a89ea3
] [formerly 0e39a89ea3
[formerly 82778ad21b
]] [formerly f8180587d4
[formerly 0e39a89ea3
[formerly 82778ad21b
] [formerly f8180587d4
[formerly b723095f6d5d59b67370c7292f88f339d349993a]]]]]
Former-commit-id: f8180587d4
Former-commit-id: ab8c544783
[formerly dd1818bcd9
] [formerly 32ccf77885
] [formerly 2db7e257619ef8d1a26a143662bdad5c82297d4e [formerly e60e13c06f98e845a0be9a81f12628aa3cec8c08] [formerly 32ccf77885
[formerly 34c5d1de25
]]]
Former-commit-id: 85461c72cb5aa624b99e435f867ee0fe5679ce38 [formerly b179639787b8133c9613c1bd824d46ea7d5df645] [formerly 718d69723b
[formerly 2c0d7d2d3e
]]
Former-commit-id: 718d69723b
Former-commit-id: 16c7c19469
2014-03-12 16:05:19 -05:00
Mike Duff
a411735d34
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: d839f415cc
[formerly bb2b251cd0
] [formerly 6444131768
] [formerly 6444131768
[formerly 8068c9aa83
]] [formerly d839f415cc
[formerly bb2b251cd0
] [formerly 6444131768
] [formerly 6444131768
[formerly 8068c9aa83
]] [formerly e01c5c3534
[formerly 6444131768
[formerly 8068c9aa83
] [formerly e01c5c3534
[formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]]]
Former-commit-id: e01c5c3534
Former-commit-id: 7635a17685
[formerly cbc15d479a
] [formerly 4fddc0c631
] [formerly c6d39fee59b33a7ef93bde0c4ee72de3872ba741 [formerly ea4a4997b336401081920b43fb91017011502ca3] [formerly 4fddc0c631
[formerly 832dd498fc
]]]
Former-commit-id: 965182f7aca15243cc3ad38385975377d55b120b [formerly ad32cd2a661ff65b5b8dddf880094042db699f30] [formerly 6e1ef1196a
[formerly fc1cc39479
]]
Former-commit-id: 6e1ef1196a
Former-commit-id: 11e96f8bd5
2014-03-12 10:52:18 -05:00
Lee Venable
6be04118ac
Issue #2865 - added more null and dispose checks
...
Former-commit-id: abbe691c04
[formerly 7f6792f1c5
] [formerly fe6e7328c0
] [formerly fe6e7328c0
[formerly df65d7c7ce
]] [formerly abbe691c04
[formerly 7f6792f1c5
] [formerly fe6e7328c0
] [formerly fe6e7328c0
[formerly df65d7c7ce
]] [formerly 1f9d1af221
[formerly fe6e7328c0
[formerly df65d7c7ce
] [formerly 1f9d1af221
[formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]]]
Former-commit-id: 1f9d1af221
Former-commit-id: ca641ab5aa
[formerly 9b11bcedb1
] [formerly 8ef7fe57c4
] [formerly 3b52317e6604e730adbaa5a7538d6d705d91e999 [formerly ebbc4eff228045a38bf9d41b60b39929f6e27fbe] [formerly 8ef7fe57c4
[formerly 46fa017e1b
]]]
Former-commit-id: fa511f48d9ff2a1f6a50900667eae1acc53d2f08 [formerly 3cd64bcf0cda402268f02162ee27b86ac2bc3d26] [formerly 66a87595af
[formerly 0931ce72c9
]]
Former-commit-id: 66a87595af
Former-commit-id: b7b1d88680
2014-03-11 16:30:33 -05:00
Lee Venable
36bd0a6a60
Issue #2865 - fixed font memory leak
...
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d
Former-commit-id: e3b48437b0
[formerly 7aab4252d5
] [formerly 44733489b9
] [formerly 44733489b9
[formerly 2c67c4f6c4
]] [formerly e3b48437b0
[formerly 7aab4252d5
] [formerly 44733489b9
] [formerly 44733489b9
[formerly 2c67c4f6c4
]] [formerly 58d7f759b2
[formerly 44733489b9
[formerly 2c67c4f6c4
] [formerly 58d7f759b2
[formerly 2555d382f26278c5f972c17da778338142cdaaec]]]]]
Former-commit-id: 58d7f759b2
Former-commit-id: ade2c8c91d
[formerly 8bec7ebcb1
] [formerly 86e6547a63
] [formerly cec1932c708d7575379502146ec586d949ab30a3 [formerly 8fe2ec93b5265755e9333c787d93b1c92293eceb] [formerly 86e6547a63
[formerly a5487de998
]]]
Former-commit-id: 27c6e29dc5f9befc1f3236d07d9a899e2ec1a325 [formerly 97cae7373d3e7a83f0b8e4c464d4a9dab888a084] [formerly 374a2da1a1
[formerly 97a124ca58
]]
Former-commit-id: 374a2da1a1
Former-commit-id: ab2cc176e3
2014-03-11 10:31:50 -05:00
Brian Clements
ae2171dbb1
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: b149fd235d
[formerly 9b6c283fc9
] [formerly 2456c2308f
] [formerly 2456c2308f
[formerly dc55cd5b5c
]] [formerly b149fd235d
[formerly 9b6c283fc9
] [formerly 2456c2308f
] [formerly 2456c2308f
[formerly dc55cd5b5c
]] [formerly aee98ecfb0
[formerly 2456c2308f
[formerly dc55cd5b5c
] [formerly aee98ecfb0
[formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 04239e2c3a
[formerly 67db5cb4f8
] [formerly 3486f1f241
] [formerly 91efa04c395a12ae3e34ab6f127ff1accf82ed41 [formerly eb63cfebccc689b3ac62c518759624fc43c5c7b9] [formerly 3486f1f241
[formerly 4f9a2577f2
]]]
Former-commit-id: e66cbe5ae570e47be4797265f7ff81f571be743a [formerly 6188fed145573399f401e7319702f154913b200b] [formerly c4e9aff9fc
[formerly 6245b550aa
]]
Former-commit-id: 061d186dbece4c1ee44f046477936201872ebbf9 [formerly c4e9aff9fc
]
Former-commit-id: ac70455dc6
2014-03-10 14:06:45 -05:00
Brian Clements
0a6499148b
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: e930e8eedf
[formerly 8aff9ee95c
] [formerly 2afc1a9319
] [formerly 2afc1a9319
[formerly 44d161729f
]] [formerly e930e8eedf
[formerly 8aff9ee95c
] [formerly 2afc1a9319
] [formerly 2afc1a9319
[formerly 44d161729f
]] [formerly dc94769c14
[formerly 2afc1a9319
[formerly 44d161729f
] [formerly dc94769c14
[formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]]]
Former-commit-id: dc94769c14
Former-commit-id: f9aa74c8ac
[formerly cfe64d833a
] [formerly acb20cfbbe
] [formerly 079b4c780a559512c7426918a1285b813e6095a9 [formerly 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab] [formerly acb20cfbbe
[formerly ac63129ad1
]]]
Former-commit-id: 91a101a40c781971f0fddcb36e55d75ef08a499b [formerly f030c8528ac78571000ec83546e396d509e9d0ae] [formerly 975bfca460
[formerly 6590587d9e
]]
Former-commit-id: 975bfca460
Former-commit-id: e81c8368dd
2014-03-07 15:37:29 -06:00
Nate Jensen
605291fb36
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: be4474fbbd
[formerly dcbafebc0d
] [formerly ae9adefbf7
] [formerly ae9adefbf7
[formerly cf4631f9bf
]] [formerly be4474fbbd
[formerly dcbafebc0d
] [formerly ae9adefbf7
] [formerly ae9adefbf7
[formerly cf4631f9bf
]] [formerly 48fa8f8d1b
[formerly ae9adefbf7
[formerly cf4631f9bf
] [formerly 48fa8f8d1b
[formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]]]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: 2adc0d8179
[formerly ddebec5791
] [formerly b097d488ca
] [formerly a7e514b10624eeeb8ad8f352c3f00f7d60528845 [formerly 81dc1f611ab2e4fba7afbbabdd044e8afece9c33] [formerly b097d488ca
[formerly d3f18729c3
]]]
Former-commit-id: dbe1c15f9d2f9748569c5b81c44fda7bccd7cc92 [formerly 7efdb261cff848db48e2d71cacdd8d5280fbeb1f] [formerly f84030e2b7
[formerly 8380226f6b
]]
Former-commit-id: f84030e2b7
Former-commit-id: 2bc7230179
2014-03-05 14:41:12 -06:00
Mike Duff
4840f9b2be
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: b42cb216cb
[formerly ec892bb7a7
] [formerly 25425a4268
] [formerly 25425a4268
[formerly e97e745b61
]] [formerly b42cb216cb
[formerly ec892bb7a7
] [formerly 25425a4268
] [formerly 25425a4268
[formerly e97e745b61
]] [formerly 9c873e6dd9
[formerly 25425a4268
[formerly e97e745b61
] [formerly 9c873e6dd9
[formerly b087558dce4e19596c93d47e986af50fae806a74]]]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: 55e06d50ee
[formerly b88162e504
] [formerly 0251ad5bca
] [formerly a225b8cd8888e32dbda89ea1f1e4d4c2b5cda6f6 [formerly acfecc3a2b5c6336080649496608081ffae17a97] [formerly 0251ad5bca
[formerly c0bf150e15
]]]
Former-commit-id: acdf76db2c187d23a3c8a2cf8505c3e7d15ba878 [formerly 96b5f8c7c3c165fba26eb85059fdf5317d2287b5] [formerly 8a798710c5
[formerly 15c32a1513
]]
Former-commit-id: 3e08a4eb2051ed982a7296f1cf999fe1d60a759c [formerly 8a798710c5
]
Former-commit-id: f061ae43a1
2014-03-05 14:39:55 -06:00
Mike Duff
10c6d8d02f
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 08ce74faf2
[formerly a670398424
] [formerly 14107f0914
] [formerly 14107f0914
[formerly 8c693a5f70
]] [formerly 08ce74faf2
[formerly a670398424
] [formerly 14107f0914
] [formerly 14107f0914
[formerly 8c693a5f70
]] [formerly 9963324b60
[formerly 14107f0914
[formerly 8c693a5f70
] [formerly 9963324b60
[formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]]]]
Former-commit-id: 9963324b60
Former-commit-id: 6df1846790
[formerly 1c0d844dc2
] [formerly 198d9e6780
] [formerly 51e1a9d4e75b3295e4f1d7d96830580febef585d [formerly fd61ded4da051608ff2b758971fbc5bacbaca791] [formerly 198d9e6780
[formerly 3bdf20dea3
]]]
Former-commit-id: b6812745bea24d145412927cfd6a09b5fb8bea99 [formerly fad3c8f0caa37c2db8f82dd2e72cb5514148ddc8] [formerly c6e743bbc1
[formerly 85ac8c85e0
]]
Former-commit-id: c6e743bbc1
Former-commit-id: fd2f53f5cf
2014-03-05 12:02:33 -06:00
Brian Clements
ce7ad25fc2
Issue #2837 collaboration icon changes
...
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group
Former-commit-id: dbb0076f53
[formerly 17661200a1
] [formerly d76dd2a8f6
] [formerly d76dd2a8f6
[formerly c0e4615967
]] [formerly dbb0076f53
[formerly 17661200a1
] [formerly d76dd2a8f6
] [formerly d76dd2a8f6
[formerly c0e4615967
]] [formerly c9906cde88
[formerly d76dd2a8f6
[formerly c0e4615967
] [formerly c9906cde88
[formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]]]
Former-commit-id: c9906cde88
Former-commit-id: 328e5fe74f
[formerly f4a6d2a30d
] [formerly 3d4323b447
] [formerly 67bd24d7f9d56eb79363e39291cebcf9c660c3cc [formerly 1d8422aecbe75d313717ff186a0a87becafd9906] [formerly 3d4323b447
[formerly d06182573e
]]]
Former-commit-id: e22002ffe520e3ec29f15d3c6d8820ca115f6032 [formerly eca406e298a4b6e7098a2a7b0f34a68bbede8557] [formerly 6dc478d975
[formerly dec443b1af
]]
Former-commit-id: 6dc478d975
Former-commit-id: e75dde54ab
2014-03-05 09:00:57 -06:00
Max Schenkelberg
e75f1c3dbb
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: 75d19d6be6
[formerly dbc6cc3fc6
] [formerly 59434c8a60
] [formerly 59434c8a60
[formerly a01a6d68d0
]] [formerly 75d19d6be6
[formerly dbc6cc3fc6
] [formerly 59434c8a60
] [formerly 59434c8a60
[formerly a01a6d68d0
]] [formerly cbf8b9249c
[formerly 59434c8a60
[formerly a01a6d68d0
] [formerly cbf8b9249c
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: cef1660684
[formerly d85fd52c26
] [formerly 39e1c4fa46
] [formerly 98b658ee3024e50c70a3a9e734120a03e368a302 [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2] [formerly 39e1c4fa46
[formerly 654da3c0a2
]]]
Former-commit-id: 0af58fe5c63d46e47391570eeddad5b3cae58623 [formerly 22a289abbef9ce66bd6d9f68b9610a2b65dc9258] [formerly c6cf08db73
[formerly f509321134
]]
Former-commit-id: 9eadbcf5b459cbf8e5d87871218bd1a78327a18f [formerly c6cf08db73
]
Former-commit-id: 7c66cf792b
2014-03-04 09:23:36 -06:00
Mike Duff
ff4376a1ad
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 4bc3f2246e
[formerly 512e634a97
] [formerly 377c1f9998
] [formerly 377c1f9998
[formerly 5440ff64d1
]] [formerly 4bc3f2246e
[formerly 512e634a97
] [formerly 377c1f9998
] [formerly 377c1f9998
[formerly 5440ff64d1
]] [formerly 5f433b4f6b
[formerly 377c1f9998
[formerly 5440ff64d1
] [formerly 5f433b4f6b
[formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 791d43a7e8
[formerly 6c5c943a5e
] [formerly 63fc5f8c66
] [formerly 427ebdb00a8b1af62bf840973fa2e105fce74f21 [formerly 0494775290c2982f78ac45adef680a21db012453] [formerly 63fc5f8c66
[formerly ee06fc58b5
]]]
Former-commit-id: 216a5d991ef093fb81a0e5a3f9a9b80f3dc5f256 [formerly 7a26eed4e3d8caf57b1f136686d6c69b9947d11a] [formerly 6c60255b75
[formerly 02fa0d3c59
]]
Former-commit-id: d2446ac56c0a481fc3d29894af882e5a0c8275cf [formerly 6c60255b75
]
Former-commit-id: 60c471f48e
2014-02-28 13:23:34 -06:00
Mike Duff
0ae77549cb
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: c7010cef6e
[formerly 9eafacaac2
] [formerly a96a833f51
] [formerly a96a833f51
[formerly ed5cb91406
]] [formerly c7010cef6e
[formerly 9eafacaac2
] [formerly a96a833f51
] [formerly a96a833f51
[formerly ed5cb91406
]] [formerly a7b1e79d2d
[formerly a96a833f51
[formerly ed5cb91406
] [formerly a7b1e79d2d
[formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: b9ec3a51a9
[formerly 5754117aad
] [formerly f98eec12b9
] [formerly bb873ee8689e8af126e6f9070649a41326c264af [formerly 054cdc944f74842daa02964eb9d5d80d21f23654] [formerly f98eec12b9
[formerly d90f4495c2
]]]
Former-commit-id: f2ca9f0221be02120ff2c132625920832d17ff91 [formerly a5e60f93a5f9480cbb884fd30320154fc0368ef6] [formerly 692830c5c9
[formerly 5014499431
]]
Former-commit-id: 692830c5c9
Former-commit-id: b74ed7f1fe
2014-02-20 15:09:10 -06:00
Brian Clements
e0d683016d
Issue #2751 collab menu icons, fixed NPE
...
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog
Former-commit-id: 8a28feeaf3
[formerly 8bbf2bb6bd
] [formerly a2bdfa25cc
] [formerly a2bdfa25cc
[formerly aaa2de20f4
]] [formerly 8a28feeaf3
[formerly 8bbf2bb6bd
] [formerly a2bdfa25cc
] [formerly a2bdfa25cc
[formerly aaa2de20f4
]] [formerly 89a48c3f6b
[formerly a2bdfa25cc
[formerly aaa2de20f4
] [formerly 89a48c3f6b
[formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: fa2367e935
[formerly e7584f3a49
] [formerly 04697836b8
] [formerly 63e7657553ec4b681a5c8bb5dd8a3626c3291dd9 [formerly 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681] [formerly 04697836b8
[formerly 4b7ba54dc3
]]]
Former-commit-id: cf32a4d4097fa2e735019a5d442de88e420d7d47 [formerly c4d86142773d02aa243a5b8e729feaf2e433b4bc] [formerly 1d2406e180
[formerly e3973b9fc7
]]
Former-commit-id: 1d2406e180
Former-commit-id: 49b39bcaf6
2014-02-20 11:50:54 -06:00
Brian Clements
d26332deb4
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: 4f7cdd2193
[formerly 4e165aba58
] [formerly a8ff1effc1
] [formerly a8ff1effc1
[formerly c3cadff705
]] [formerly 4f7cdd2193
[formerly 4e165aba58
] [formerly a8ff1effc1
] [formerly a8ff1effc1
[formerly c3cadff705
]] [formerly ab72938246
[formerly a8ff1effc1
[formerly c3cadff705
] [formerly ab72938246
[formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]]]
Former-commit-id: ab72938246
Former-commit-id: e5b4513aed
[formerly 08a0e5baf2
] [formerly 9d00fe2bab
] [formerly 2665ff891848f5722aa0d8302f198724fb6cd1ac [formerly d96f62f0208dbdcb69677a9d6b014fc0a7761a39] [formerly 9d00fe2bab
[formerly d9ac2c0037
]]]
Former-commit-id: 270eff47404d5c367fd6b5c8d184f2e73fbc374a [formerly e46a572ae9fd237caee1e14f1bd4825f8f3b942b] [formerly 9b0fd74f5b
[formerly d218686d1f
]]
Former-commit-id: 9b0fd74f5b
Former-commit-id: cbef95a1bb
2014-02-20 11:10:14 -06:00
Nate Jensen
03252595a2
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: 5a0e714d10
[formerly f545a8a74d
] [formerly a241472c34
] [formerly a241472c34
[formerly df376abcb7
]] [formerly 5a0e714d10
[formerly f545a8a74d
] [formerly a241472c34
] [formerly a241472c34
[formerly df376abcb7
]] [formerly f99cf7df47
[formerly a241472c34
[formerly df376abcb7
] [formerly f99cf7df47
[formerly ff080a6b5184f486348a015f31b957325fa280fa]]]]]
Former-commit-id: f99cf7df47
Former-commit-id: e8fea48058
[formerly eeac24c773
] [formerly d3ec0da1bb
] [formerly 7f3f57a9c317f8ebe71fc0d9e4fc1f58fcff3fa2 [formerly 76b7d9b753824f510f6d112e0bfada581f946906] [formerly d3ec0da1bb
[formerly 8b152a8027
]]]
Former-commit-id: 46d1aca5ca36c9f3e4126bd5d88c33f21e9c5dba [formerly bcd8e67559fb255fbb3d3d11663bad0ea365591b] [formerly dbdcfa8e41
[formerly dafb323edb
]]
Former-commit-id: dbdcfa8e41
Former-commit-id: 8ee4ae7565
2014-02-19 16:19:27 -06:00
Mike Duff
e031ba72f9
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 8a79674715
[formerly 659cb1f2a0
] [formerly e2a6251a6b
] [formerly e2a6251a6b
[formerly 663ea8decd
]] [formerly 8a79674715
[formerly 659cb1f2a0
] [formerly e2a6251a6b
] [formerly e2a6251a6b
[formerly 663ea8decd
]] [formerly 95fcee385a
[formerly e2a6251a6b
[formerly 663ea8decd
] [formerly 95fcee385a
[formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]]]
Former-commit-id: 95fcee385a
Former-commit-id: efbbed4743
[formerly a723f69ad9
] [formerly 89c4a3e04b
] [formerly 154ef617520543ec30bf0df59f519c0eb29e4e11 [formerly 280611ef49d0a886c12f13b5471242ae42c55bac] [formerly 89c4a3e04b
[formerly 3100a71f34
]]]
Former-commit-id: e9dddad781aa2c358930c9b06c93d51be0d9d8c5 [formerly d105e7a0938fbc4a67695d10a5942cb2e4247a07] [formerly 401973b39e
[formerly 92d356f4f0
]]
Former-commit-id: 6f898f93ed2c80a6298cd22c3208f580dcfbd64b [formerly 401973b39e
]
Former-commit-id: 352b114250
2014-02-19 15:26:14 -06:00
Brian Clements
355048214f
Issue #2751 fixed chat room bugs
...
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client
Former-commit-id: 382d98bfbe
[formerly abc01f5475
] [formerly 06c16118e1
] [formerly 06c16118e1
[formerly dc074a9650
]] [formerly 382d98bfbe
[formerly abc01f5475
] [formerly 06c16118e1
] [formerly 06c16118e1
[formerly dc074a9650
]] [formerly 3a135b8eac
[formerly 06c16118e1
[formerly dc074a9650
] [formerly 3a135b8eac
[formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: c70baebf38
[formerly 30027665ac
] [formerly 77bb396c9a
] [formerly 24c5204089aa3197c0957cca1fb41faf1b32e85c [formerly 7c130f893c124249133b51cb750375f7ea62663d] [formerly 77bb396c9a
[formerly bee7cdb71a
]]]
Former-commit-id: f1e9553ae4f8652dc78a7be38a97ae56758b537b [formerly 2bd4a38066d755ff2faaae6125ca4744d0e08564] [formerly b47b194564
[formerly ddc0945e40
]]
Former-commit-id: bb2e238fe56b9efef877ce6f270926b36697c0ad [formerly b47b194564
]
Former-commit-id: c420979556
2014-02-19 08:32:26 -06:00
Brian Clements
02a3439581
Issue #2751 fixed blocked icon for roster entries
...
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels
Former-commit-id: 915c6b5195
[formerly ab8f47413f
] [formerly e894019715
] [formerly e894019715
[formerly a94b366e26
]] [formerly 915c6b5195
[formerly ab8f47413f
] [formerly e894019715
] [formerly e894019715
[formerly a94b366e26
]] [formerly 3307f5ea5e
[formerly e894019715
[formerly a94b366e26
] [formerly 3307f5ea5e
[formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: c84937fc17
[formerly f5a25c9030
] [formerly 02d3a9ae7e
] [formerly 18759a8a6c6cabf56b8fa73dbd4050e9c22b1b01 [formerly 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e] [formerly 02d3a9ae7e
[formerly 476d0c3257
]]]
Former-commit-id: 79999f5b7728b35c66b948aaf3233572244593d6 [formerly 6d18992103101e38f58bfbe34e30a1e17a53251b] [formerly df4c4af7e9
[formerly 6574733eba
]]
Former-commit-id: df4c4af7e9
Former-commit-id: 393036071a
2014-02-17 17:11:36 -06:00
Nate Jensen
25b0d43703
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 50184654f7
[formerly 47b27c602f
] [formerly 63d5f94cbb
] [formerly 63d5f94cbb
[formerly e05f1eae96
]] [formerly 50184654f7
[formerly 47b27c602f
] [formerly 63d5f94cbb
] [formerly 63d5f94cbb
[formerly e05f1eae96
]] [formerly a85575a763
[formerly 63d5f94cbb
[formerly e05f1eae96
] [formerly a85575a763
[formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]]]
Former-commit-id: a85575a763
Former-commit-id: e9e1657f2b
[formerly 740e71adba
] [formerly 139479b4e1
] [formerly 92095913a837aff6bfff1dafb52a02da49773caf [formerly 759372ba16bb02e06f0e8472c362cf3299be0ff5] [formerly 139479b4e1
[formerly 11fb06810f
]]]
Former-commit-id: c95c1e040b31c8433e133773a290cc16eedf3165 [formerly fe5669f9eeae8061972d1a92d1593cd4aea98162] [formerly 65068869e1
[formerly 70285796ac
]]
Former-commit-id: 65068869e1
Former-commit-id: 4c3bdc0dfb
2014-02-13 15:35:53 -06:00
Nate Jensen
d4c10f514e
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: d69f097a87
[formerly ec6d8585e1
] [formerly f2b32fa1ae
] [formerly f2b32fa1ae
[formerly 2643d01b74
]] [formerly d69f097a87
[formerly ec6d8585e1
] [formerly f2b32fa1ae
] [formerly f2b32fa1ae
[formerly 2643d01b74
]] [formerly d8e2d2837e
[formerly f2b32fa1ae
[formerly 2643d01b74
] [formerly d8e2d2837e
[formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]]]
Former-commit-id: d8e2d2837e
Former-commit-id: f2cd9f1247
[formerly 2772ad3c9c
] [formerly 1f3c4090a0
] [formerly aaf4bbb7ce6af3c5e217c24a6e975932945146db [formerly e7dc3b65fcb3fa03216ea4dfccc11e35d47a79ef] [formerly 1f3c4090a0
[formerly b31470f7e3
]]]
Former-commit-id: 1f7d7d72182a75c0eae1fe4e60d4c284ad36d6a4 [formerly f21f0c2edda75779b51cb9b768a1562125025411] [formerly 1aeeeffb0d
[formerly 3fb847a74c
]]
Former-commit-id: 1aeeeffb0d
Former-commit-id: 484e8d1625
2014-02-13 14:02:55 -06:00
Brian Clements
5ffc96bf1d
Issue #2751 user identity refactor
...
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types
Former-commit-id: 3fe6c4947c
[formerly 01653c76de
] [formerly 16ed18e0c6
] [formerly 16ed18e0c6
[formerly ef52908906
]] [formerly 3fe6c4947c
[formerly 01653c76de
] [formerly 16ed18e0c6
] [formerly 16ed18e0c6
[formerly ef52908906
]] [formerly 0ac7ff81cf
[formerly 16ed18e0c6
[formerly ef52908906
] [formerly 0ac7ff81cf
[formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 24725009b2
[formerly 21b1a6844a
] [formerly e6de3a118d
] [formerly f284599360eca54eb3a71c5d0a97f46fe0ca6398 [formerly 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b] [formerly e6de3a118d
[formerly 3ec3ad0543
]]]
Former-commit-id: fbed3fa2aac2239f0d18549de0673757122605c5 [formerly f2dc7cf04af4442851840305e26a4b79ceb9be1d] [formerly aa06f65038
[formerly 1cc21dc160
]]
Former-commit-id: aa06f65038
Former-commit-id: 85c67054ae
2014-02-13 13:51:39 -06:00
Brian Clements
0e053139aa
Issue #2700 fixed subscribe request group input
...
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once
Former-commit-id: fd1605eaa9
[formerly a0eb8342bf
] [formerly 2d72c0f475
] [formerly 2d72c0f475
[formerly 579f7c826d
]] [formerly fd1605eaa9
[formerly a0eb8342bf
] [formerly 2d72c0f475
] [formerly 2d72c0f475
[formerly 579f7c826d
]] [formerly caa8360ac7
[formerly 2d72c0f475
[formerly 579f7c826d
] [formerly caa8360ac7
[formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]]]
Former-commit-id: caa8360ac7
Former-commit-id: 8c5c324764
[formerly d4afb01ecc
] [formerly 46ea69990d
] [formerly adca6f1d8e60285d69bcdfa50038a807deccea03 [formerly 68affea48bc5b76e4b2afb6e939f8ab5903347db] [formerly 46ea69990d
[formerly bafe2972a4
]]]
Former-commit-id: 1d74a0e4969d93e20b9d7e33572a441eafbd5830 [formerly d73388f45bd1a17bac824f589802ad0559ac404f] [formerly a3157035bc
[formerly 8b618ea95b
]]
Former-commit-id: a3157035bc
Former-commit-id: 36881a8077
2014-02-13 09:47:02 -06:00
Brian Clements
f42b955e4f
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 3a122ef030
[formerly 2a687e7ac5
] [formerly 1e19c8d62c
] [formerly 1e19c8d62c
[formerly 1bf3a09056
]] [formerly 3a122ef030
[formerly 2a687e7ac5
] [formerly 1e19c8d62c
] [formerly 1e19c8d62c
[formerly 1bf3a09056
]] [formerly 9d7490a158
[formerly 1e19c8d62c
[formerly 1bf3a09056
] [formerly 9d7490a158
[formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]]]
Former-commit-id: 9d7490a158
Former-commit-id: a4ea2a3156
[formerly 0145571fe4
] [formerly 667a1450cf
] [formerly 718bd99b654e2c9ccc89fed1b98ef0984b736fe2 [formerly 4759fd1ad623c2d68120a23d29513e3f9b15ecd5] [formerly 667a1450cf
[formerly f22268295e
]]]
Former-commit-id: 04fb7509cead6979fffa7fa70d33dd7a1ff44ba9 [formerly 3e3d4092ea498f9a8728a7a6f8ff214aa8d5fdf2] [formerly 2b421aadcb
[formerly 5b95f2a058
]]
Former-commit-id: 2b421aadcb
Former-commit-id: 098bb233b9
2014-02-12 17:06:44 -06:00
Brian Clements
0f07a9e795
Issue #2699 require non blank handle
...
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle
Former-commit-id: e7322b2ddf
[formerly 88db377b41
] [formerly 8f07ae2a42
] [formerly 8f07ae2a42
[formerly 0765451a9d
]] [formerly e7322b2ddf
[formerly 88db377b41
] [formerly 8f07ae2a42
] [formerly 8f07ae2a42
[formerly 0765451a9d
]] [formerly ddf5b2a3ef
[formerly 8f07ae2a42
[formerly 0765451a9d
] [formerly ddf5b2a3ef
[formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: 37eea54bf4
[formerly 8b275e94b2
] [formerly 9c67bcbbcf
] [formerly b2c7150cf506fe15ed745b5873b1988ff104db9a [formerly f1871690aa5457b126ba46efaeed7a47b128ed69] [formerly 9c67bcbbcf
[formerly fab4fea177
]]]
Former-commit-id: a9f01a0801e32f75745095c413091795b3bcdb18 [formerly e5c43d72b21488421468d6cf473bc494a320eb33] [formerly 2fc99f92ee
[formerly 8e9f1136ae
]]
Former-commit-id: 2fc99f92ee
Former-commit-id: 73452f84c6
2014-02-12 09:13:48 -06:00
Brian Clements
d890bb20f7
Issue #2699 removed over cautious handle validation
...
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters
Former-commit-id: c9c0993c4c
[formerly 6c6467d235
] [formerly 639f774567
] [formerly 639f774567
[formerly 7d6e116b9f
]] [formerly c9c0993c4c
[formerly 6c6467d235
] [formerly 639f774567
] [formerly 639f774567
[formerly 7d6e116b9f
]] [formerly 6518b88fe5
[formerly 639f774567
[formerly 7d6e116b9f
] [formerly 6518b88fe5
[formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]]]
Former-commit-id: 6518b88fe5
Former-commit-id: ab52197267
[formerly 0dd73fed5a
] [formerly 6efb4f51d2
] [formerly ff751c6a0b2883baf04af0be92f84b473ac0e0c7 [formerly 8705994ebee4fa744b73413cf439e077ecb61c30] [formerly 6efb4f51d2
[formerly 8742be3a13
]]]
Former-commit-id: 6803f330f119b497e26742488627726ab84b0af1 [formerly fa2a42a7032255748771e650cfd51cf203641fca] [formerly 27f19f406a
[formerly 014b59e1a1
]]
Former-commit-id: 27f19f406a
Former-commit-id: 1b7e747bad
2014-02-07 10:06:06 -06:00
Brian Clements
6fd9741873
Issue #2699 fixed assumption that usersearch was exact
...
usersearch returns matches for any part of string
added method to restrict to exact matches only
Former-commit-id: 2858504408
[formerly ddbfe9a763
] [formerly bebd62c6b6
] [formerly bebd62c6b6
[formerly cfa3c9e0e8
]] [formerly 2858504408
[formerly ddbfe9a763
] [formerly bebd62c6b6
] [formerly bebd62c6b6
[formerly cfa3c9e0e8
]] [formerly 6ea009a2e1
[formerly bebd62c6b6
[formerly cfa3c9e0e8
] [formerly 6ea009a2e1
[formerly 74daa7109149073c615d13c25092f6d08a77b936]]]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: 1b4cc0a1ec
[formerly 876b60e15d
] [formerly bc75d43bc3
] [formerly d9e2a1d8638d727218bc0f1da87ee0ca47989cd8 [formerly 32509d9365c50f4522e4f0eb5ec73059ee0d9acf] [formerly bc75d43bc3
[formerly aff354a3d7
]]]
Former-commit-id: 00b045a8014901b2ad52efab14e677e9847079a4 [formerly 0e4922ca913a4b5bfebceb41096f25f36219a7f2] [formerly cd1b7dec1b
[formerly 9370df47fe
]]
Former-commit-id: 4e0f7f90157285aff67abceca9e79315019281ba [formerly cd1b7dec1b
]
Former-commit-id: 04f027986f
2014-02-03 15:34:58 -06:00
Brian Clements
46646ec7ac
Issue #2699 added handle config to prefs
...
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)
Former-commit-id: 96cc745bcf
[formerly 83d6ca0855
] [formerly 21c75d1d01
] [formerly 21c75d1d01
[formerly 1ff4ed1ae9
]] [formerly 96cc745bcf
[formerly 83d6ca0855
] [formerly 21c75d1d01
] [formerly 21c75d1d01
[formerly 1ff4ed1ae9
]] [formerly 16c1aaed3e
[formerly 21c75d1d01
[formerly 1ff4ed1ae9
] [formerly 16c1aaed3e
[formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: a651167eda
[formerly c6287ecffc
] [formerly 2f60d1b579
] [formerly 581a8126de5401acc5bcabeebce5bdb728b5eb63 [formerly a84830a2b6c074a8c5eb328da49682053240a4cd] [formerly 2f60d1b579
[formerly 7c867338c8
]]]
Former-commit-id: ea5b5ca27ffc555e397c16beb4b8d82ee3538e9c [formerly bc8262effd654ec4296479d2b0c4396a2891766e] [formerly 592cf33f35
[formerly 671bfaa75c
]]
Former-commit-id: f3e79d115bdd5f2f46cbdb32d3411b7616eef655 [formerly 592cf33f35
]
Former-commit-id: 65afd1e4d2
2014-02-03 12:59:57 -06:00
Brian Clements
96191ed97a
Issue #2700 fixed subscribe back after contact request accept
...
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one
Former-commit-id: d88907c687
[formerly dc59e8fa2d
] [formerly 7176bf59b8
] [formerly 7176bf59b8
[formerly b88eaeb73e
]] [formerly d88907c687
[formerly dc59e8fa2d
] [formerly 7176bf59b8
] [formerly 7176bf59b8
[formerly b88eaeb73e
]] [formerly b0402be1d3
[formerly 7176bf59b8
[formerly b88eaeb73e
] [formerly b0402be1d3
[formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]]]
Former-commit-id: b0402be1d3
Former-commit-id: 05806b864a
[formerly 7678703ae0
] [formerly 9210aae10a
] [formerly b47fba27839f133d84df2ffbbab8fa0a17a72421 [formerly 49b91dbbac727f3af22f35a351ce544d8ce31b75] [formerly 9210aae10a
[formerly b651ada4b3
]]]
Former-commit-id: b07ad25d5deca5cc1ca37df091b241a5601cd61d [formerly e467e72241d8923b566978180702bf8b00148966] [formerly f2a97eb00e
[formerly 7e1425c419
]]
Former-commit-id: f2a97eb00e
Former-commit-id: fb03f7b570
2014-01-31 13:10:35 -06:00
Brian Clements
057a274d86
Issue #2698 added handles to venues
...
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change
Former-commit-id: d0e2bfb894
[formerly bd410b2529
] [formerly 4e2cb3f7ae
] [formerly 4e2cb3f7ae
[formerly 3e585945d6
]] [formerly d0e2bfb894
[formerly bd410b2529
] [formerly 4e2cb3f7ae
] [formerly 4e2cb3f7ae
[formerly 3e585945d6
]] [formerly 3250eb34f5
[formerly 4e2cb3f7ae
[formerly 3e585945d6
] [formerly 3250eb34f5
[formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 702b04f16f
[formerly 35b53a61cd
] [formerly 4190b13ae2
] [formerly 5ac2faecdcb11cb65a9f77b603ef9ce3b1510517 [formerly 15ea8433323667869df6df396f6377d11f2a7079] [formerly 4190b13ae2
[formerly 4f4d5c5d69
]]]
Former-commit-id: 7c8728bb3981780f91d28570377137dbe5daca3f [formerly bfcea1a4566d36807b6744b7f53ddc0082dc12da] [formerly cf8b85f3d2
[formerly e04cb11154
]]
Former-commit-id: cf8b85f3d2
Former-commit-id: 3c70c9ff9c
2014-01-31 09:44:31 -06:00
Brian Clements
afa0ffeefc
Issue #2698 made sessions private and invite only
...
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config
Former-commit-id: 2ba620fc70
[formerly 190400fc34
] [formerly 1f1be20d41
] [formerly 1f1be20d41
[formerly c498307b30
]] [formerly 2ba620fc70
[formerly 190400fc34
] [formerly 1f1be20d41
] [formerly 1f1be20d41
[formerly c498307b30
]] [formerly 5b9f694930
[formerly 1f1be20d41
[formerly c498307b30
] [formerly 5b9f694930
[formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]]]
Former-commit-id: 5b9f694930
Former-commit-id: ba031d5ad5
[formerly a225d12692
] [formerly 07452b7778
] [formerly 00cc14c9e1aa200e1a1549420f644cc9a02fd09f [formerly ceb8a89c7f4c8cc41774e50c75969cbdacc6d919] [formerly 07452b7778
[formerly 4a0682a9e8
]]]
Former-commit-id: a072295df2a0a155571542086458b9fb583cc31c [formerly 3c20002e1f0607d8975953734b488dccf3a7b829] [formerly 96e89d9f83
[formerly 76ec4d56c8
]]
Former-commit-id: 90cf90abea83958780fe7cd067ec4a51ae68038a [formerly 96e89d9f83
]
Former-commit-id: 32e12b3094
2014-01-29 10:16:15 -06:00
Brian Clements
7e42b03dd9
Issue #2700 added contact request dialog
...
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests
Former-commit-id: 64be811aa0
[formerly aa642d5577
] [formerly b4d930bcb9
] [formerly b4d930bcb9
[formerly 6b1843f19a
]] [formerly 64be811aa0
[formerly aa642d5577
] [formerly b4d930bcb9
] [formerly b4d930bcb9
[formerly 6b1843f19a
]] [formerly bd19366ada
[formerly b4d930bcb9
[formerly 6b1843f19a
] [formerly bd19366ada
[formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]]]
Former-commit-id: bd19366ada
Former-commit-id: 4f58393687
[formerly a2cc9001ae
] [formerly bffa4d84fe
] [formerly cab5ef33e54ab7236075115828ac7fc7f975c8c4 [formerly aa6da3ca1e9307689f8365bc7178e584cb7032e6] [formerly bffa4d84fe
[formerly f22052321b
]]]
Former-commit-id: 2f0dca407a6db65b8f6e31e8037807a9b3f0d6c3 [formerly dc9a3ca142d4d8e444939f5ee6edf0e87d0ec277] [formerly ad3939140c
[formerly 737745ade7
]]
Former-commit-id: ad3939140c
Former-commit-id: 644f0267a0
2014-01-28 10:07:11 -06:00
Brian Clements
12ba997015
Issue #2701 removed local groups from collaboration
...
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group
Former-commit-id: 2b8a4520ed
[formerly fffb6aaf9a
] [formerly b86ad8ca6f
] [formerly b86ad8ca6f
[formerly f615f2226f
]] [formerly 2b8a4520ed
[formerly fffb6aaf9a
] [formerly b86ad8ca6f
] [formerly b86ad8ca6f
[formerly f615f2226f
]] [formerly 26ac549096
[formerly b86ad8ca6f
[formerly f615f2226f
] [formerly 26ac549096
[formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]]]
Former-commit-id: 26ac549096
Former-commit-id: cd86a93ddc
[formerly e2ca671173
] [formerly cfe945d76b
] [formerly 2c056ea10d766848853102bb88dc146ee6a8faef [formerly beabd84fb816fcf8a5201927f1389915efb941f7] [formerly cfe945d76b
[formerly 8944860cbb
]]]
Former-commit-id: 6a69157720b5cf69409931694abc682701acafbc [formerly 72e40ed0e3344ea4433f6ff8a72c7dd93e6418a3] [formerly ff1882e80a
[formerly dd9b3ca640
]]
Former-commit-id: ff1882e80a
Former-commit-id: b200f4b644
2014-01-27 10:14:10 -06:00
Nate Jensen
c86bc8c0a3
Merge "Issue #2630 added away timeout for collaboration inactivity" into development
...
Former-commit-id: 51fd387efe
[formerly 181994548e
] [formerly 8420f87348
] [formerly 8420f87348
[formerly bdb4d8bdeb
]] [formerly 51fd387efe
[formerly 181994548e
] [formerly 8420f87348
] [formerly 8420f87348
[formerly bdb4d8bdeb
]] [formerly eafe61cd37
[formerly 8420f87348
[formerly bdb4d8bdeb
] [formerly eafe61cd37
[formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]]]
Former-commit-id: eafe61cd37
Former-commit-id: 678da24eb8
[formerly c1e42e49e9
] [formerly 5504ec1efd
] [formerly a2ee7fec5f0b5cc8f75068fc55881f0328a72a4a [formerly 0bddc08432f572efd0ebc61e9e5e47a4becfcea3] [formerly 5504ec1efd
[formerly 46dfbe9334
]]]
Former-commit-id: 347243da340c8ef8aae4aedbbb7238631bbdebc3 [formerly bd8deed99bbc7f7ad5f177ea9e2a03f802d31a51] [formerly 51df7b69cc
[formerly b7a74dcb74
]]
Former-commit-id: 51df7b69cc
Former-commit-id: b1755cad5e
2014-01-15 13:48:13 -06:00
Brian Clements
5631aaaa42
Issue #2630 added away timeout for collaboration inactivity
...
eclipse job in connection subscriber
preferences added to collaboration prefs page
Former-commit-id: a7f4852fdb
[formerly b9c1e59353
] [formerly 7e952c5ba8
] [formerly 7e952c5ba8
[formerly 24190efb75
]] [formerly a7f4852fdb
[formerly b9c1e59353
] [formerly 7e952c5ba8
] [formerly 7e952c5ba8
[formerly 24190efb75
]] [formerly 57fb953b8d
[formerly 7e952c5ba8
[formerly 24190efb75
] [formerly 57fb953b8d
[formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]]]
Former-commit-id: 57fb953b8d
Former-commit-id: ccf6e2f7d7
[formerly 998e8ca8c2
] [formerly 7410c36783
] [formerly cf189c827714bd937bd49cc645e4e4d540fe7b41 [formerly e2a3bebef2dc240ed45242a0f8d5e55ec133f6ab] [formerly 7410c36783
[formerly 53273c4e5a
]]]
Former-commit-id: 32e90f29ec3e4c3f7ee47a95372d689ca0f18576 [formerly 1c92976208e36cc1694dd96fb8d2f217602d28b3] [formerly 72b75a821d
[formerly 07b9ab8b7b
]]
Former-commit-id: 72b75a821d
Former-commit-id: 39cf9fcff3
2014-01-15 13:20:25 -06:00
Brian Clements
ecce6973e4
Issue #2630 fixed status parsing bug
...
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils
Former-commit-id: a932fc9659
[formerly e3f615b2b7
] [formerly 45b5df24d4
] [formerly 45b5df24d4
[formerly 79446d983b
]] [formerly a932fc9659
[formerly e3f615b2b7
] [formerly 45b5df24d4
] [formerly 45b5df24d4
[formerly 79446d983b
]] [formerly bf6cf2f2ee
[formerly 45b5df24d4
[formerly 79446d983b
] [formerly bf6cf2f2ee
[formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: 435927692d
[formerly 46c751d7da
] [formerly bfbcbf382a
] [formerly 0ef5323acdf2fd6e4e1e882011e02f4258c8eafb [formerly 053ba48475681c6ca6bde16071dbe1d6807e277a] [formerly bfbcbf382a
[formerly 1219713128
]]]
Former-commit-id: 153c84dc2fd960044a3f29e7d2dd18e50ee7bda9 [formerly 23d203ea5595cd51d4faa850f994b37529fdfc41] [formerly 67e65db850
[formerly 7afcf37c11
]]
Former-commit-id: 77f0b6a6795ce99b8fd7faea424a0988e0cfdd99 [formerly 67e65db850
]
Former-commit-id: 63f28de573
2014-01-15 10:24:09 -06:00
Brian Clements
c12cb4f869
Issue #2563 added user server add/remove functionality
...
now persists user entered servers to localization
Former-commit-id: 557736a9a3
[formerly 7279fbf6b3
] [formerly af9292ea71
] [formerly af9292ea71
[formerly 487aa58778
]] [formerly 557736a9a3
[formerly 7279fbf6b3
] [formerly af9292ea71
] [formerly af9292ea71
[formerly 487aa58778
]] [formerly c8cfc788f3
[formerly af9292ea71
[formerly 487aa58778
] [formerly c8cfc788f3
[formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]]]
Former-commit-id: c8cfc788f3
Former-commit-id: 7355393979
[formerly 9a28a4e067
] [formerly a8f746f794
] [formerly e860d91abd9a7f51a5224eb12a60e9aa4d844811 [formerly a779f96749690d34c737ced63e146304783cc395] [formerly a8f746f794
[formerly 0c5b0eaf69
]]]
Former-commit-id: 43cfee4fc44da4fc000c808879a0693fb3b818dc [formerly 1c604ef7f5b72be730f7448d407a893d4435dfd3] [formerly 542e01f322
[formerly 30521ee989
]]
Former-commit-id: 542e01f322
Former-commit-id: 1b96c01c0c
2014-01-09 13:19:59 -06:00
Brian Clements
afefe4cfdb
Issue #2563 fixed default xmpp port
...
The default port for postgres was there by mistake
Former-commit-id: c42d21c84e
[formerly ea63496cc3
] [formerly e08c5ea04c
] [formerly e08c5ea04c
[formerly e263cdb63a
]] [formerly c42d21c84e
[formerly ea63496cc3
] [formerly e08c5ea04c
] [formerly e08c5ea04c
[formerly e263cdb63a
]] [formerly dfcf6e9ade
[formerly e08c5ea04c
[formerly e263cdb63a
] [formerly dfcf6e9ade
[formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: d3632f89e9
[formerly 0193a9db0f
] [formerly 373feec7f5
] [formerly cd032c6e2a7821a2ad1beac443ea26876d3e3c66 [formerly 44850ca1b4681434bdd6bef977c019dc3e5fc792] [formerly 373feec7f5
[formerly 27b4ec6df6
]]]
Former-commit-id: 3df787af51b2af0d93002010a140d90280901640 [formerly 1e7281dd25d0e4462914a8f28e264032b5f0222a] [formerly 426bb7b944
[formerly 22f322d887
]]
Former-commit-id: 1da39e572be1f7faa12cf70fdce8defa38b520cd [formerly 426bb7b944
]
Former-commit-id: 5e09af067a
2014-01-07 10:52:50 -06:00
Brian Clements
d7762ba169
Issue #2563 modified server config parsing to allow for custom port
...
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.
Former-commit-id: 5f8823446f
[formerly 9102b08053
] [formerly 4f2aa49807
] [formerly 4f2aa49807
[formerly cea12a1a1d
]] [formerly 5f8823446f
[formerly 9102b08053
] [formerly 4f2aa49807
] [formerly 4f2aa49807
[formerly cea12a1a1d
]] [formerly b01e6f0c98
[formerly 4f2aa49807
[formerly cea12a1a1d
] [formerly b01e6f0c98
[formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]]]
Former-commit-id: b01e6f0c98
Former-commit-id: 4d30bc3655
[formerly bed3b77948
] [formerly 74c6fdc613
] [formerly 848f1e52c4085690ffb46e29f97dbbb45e8f89db [formerly 4ae9dcc3fd65cda97138587d88156c3cc3a8281c] [formerly 74c6fdc613
[formerly d64d95d0c6
]]]
Former-commit-id: fa91e2dd9d5aedd2c0e6ec3d5a3e1edfc73ee812 [formerly b1724173d1c849579e5b1f5b75eabd48144df579] [formerly dd6fd2532c
[formerly 37be43af82
]]
Former-commit-id: dd6fd2532c
Former-commit-id: 4d02d8e6e7
2014-01-06 14:14:38 -06:00
Brian Clements
2ad78b0875
Issue #2563 fixed label issue for non-grouped roster entry
...
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated
Former-commit-id: d5bde957f0
[formerly 0124fbd68d
] [formerly 0ce560149e
] [formerly 0ce560149e
[formerly 73347283b6
]] [formerly d5bde957f0
[formerly 0124fbd68d
] [formerly 0ce560149e
] [formerly 0ce560149e
[formerly 73347283b6
]] [formerly d07bc465d4
[formerly 0ce560149e
[formerly 73347283b6
] [formerly d07bc465d4
[formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]]]
Former-commit-id: d07bc465d4
Former-commit-id: 0983d641b4
[formerly 95c30dbe0f
] [formerly 5dcaa98110
] [formerly 1a5ccb89610a022cebe33106e0e56fd6f6288099 [formerly 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd] [formerly 5dcaa98110
[formerly 0f4be44a23
]]]
Former-commit-id: b8af5be3472accfeab789678254aade691addaec [formerly 17d976b3c03dfc4f2e898f19d4930be8e9d50ba3] [formerly 73a3213cd1
[formerly 70d4484473
]]
Former-commit-id: 2cdfb16fca0022d5bb2c103da2e44666404a636a [formerly 73a3213cd1
]
Former-commit-id: 869430c984
2013-12-20 14:40:00 -06:00
Brian Clements
096334f521
Issue #2563 roster updates for stock servers
...
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group
Former-commit-id: c5801f2e12
[formerly b41eadd0be
] [formerly b120d74099
] [formerly b120d74099
[formerly 2b8668a4eb
]] [formerly c5801f2e12
[formerly b41eadd0be
] [formerly b120d74099
] [formerly b120d74099
[formerly 2b8668a4eb
]] [formerly e4bd8a3e2c
[formerly b120d74099
[formerly 2b8668a4eb
] [formerly e4bd8a3e2c
[formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 9de38cb466
[formerly f084679410
] [formerly 0882672686
] [formerly 8e5c8129c3d7ceb59dcf72334219b8c0bef23071 [formerly 35a2c84384d4302036ad4c4d8408a681edbf9e81] [formerly 0882672686
[formerly 4b4c7ba50c
]]]
Former-commit-id: 639ec0d2d22a21f3642e7f83577cb2d17cb628f3 [formerly 68b1173a4b1aa0aa641dc59b6cc4c8c527791d0b] [formerly 41f6c010af
[formerly 98fd3e6a4c
]]
Former-commit-id: 41f6c010af
Former-commit-id: 4f746b4f28
2013-12-20 12:03:04 -06:00
Brian Clements
af165199f0
Issue #2563 compatibility features for stock xmpp servers
...
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom
Former-commit-id: 4aa069845c
[formerly 24b3713680
] [formerly 621a8536e6
] [formerly 621a8536e6
[formerly 09c0267237
]] [formerly 4aa069845c
[formerly 24b3713680
] [formerly 621a8536e6
] [formerly 621a8536e6
[formerly 09c0267237
]] [formerly af83c0cf87
[formerly 621a8536e6
[formerly 09c0267237
] [formerly af83c0cf87
[formerly b3173727f3f685119be3668779eb5da7e075df50]]]]]
Former-commit-id: af83c0cf87
Former-commit-id: dbca2a4dd5
[formerly 5dcd524fa1
] [formerly 917d8dffee
] [formerly b66a9e1d33a32509ba7a9a0d598be57e4bd087ca [formerly f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad] [formerly 917d8dffee
[formerly 43021ae281
]]]
Former-commit-id: f341a58dca8553314dc979934ff83132bb83b3ae [formerly 50f340c4c8e121845c4210287609a1479f391ceb] [formerly b9977a1357
[formerly e5430b4510
]]
Former-commit-id: b9977a1357
Former-commit-id: 30d12d2955
2013-12-20 10:41:13 -06:00
Brian Clements
5230f7e483
Issue #2562 moved session data from chat to packet extension
...
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used
Former-commit-id: c1a03ca6c4
[formerly c2b759b38e
] [formerly 2c20a87634
] [formerly 2c20a87634
[formerly 80650337ce
]] [formerly c1a03ca6c4
[formerly c2b759b38e
] [formerly 2c20a87634
] [formerly 2c20a87634
[formerly 80650337ce
]] [formerly ce0a34b53c
[formerly 2c20a87634
[formerly 80650337ce
] [formerly ce0a34b53c
[formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]]]
Former-commit-id: ce0a34b53c
Former-commit-id: c9d50f0757
[formerly 64dda165db
] [formerly d58f8d7134
] [formerly cfe34230cd7006a5076afb83e5fbe2d8c8a713cb [formerly 698a51437531736c124a805026ea7ca5cd199699] [formerly d58f8d7134
[formerly 4015dc23ee
]]]
Former-commit-id: fa863d17eccb11455f3f7b63731b71d2d7f4cde8 [formerly 29642bf8db563174d87d99cd43c522c3dc419a43] [formerly 5ede797e27
[formerly aa8d869635
]]
Former-commit-id: 5ede797e27
Former-commit-id: 5ab073884a
2013-12-19 12:08:21 -06:00
Brian Clements
943f2a769e
Issue #2561 removed ECF from collaboration
...
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list
Former-commit-id: c870aa7591
[formerly d0d14ec091
] [formerly 5d1d44b60d
] [formerly 5d1d44b60d
[formerly 8ece30944a
]] [formerly c870aa7591
[formerly d0d14ec091
] [formerly 5d1d44b60d
] [formerly 5d1d44b60d
[formerly 8ece30944a
]] [formerly e6c4b39aca
[formerly 5d1d44b60d
[formerly 8ece30944a
] [formerly e6c4b39aca
[formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]]]
Former-commit-id: e6c4b39aca
Former-commit-id: b795b3a2cf
[formerly 4d04f6edbf
] [formerly 5a7fca6352
] [formerly f12856a41d719689053d06c22088cbb53f886ff8 [formerly ea97705eee929964d9b775519d5de735e490a0d4] [formerly 5a7fca6352
[formerly b8df043202
]]]
Former-commit-id: 175e603739315ada1e03b4c7adbaaeb03f31c8ef [formerly ebcbc592123de417dee62c72e2708e136768fd8e] [formerly d7ddaa295d
[formerly 0cf7b822ce
]]
Former-commit-id: d7ddaa295d
Former-commit-id: 1197d89ded
2013-12-06 17:07:16 -06:00
Lee Venable
95fe170433
Issue #2483 - Fixed image memory leak.
...
Former-commit-id: b43ec86e3d
[formerly 1a52e2b388
] [formerly 73caae724c
] [formerly 73caae724c
[formerly a2f75e547d
]] [formerly b43ec86e3d
[formerly 1a52e2b388
] [formerly 73caae724c
] [formerly 73caae724c
[formerly a2f75e547d
]] [formerly 3d6547d644
[formerly 73caae724c
[formerly a2f75e547d
] [formerly 3d6547d644
[formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]]]
Former-commit-id: 3d6547d644
Former-commit-id: 0f9977d86d
[formerly 0d399cc52a
] [formerly 25c7bd679f
] [formerly 599d060c67d33cfb62e6938c3b3984a56ef07584 [formerly 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c] [formerly 25c7bd679f
[formerly 74603afd97
]]]
Former-commit-id: ed292902c90d51774a82484411170afb27c14332 [formerly f5083a1cd8fdfc81b02738eb21c687f754459c86] [formerly ce35925120
[formerly 8f1956da81
]]
Former-commit-id: ce35925120
Former-commit-id: 2bf50b46b9
2013-10-23 08:26:49 -05:00
Matt Nash
a4c22ce238
Issue #1476 make fix for collaboration for issues with closing of views when detached
...
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293
Former-commit-id: 632ec3eec1
[formerly 999413b2e7
] [formerly 311ac710ca
] [formerly 311ac710ca
[formerly fdc6db0a50
]] [formerly 632ec3eec1
[formerly 999413b2e7
] [formerly 311ac710ca
] [formerly 311ac710ca
[formerly fdc6db0a50
]] [formerly 1d25736871
[formerly 311ac710ca
[formerly fdc6db0a50
] [formerly 1d25736871
[formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]]]
Former-commit-id: 1d25736871
Former-commit-id: a308895cde
[formerly b0a0086da1
] [formerly 739a4ac2db
] [formerly 4a5b7295ff16e7882b1891d2a930cad2655ee40d [formerly 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f] [formerly 739a4ac2db
[formerly 274becd212
]]]
Former-commit-id: a9f5d9949572ddeecc34c5493df0ffb47a420e04 [formerly 2008f23e609dbfef312c46bbc800643d207b4fab] [formerly bad1cef443
[formerly f02246ab07
]]
Former-commit-id: bad1cef443
Former-commit-id: a12055eff6
2013-03-04 09:41:11 -06:00
Steve Harris
a2241acbc5
13.1.2-6 baseline
...
Former-commit-id: 750f03f602
[formerly 1d4d25b49b
] [formerly efd3392abe
] [formerly efd3392abe
[formerly 8e5f9e0e6c
]] [formerly 750f03f602
[formerly 1d4d25b49b
] [formerly efd3392abe
] [formerly efd3392abe
[formerly 8e5f9e0e6c
]] [formerly 59969775ad
[formerly efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]]
Former-commit-id: 59969775ad
Former-commit-id: 7058edde32
[formerly fe763963e9
] [formerly 82a1ed77a4
] [formerly e0da2714c31e9f48ef47551baeecd5541fe2e224 [formerly fa884fbcd584330564fea44a1538e11036e753a8] [formerly 82a1ed77a4
[formerly dbcae57f57
]]]
Former-commit-id: f1899c432c7f194616c4f9d49b19f53f87a0c962 [formerly 385d5b42196eb703cc60637c47506c02c454b5fc] [formerly b7f180d9d3
[formerly 05bdc0ecd2
]]
Former-commit-id: b7f180d9d3
Former-commit-id: 3e63f280a2
2013-01-06 14:55:11 -06:00
Steve Harris
2827d6bd6e
13.1.2-2 baseline
...
Former-commit-id: e380aa2f8f
[formerly e8f4a2f031
] [formerly 51208e5515
] [formerly 51208e5515
[formerly c0c1d56f3a
]] [formerly e380aa2f8f
[formerly e8f4a2f031
] [formerly 51208e5515
] [formerly 51208e5515
[formerly c0c1d56f3a
]] [formerly 4ba416aeb3
[formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7
[formerly 82cdde8491
] [formerly cd4185ef5c
] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c
[formerly 941337c553
]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0
[formerly b6fa9b4858
]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
2013-01-06 14:32:24 -06:00
Steve Harris
cafcd7036b
12.11.1-4 baseline
...
Former-commit-id: e177511e24
[formerly 6e44abdba1
] [formerly 98171b5de9
] [formerly 98171b5de9
[formerly d3497e47eb
]] [formerly e177511e24
[formerly 6e44abdba1
] [formerly 98171b5de9
] [formerly 98171b5de9
[formerly d3497e47eb
]] [formerly 6958b861f0
[formerly 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]]
Former-commit-id: 6958b861f0
Former-commit-id: f230f4d248
[formerly c9b563338a
] [formerly 2c82d9cb07
] [formerly ce2c9618fca3eeff95ca78dceed5a5cdc772fbe4 [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1] [formerly 2c82d9cb07
[formerly cbbdb231ce
]]]
Former-commit-id: 5593c4b491703cc2606dd21a1dc15bdbd66a4ed3 [formerly 892afd7b093bec93e8f4c170f6b8ae08bea40239] [formerly 35e34308c5
[formerly 560f0d9cc3
]]
Former-commit-id: 35e34308c5
Former-commit-id: 8794e3b599
2012-10-16 13:27:07 -05:00