Nate Jensen
|
6545e483be
|
Issue #427 fix drawing icons
Change-Id: Ib7b04baf7f8ab528070c455c1e3e081be56124e0
Former-commit-id: af67b7fec0 [formerly 25b8851589] [formerly 446052111f] [formerly af67b7fec0 [formerly 25b8851589] [formerly 446052111f] [formerly 1d3666a10e [formerly 446052111f [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]]]
Former-commit-id: 1d3666a10e
Former-commit-id: 8385590d1e [formerly 58fec0767d] [formerly 28d502fab55e6c56f49074fa0610d25997957e9c [formerly 6c381ceb01]]
Former-commit-id: 78df5a1a7c5a57c03811b7a11761c8184238370b [formerly bb8235126d]
Former-commit-id: 5d490fe2f4
|
2012-04-16 12:54:29 -05:00 |
|
Nate Jensen
|
3097bbed6a
|
Issue #427 cleanup and refactoring for ease of use
Change-Id: I93f75663ace61b454b52d1e451677a0e42c2d481
Former-commit-id: cfd65777dd [formerly 02b0f1bd5f] [formerly fc1c1d5f16] [formerly cfd65777dd [formerly 02b0f1bd5f] [formerly fc1c1d5f16] [formerly d9c24599ea [formerly fc1c1d5f16 [formerly 23ba31dc2479e9e1e2b45e9237c92a7adf12a6c5]]]]
Former-commit-id: d9c24599ea
Former-commit-id: c234f0cfdb [formerly 69061ada62] [formerly b8e63e2dfe8e14521c85c28d063596d80554ff95 [formerly e3c7b4d2e2]]
Former-commit-id: 7fd77321c791b8b3f383bc5dcc0dc0ddfd009600 [formerly 72c5485597]
Former-commit-id: cbfa2649d4
|
2012-04-16 12:37:40 -05:00 |
|
Matt Nash
|
cbc3994353
|
Issue #429 minor tooltip fix, and double click fixes for unavailable users
Former-commit-id: 4d5368e8b9 [formerly 79088f4129] [formerly 967b8ed671] [formerly 4d5368e8b9 [formerly 79088f4129] [formerly 967b8ed671] [formerly 30d5ccc641 [formerly 967b8ed671 [formerly 408c7cfaa970e6b460fda819fba0f02810c2dc19]]]]
Former-commit-id: 30d5ccc641
Former-commit-id: 2038e8123a [formerly 477c842174] [formerly ddfa020b2016c31a30ed3dfc39848250fa8bb228 [formerly ed644a9031]]
Former-commit-id: 7762450eb587dcfa1b2014031be2e2cb8863cad9 [formerly 69f61c5faf]
Former-commit-id: 8e28fd3060
|
2012-04-16 11:16:50 -05:00 |
|
Matt Nash
|
d402170f18
|
Issue #429 set editor and view title the same, add separator to menu above collaboration
Former-commit-id: 1607b7cdb6 [formerly dd88bf775c] [formerly 780fd03203] [formerly 1607b7cdb6 [formerly dd88bf775c] [formerly 780fd03203] [formerly d20fe3cfff [formerly 780fd03203 [formerly c045890c6da56c258dfa44610e7225a3f914e0ef]]]]
Former-commit-id: d20fe3cfff
Former-commit-id: 6bea493d6e [formerly d2f183205a] [formerly 0ed3cb12f6d64edaca807a2d18444a39537c371d [formerly ef0e2814ef]]
Former-commit-id: 2e52b78b41388f0b678b3cea13f68e36349d3e41 [formerly 6171652e4c]
Former-commit-id: e2b84386b9
|
2012-04-16 10:03:31 -05:00 |
|
James Korman
|
436c596c10
|
Issue #437 - removed Leader presence/modified subscribed handling.
Former-commit-id: f9513ac55e [formerly d87e47a5f3] [formerly dab86c62fc] [formerly f9513ac55e [formerly d87e47a5f3] [formerly dab86c62fc] [formerly defb083771 [formerly dab86c62fc [formerly 57673abac66b21596c71737d0aa1537c13982ac0]]]]
Former-commit-id: defb083771
Former-commit-id: 715d8e9a4c [formerly 0822fc6ae6] [formerly 87675161148de44dbb7992da425501196d792a37 [formerly 8e84ed72f7]]
Former-commit-id: 1efda89bf27223c32d1405b359f7e6c742d53830 [formerly 1af29eff2e]
Former-commit-id: bced718bdb
|
2012-04-16 09:46:12 -05:00 |
|
Roger Ferrel
|
56ce59b81c
|
Issue #437 Fixed typo that cause multiple grops siteings in Collaboration View.
Change-Id: I2fc329b101532f3da99a58c320ceb7fa109c7e5b
Former-commit-id: 1a4d155b5a [formerly 866472438f] [formerly 3f12223532] [formerly 1a4d155b5a [formerly 866472438f] [formerly 3f12223532] [formerly 020f77195a [formerly 3f12223532 [formerly 599563055eb1373601d5623752272130142c3659]]]]
Former-commit-id: 020f77195a
Former-commit-id: 2919410fd5 [formerly 1d5d56dcc7] [formerly 9b4265955f484ba8ebd8029d67e77049aea3ecd8 [formerly 588302da22]]
Former-commit-id: 4174e4da4a96e3078258622024f2d28d4f4b1bca [formerly 57078fdb45]
Former-commit-id: 89a143df14
|
2012-04-16 07:52:28 -05:00 |
|
Roger Ferrel
|
b16a453a82
|
Issue #437 But fix in group View enent handler, improved tooltip
Change-Id: Ibb6fc5f312f09d72df988c591408fc41e39ad674
Former-commit-id: 1907f26a0d [formerly 41e4666d55] [formerly 55ab473fd6] [formerly 1907f26a0d [formerly 41e4666d55] [formerly 55ab473fd6] [formerly 8ab764e56c [formerly 55ab473fd6 [formerly 47c81c08d9a90c271873cfa50525fb40c26db508]]]]
Former-commit-id: 8ab764e56c
Former-commit-id: 57f6674cab [formerly 7e30ab3c0f] [formerly 170a988a7b3d93afc45aa969302851bbbcc2f1c2 [formerly 1a96e80459]]
Former-commit-id: 1200df2801859a58c85808f80131fdf7d1f99a4f [formerly 91f7452c8e]
Former-commit-id: 29c1a3ffc7
|
2012-04-13 15:51:41 -05:00 |
|
Nate Jensen
|
5a00fe746b
|
Issue #427 cleanup
Change-Id: Ifa48910d765a40d5443b237b6805fe3f71fb1c73
Former-commit-id: b79ae6a022 [formerly 6a572eafde] [formerly fd36f7d987] [formerly b79ae6a022 [formerly 6a572eafde] [formerly fd36f7d987] [formerly 982e2dae13 [formerly fd36f7d987 [formerly 330813db6cf4a1163091116cda4d41f074409d57]]]]
Former-commit-id: 982e2dae13
Former-commit-id: 79082074af [formerly 8380c175a3] [formerly a0625f32bfba2c3ee647caa29d2389f69e21d888 [formerly 71292f844e]]
Former-commit-id: 68f8992d9790b16952ad666f77638ac34b423da7 [formerly bc49969ba0]
Former-commit-id: 84de268745
|
2012-04-13 13:56:38 -05:00 |
|
Nate Jensen
|
90c165d053
|
Issue #427 comment for future reference
Change-Id: Ie8ffaef6e14b97bf4284efec67db8c0067cfccd3
Former-commit-id: 5f61fc206c [formerly 5cef808609] [formerly 6a387ca1ce] [formerly 5f61fc206c [formerly 5cef808609] [formerly 6a387ca1ce] [formerly 28c95001b9 [formerly 6a387ca1ce [formerly fec3497a585e5b260432307b2bcc9c0317b6f2c7]]]]
Former-commit-id: 28c95001b9
Former-commit-id: dfad8b8615 [formerly 8abede0150] [formerly b3685579e6ff9c34c557a2488ffc436092260cd0 [formerly 38c95b7f21]]
Former-commit-id: b7469cc613e6bcbbb9ccf81a5afff1bb605f5663 [formerly b570d327a1]
Former-commit-id: b79b10703a
|
2012-04-13 13:45:13 -05:00 |
|
Nate Jensen
|
ba5941c288
|
Issue #427 legend for shared editor
Change-Id: I98832ade44f7019f108e125d4bfefe6e37e4e9f7
Former-commit-id: a1b258a4b4 [formerly 392818bb51] [formerly 71ff27c001] [formerly a1b258a4b4 [formerly 392818bb51] [formerly 71ff27c001] [formerly a1d56fae3f [formerly 71ff27c001 [formerly c0fc780c73d16055b022af269628dfa0b3e5591e]]]]
Former-commit-id: a1d56fae3f
Former-commit-id: 120789f05f [formerly da3856aba4] [formerly 8f913eed335e49036d31b2ba6325ad72f49218ff [formerly 2ae78729f3]]
Former-commit-id: 7e289cb389da99eb93870b44ea83529fa902234a [formerly 4c3e084cf9]
Former-commit-id: bcc65fc3e2
|
2012-04-13 13:43:23 -05:00 |
|
Max Schenkelberg
|
4a897a76d3
|
Issue #239 Got plots working
Former-commit-id: 559bae6041 [formerly 682576fe84] [formerly 859262ea98] [formerly 559bae6041 [formerly 682576fe84] [formerly 859262ea98] [formerly 04ab27895d [formerly 859262ea98 [formerly 9c93f3670bd8c3a7a5e5330b160d5f2206b979b3]]]]
Former-commit-id: 04ab27895d
Former-commit-id: c962a31404 [formerly aedf159c8a] [formerly 195e125fc2adc09e79e5bdc22b02fc35aa7211e0 [formerly adba2b8aeb]]
Former-commit-id: 450a95118a8bafa7d4577fd74a442272c642942e [formerly 9b5481968f]
Former-commit-id: 96a33e2a7a
|
2012-04-13 12:56:43 -05:00 |
|
Matt Nash
|
7f42f6d09b
|
Issue #429 remove bold from LoginUser
Former-commit-id: 4b794adbd7 [formerly 9bec72d07b] [formerly 88d6e4ccbd] [formerly 4b794adbd7 [formerly 9bec72d07b] [formerly 88d6e4ccbd] [formerly 0ed8e97ee1 [formerly 88d6e4ccbd [formerly 56ad67d94ad7a3c8ebfd43f94b7f40012fe8bbb4]]]]
Former-commit-id: 0ed8e97ee1
Former-commit-id: 9864ba342c [formerly 4c96b11db0] [formerly dd7907c8c10f14b0072e072811d2de14ecb2a2d9 [formerly 064367fe8a]]
Former-commit-id: ac6391c98ea0c01a024f8186d6fffc1d5984be69 [formerly 95b91438ff]
Former-commit-id: 68657524d5
|
2012-04-13 10:59:55 -05:00 |
|
Matt Nash
|
605443ec20
|
Issue #429 fix null pointers and make erase first pass possible
Former-commit-id: e1172dbcaa [formerly bdec7aff90] [formerly 82c11c4224] [formerly e1172dbcaa [formerly bdec7aff90] [formerly 82c11c4224] [formerly b133b57c6d [formerly 82c11c4224 [formerly 67a87efe19292a279d42a0104d902afc59e3dd84]]]]
Former-commit-id: b133b57c6d
Former-commit-id: 7c3dfe2ee0 [formerly d1ef8025be] [formerly e208b807b3531c3f662e86557063b2fcbaa7bc98 [formerly ed75909d5b]]
Former-commit-id: 5836fce3d21c8d8993b48678e3db6d53595e4497 [formerly 7220b4000c]
Former-commit-id: d7fad717d3
|
2012-04-13 10:46:53 -05:00 |
|
Matt Nash
|
7e36475e02
|
Issue #429 telestrator fixes and view changes
Former-commit-id: da2e195b01 [formerly 244e02a318] [formerly 19e37ff05a] [formerly da2e195b01 [formerly 244e02a318] [formerly 19e37ff05a] [formerly c6c0483cee [formerly 19e37ff05a [formerly 51969dfc82d750571115d179911333cec55f677f]]]]
Former-commit-id: c6c0483cee
Former-commit-id: ba8bdee906 [formerly 49a6d10c18] [formerly 6ef06d2d9a8ba0edc9fe7bacf9128b79bf8f8ec0 [formerly 1c2df7d912]]
Former-commit-id: 61a3e6850e622a94b10cc2b44bb458001b82a725 [formerly 3cffdc6b82]
Former-commit-id: 5228fb2182
|
2012-04-13 09:50:48 -05:00 |
|
Roger Ferrel
|
b2d8a211b2
|
Issue #437 Implemented Roster event handlers.
Change-Id: Ibc6cf9a077eca6893efa048aa780e16ec4f2190d
Former-commit-id: 353230a7c3 [formerly 11f3edb4f2] [formerly 711becf60b] [formerly 353230a7c3 [formerly 11f3edb4f2] [formerly 711becf60b] [formerly c5fb910ea0 [formerly 711becf60b [formerly 2cf4fbe9225b9442c8368e7fa3d7109976e557b0]]]]
Former-commit-id: c5fb910ea0
Former-commit-id: 90b58d7453 [formerly 95765e4579] [formerly 174f920dd3137e958c892925e0d9a3f9f2448317 [formerly 775d70567c]]
Former-commit-id: 1c4e940cd05c673b367f526e69521c8b3409be81 [formerly f9d18ba538]
Former-commit-id: 3ace27eff2
|
2012-04-13 09:02:44 -05:00 |
|
Max Schenkelberg
|
d093e7390e
|
Issue #239 Added creating of fonts and use in wireframe shapes
Former-commit-id: ea082a4c2b [formerly d0bdc5d6f0] [formerly f2fe88790d] [formerly ea082a4c2b [formerly d0bdc5d6f0] [formerly f2fe88790d] [formerly 99209a054f [formerly f2fe88790d [formerly ab047d007f8835554d2ec08e2e11594f7d88a6cb]]]]
Former-commit-id: 99209a054f
Former-commit-id: 9e6267a7d4 [formerly 43a4688404] [formerly 9f0875b8b1183882c7391b33681c8df047a269e8 [formerly 41d3652701]]
Former-commit-id: 97b1c6ed66142ec71235b896fbdc43f75d50d479 [formerly aa07614542]
Former-commit-id: 13d609af5e
|
2012-04-12 16:22:12 -05:00 |
|
Max Schenkelberg
|
48b3aa1ef6
|
Issue #239 Added wireframe shape capability
Former-commit-id: 9b8f9de1fa [formerly 7900e78944] [formerly 12dcb4b044] [formerly 9b8f9de1fa [formerly 7900e78944] [formerly 12dcb4b044] [formerly 5be2b4e745 [formerly 12dcb4b044 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]]]
Former-commit-id: 5be2b4e745
Former-commit-id: 6120d53cc0 [formerly 3e781ede4f] [formerly ea1488b7dd2da24d9175bcf1e6e1bc795640ef82 [formerly f6a2f5e55c]]
Former-commit-id: c93b11401aa9baa4f85b0b2e7780d92ad1c9a720 [formerly 12c672e400]
Former-commit-id: 96a6f4f647
|
2012-04-12 14:46:08 -05:00 |
|
Nate Jensen
|
b71bd63c41
|
Issue #444 cleanup and fix numerous small errors
Change-Id: Idc7862a20a3d3a95103bd58ab9417e002ffaced9
Former-commit-id: 180a3f76de [formerly fec2d463b0] [formerly 447b8b461b] [formerly 180a3f76de [formerly fec2d463b0] [formerly 447b8b461b] [formerly ff6cd0bd75 [formerly 447b8b461b [formerly efcfbbc302ede49acffcf85a792a80dc9862a0b8]]]]
Former-commit-id: ff6cd0bd75
Former-commit-id: b26b41d503 [formerly d61604db1d] [formerly 8cd1922e37354f379eb49be4e5640287ab09c56c [formerly 04fbec7d3b]]
Former-commit-id: 2d1dabd6781f335de084271e4de217f000eee43e [formerly 28b764b577]
Former-commit-id: b07e336211
|
2012-04-12 13:43:24 -05:00 |
|
Brad Gonzales
|
c6930196da
|
Issue #443 added more compression configuration to Tools.java.
Former-commit-id: 961c6517a2 [formerly 2b77db0851] [formerly 135b560fb6] [formerly 961c6517a2 [formerly 2b77db0851] [formerly 135b560fb6] [formerly 217ee506e1 [formerly 135b560fb6 [formerly 6d430d5d4f14829ab2b1280c691aadbb966fb48c]]]]
Former-commit-id: 217ee506e1
Former-commit-id: 45bd347c04 [formerly 761238d582] [formerly 92f689f92fccebb893f8eae33111c42d778991f9 [formerly 99d168d629]]
Former-commit-id: 2ecadb74144cb4cfd3ba9914a698a4fc59268ab6 [formerly db69d2e8f2]
Former-commit-id: aff0131973
|
2012-04-12 12:08:37 -05:00 |
|
Matt Nash
|
875075550b
|
Issue #429 add not yet implemented to a few buttons
Former-commit-id: a87f6f7337 [formerly d2a0bb20f6] [formerly 31d2720a5c] [formerly a87f6f7337 [formerly d2a0bb20f6] [formerly 31d2720a5c] [formerly 8083ddf51e [formerly 31d2720a5c [formerly 2e263d7fe77e1451af775f0c55eb82c5d092e45c]]]]
Former-commit-id: 8083ddf51e
Former-commit-id: 1934d80646 [formerly 29668ee637] [formerly 3883efb66b72a7cc3840d5ffd7648a4bf2b6a3e1 [formerly dde8229516]]
Former-commit-id: 71961b4ac037f465de4c9adc39322d6800c32007 [formerly 244307ec0a]
Former-commit-id: f8c20a9436
|
2012-04-12 10:50:07 -05:00 |
|
Max Schenkelberg
|
6f13335a9e
|
Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: 73c1e75dba [formerly d53a9faa9a] [formerly 8b514dc862] [formerly 73c1e75dba [formerly d53a9faa9a] [formerly 8b514dc862] [formerly c376abf87a [formerly 8b514dc862 [formerly df62b7a1fece621ad2c46112e0029da6fc3a230c]]]]
Former-commit-id: c376abf87a
Former-commit-id: 995f129817 [formerly 9f2e23f26b] [formerly 3d00530d0c4aeb5b4a56428790dcd20703c5511f [formerly d3c4f6bf7b]]
Former-commit-id: 4a6b6b37ed81a9bace37f0126f07a90f1f513be5 [formerly 52573a106a]
Former-commit-id: 3af781797a
|
2012-04-12 10:47:08 -05:00 |
|
Max Schenkelberg
|
ddf76545a3
|
Issue #239 got offscreen rendering working for clients
Former-commit-id: da48c4f6ac [formerly b1687af0ac] [formerly 5ae0ed10d5] [formerly da48c4f6ac [formerly b1687af0ac] [formerly 5ae0ed10d5] [formerly 2de39bb487 [formerly 5ae0ed10d5 [formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]]]
Former-commit-id: 2de39bb487
Former-commit-id: 36938dc222 [formerly 0f62e40dda] [formerly 0c28e5b5dcdc3b47b56f77d8ab45a6f1e98aba12 [formerly 1a340bb6e5]]
Former-commit-id: 4946590b37e1b2938bce0df65e42d885499e5331 [formerly 8c70d7b4d6]
Former-commit-id: cc8542f7fb
|
2012-04-12 10:45:50 -05:00 |
|
Nate Jensen
|
7ff26ac2a7
|
Issue #444 filter right click menu and tooltips based on role
Change-Id: Iab6942a6b58066df6e816e3425e717868aa36337
Former-commit-id: ed02fbb8d5 [formerly 4390eed955] [formerly 3d9bfcdb12] [formerly ed02fbb8d5 [formerly 4390eed955] [formerly 3d9bfcdb12] [formerly e7e5a34655 [formerly 3d9bfcdb12 [formerly f99b871ce5556840f8b90eead59f8a2659d6bc9a]]]]
Former-commit-id: e7e5a34655
Former-commit-id: 86714a9fb8 [formerly 8787f9e44c] [formerly e9e4bbcce1fd98220a4d2e3cb5b3d04d4a1d6c7a [formerly 78d5b1dad6]]
Former-commit-id: 1e21293a5ce35094cc277315f2c6ddc43cb472b6 [formerly 8e6b6a8734]
Former-commit-id: c9b7df6585
|
2012-04-12 10:23:39 -05:00 |
|
Matt Nash
|
fde885b167
|
Issue #429 fix error as well as add checks
Former-commit-id: f629464521 [formerly 9eb69d57f9] [formerly cf24a2cee9] [formerly f629464521 [formerly 9eb69d57f9] [formerly cf24a2cee9] [formerly a6c6695e5b [formerly cf24a2cee9 [formerly 317bf0f2ebdc76ee55f2db9eb81b80731f504847]]]]
Former-commit-id: a6c6695e5b
Former-commit-id: a60d683af3 [formerly 721621f785] [formerly 3f712e89b70262ce6bf878dd17a4275ce02c3b61 [formerly 0f604dd351]]
Former-commit-id: d80675f3b7566e37a2a526e0ef7b2d62a54331fd [formerly b70c6feb49]
Former-commit-id: af8bd6ef7e
|
2012-04-12 09:45:37 -05:00 |
|
Brad Gonzales
|
b484775a7a
|
Issue #443 added optional jaxb and thrift compression to collaboration, Tools.java.
Former-commit-id: 225881d7f8 [formerly e039330b0d] [formerly 137b337f4b] [formerly 225881d7f8 [formerly e039330b0d] [formerly 137b337f4b] [formerly 2a405eb253 [formerly 137b337f4b [formerly b07cd0c2157e72d679d76ec54987b2de41c10aae]]]]
Former-commit-id: 2a405eb253
Former-commit-id: edbb1e0979 [formerly ef047927f9] [formerly 83338eae8bf405661d2823894ce7c25c073f0908 [formerly e2f7f16a11]]
Former-commit-id: fa404e705862b48939f388fe340aa521b560e2d9 [formerly e7b496e178]
Former-commit-id: da8643b976
|
2012-04-11 18:34:58 -05:00 |
|
Matt Nash
|
48a45abcc2
|
Issue #429 drawing additions, code cleanup, toolbar fixes
Former-commit-id: ed088cca79 [formerly df7ddc0fa2] [formerly 8e83184569] [formerly ed088cca79 [formerly df7ddc0fa2] [formerly 8e83184569] [formerly b707408a0a [formerly 8e83184569 [formerly fa78aa2f7f4738770b37beb6b02fe5adbb074fae]]]]
Former-commit-id: b707408a0a
Former-commit-id: 31e9ad5572 [formerly 8a04973191] [formerly ef6d30a7738eb6cb76773ec46f212263d3d1b13c [formerly c6d7a5a69b]]
Former-commit-id: 5347202882b71e8496b5b4ac8449ade22bbb0acf [formerly 660b21f6e5]
Former-commit-id: 3680d09e6f
|
2012-04-11 16:45:28 -05:00 |
|
James Korman
|
0656186428
|
Issue #437 - Add debug output to support roster development
Former-commit-id: 3e7b1a14f3 [formerly 4a22bdb915] [formerly 826105c621] [formerly 3e7b1a14f3 [formerly 4a22bdb915] [formerly 826105c621] [formerly 14b193ad6f [formerly 826105c621 [formerly b502e55a4b95dc0483e5502154ba61f04e9132cc]]]]
Former-commit-id: 14b193ad6f
Former-commit-id: 75bbebd2fa [formerly ba45c3b8c8] [formerly 99e34ab0e7b92840a551a88b16fd8555d21a6228 [formerly 9f05fd9905]]
Former-commit-id: 246194f74ac5bf27d91c33020673c59e9d31366e [formerly 4c8263a3f0]
Former-commit-id: e5f68f34f1
|
2012-04-11 16:23:04 -05:00 |
|
James Korman
|
ede57d068b
|
Issue #437 - Added event notification for roster/roster status updates
Former-commit-id: 60f690d126 [formerly b23bd53519] [formerly d664e77844] [formerly 60f690d126 [formerly b23bd53519] [formerly d664e77844] [formerly f25744ed0f [formerly d664e77844 [formerly 90f4901c8b7f86a8a0da3be7801d3a5b48b284a8]]]]
Former-commit-id: f25744ed0f
Former-commit-id: d66cea837c [formerly 555679afc0] [formerly dc44fb0a4c858381846c3d838d1753d761d66f98 [formerly 14c1af5d72]]
Former-commit-id: e619c37fbb65f8be835ae65fb664e525ccd84dba [formerly b42465f64e]
Former-commit-id: 0a218f0f68
|
2012-04-11 15:37:16 -05:00 |
|
Roger Ferrel
|
b3071095aa
|
Issue #437 Bug fixes to user status
Change-Id: Idd46418cc6f40a1f8a4f247942f5b730b851444f
Former-commit-id: 2e61538905 [formerly 3421463f53] [formerly 74c98303d5] [formerly 2e61538905 [formerly 3421463f53] [formerly 74c98303d5] [formerly d45396d9f0 [formerly 74c98303d5 [formerly 140fa8efdba2cd5c6cf8b2a1c9696e08d1dc931a]]]]
Former-commit-id: d45396d9f0
Former-commit-id: 1da4339131 [formerly b63954e4de] [formerly 1cec54e406153589e76b7d319454697721cb75e5 [formerly eec9b69d47]]
Former-commit-id: c91a4be72358120c68a2eab5d3d33c227ce48d3f [formerly 1cccff5054]
Former-commit-id: 3d1e700e88
|
2012-04-11 12:26:46 -05:00 |
|
Max Schenkelberg
|
bb28089fa6
|
Issue #239 Got maps resources syncing across users
Former-commit-id: a94f6388f3 [formerly 60879f83bd] [formerly 8865c35e69] [formerly a94f6388f3 [formerly 60879f83bd] [formerly 8865c35e69] [formerly ea6b58c226 [formerly 8865c35e69 [formerly d3864aaf812ed78137a7c4124515a1f4300cd2b1]]]]
Former-commit-id: ea6b58c226
Former-commit-id: 2d6e1728e9 [formerly 7d84449d7c] [formerly 4695edc590a19b6ea96ba978a4a38e0f613e64c5 [formerly e90693f7d9]]
Former-commit-id: 51f56d4ea1967ff844198715bcbb1c34cffed27a [formerly 65383a8b53]
Former-commit-id: 4036ea2785
|
2012-04-11 09:46:53 -05:00 |
|
Nate Jensen
|
2ea7a555e3
|
Issue #444 some cleanup
Change-Id: Ic790969f95e59fbf16a18d05bcc11cfe09a94916
Former-commit-id: 3b0f399ac7 [formerly da1163d487] [formerly 4405320bc8] [formerly 3b0f399ac7 [formerly da1163d487] [formerly 4405320bc8] [formerly f32611df47 [formerly 4405320bc8 [formerly 7731d22c58ee05a1c663a1d0da8f047ce49aa09c]]]]
Former-commit-id: f32611df47
Former-commit-id: 5fed054bee [formerly e4ea4333eb] [formerly 87fe8cf1b441c0e889ae9fdc70325fbb10687574 [formerly 0286ff10ad]]
Former-commit-id: 7cc221aa4a7ca62adab2a795bf5e538befdf8b43 [formerly d3f9d5fbdf]
Former-commit-id: fd94a0927d
|
2012-04-11 09:33:56 -05:00 |
|
Nate Jensen
|
da9a66cb15
|
Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7
Former-commit-id: 93bfd726cf [formerly ff36181458] [formerly 0f20bba406] [formerly 93bfd726cf [formerly ff36181458] [formerly 0f20bba406] [formerly 9b4b691ca9 [formerly 0f20bba406 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]]]]
Former-commit-id: 9b4b691ca9
Former-commit-id: 1159e2db0e [formerly 929365719e] [formerly d7d801ad3d55a7ba9400082d7d305bd51397d18e [formerly ae769c490b]]
Former-commit-id: 972ef20c417e51050d7a8a1d556421c17436ac28 [formerly a554e754bd]
Former-commit-id: c98cf48092
|
2012-04-10 18:15:36 -05:00 |
|
Bryan Kowal
|
80d7eef4b5
|
Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration
Former-commit-id: 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 3baf9d03c2 [formerly 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]]]
Former-commit-id: 3baf9d03c2
Former-commit-id: bcd015b390 [formerly 929a056e1b] [formerly d378932ad42a50abccb7f393f0d20a538b2651f3 [formerly 61d0a876dd]]
Former-commit-id: 9873ed4d4cd1ce895f3d6cdb3d0d89f8fa5ef773 [formerly c8ae36a6b2]
Former-commit-id: 3806dad754
|
2012-04-10 17:40:58 -05:00 |
|
Brad Gonzales
|
a4a5d19f9d
|
Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: 3a9a646cf7 [formerly 7229f9b92a] [formerly ac35f8f2fb] [formerly 3a9a646cf7 [formerly 7229f9b92a] [formerly ac35f8f2fb] [formerly 107c8ba7b9 [formerly ac35f8f2fb [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]]]]
Former-commit-id: 107c8ba7b9
Former-commit-id: a4a8ae8e18 [formerly 7d7e792ed8] [formerly 06526a885a69fd5ed7b056fb56c936e7962d2a84 [formerly 1b7e35f876]]
Former-commit-id: decd27b1d7ab445f0d7863c8aa63090734c4d762 [formerly c25f8c2ee2]
Former-commit-id: 86360a2744
|
2012-04-10 17:20:38 -05:00 |
|
Roger Ferrel
|
23b700e060
|
Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223
Former-commit-id: d6cd8ffdc1 [formerly ced485f863] [formerly 69ea7c724e] [formerly d6cd8ffdc1 [formerly ced485f863] [formerly 69ea7c724e] [formerly 020be00301 [formerly 69ea7c724e [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]]]]
Former-commit-id: 020be00301
Former-commit-id: 57e9f8fc75 [formerly 40b73d902c] [formerly d420514e04ad2359f559a25fb096aa020b45f47a [formerly 8fa193bcbe]]
Former-commit-id: c40be7e581c9923895e8b1dc17d182c2255c7e12 [formerly ca8d18c8f9]
Former-commit-id: 2327436f8a
|
2012-04-10 16:50:26 -05:00 |
|
Bryan Kowal
|
22218f31bd
|
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]]
Former-commit-id: ce99417a2a
Former-commit-id: 8b08c8308e [formerly 541fe8fbbb] [formerly 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1]]
Former-commit-id: ffb83e28c6229d71093fafcfa99acc4e62dc25af [formerly 47c7cba3f5]
Former-commit-id: 07e4ddc1b9
|
2012-04-10 16:42:36 -05:00 |
|
James Korman
|
b56ed6b1ff
|
Issue #437 - Updates to status handling - Added SessionManager user presence.
Former-commit-id: 64313163fb [formerly 44eae46180] [formerly 7bf01ecbc9] [formerly 64313163fb [formerly 44eae46180] [formerly 7bf01ecbc9] [formerly 07bc1bf83e [formerly 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]]]]
Former-commit-id: 07bc1bf83e
Former-commit-id: b573c1162c [formerly 8afc2bc1a8] [formerly 0784456ab907baca539b6cb36890c1b39ca8354b [formerly 7272ede3c4]]
Former-commit-id: 6b0b550ccb9ccf741a888f3d33f27e780ca103cb [formerly d8e1fad3c0]
Former-commit-id: cb8d2f17ff
|
2012-04-10 15:55:12 -05:00 |
|
Max Schenkelberg
|
57e0dbf2bf
|
Issue #239 Got zoom/pan events working for remote users
Former-commit-id: 7416bd9839 [formerly 65f6c07530] [formerly 6e0c5c3cdf] [formerly 7416bd9839 [formerly 65f6c07530] [formerly 6e0c5c3cdf] [formerly 18e9f2c6ad [formerly 6e0c5c3cdf [formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 2c47c3a99d [formerly 9853d46099] [formerly 651085c3a24f9ed2b19ae0a5cf80b31fa2d7e0be [formerly 0d21a9a35e]]
Former-commit-id: fe6a73e790f39586ffbcd7eb1035a198363895b3 [formerly dbd37bb4ae]
Former-commit-id: 5977b8bcba
|
2012-04-10 14:40:51 -05:00 |
|
Matt Nash
|
be827580d2
|
Issue #429 comment out ability to start in debug mode for the connection
Former-commit-id: 286b51b936 [formerly 62564ebb0c] [formerly 202fe2bb5e] [formerly 286b51b936 [formerly 62564ebb0c] [formerly 202fe2bb5e] [formerly f05b486e33 [formerly 202fe2bb5e [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]]]]
Former-commit-id: f05b486e33
Former-commit-id: e3b73bea8c [formerly 96f45cdb58] [formerly f32eb9eed5a4c3676fc28b4bce1e17de2b7ef30d [formerly 52e27b63f7]]
Former-commit-id: 52a697ae23d4c148ada32bbec100d289d8251ac2 [formerly fb87eac0a7]
Former-commit-id: 4a3b1b2591
|
2012-04-10 13:22:42 -05:00 |
|
Steve Harris
|
80108c0af9
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
|
2012-04-10 12:50:03 -05:00 |
|
Roger Ferrel
|
c0f95c0c57
|
Issue #437 User status now properly displayed and updated in sessions.
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999
Former-commit-id: 9e4ea5bef6 [formerly 7ebea1d964] [formerly d2e2fd8da3] [formerly 9e4ea5bef6 [formerly 7ebea1d964] [formerly d2e2fd8da3] [formerly 3fd25ff1cf [formerly d2e2fd8da3 [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]]]]
Former-commit-id: 3fd25ff1cf
Former-commit-id: 1b246c91c0 [formerly 16857ccb3a] [formerly a7ca24388156c67420d24fca9338db23ba6ad944 [formerly 57e809d913]]
Former-commit-id: 13ac5d76ef19c6fdd5b9d8564751b69fc9c5d9e4 [formerly c259f5c643]
Former-commit-id: 1923bf67ed
|
2012-04-10 11:11:26 -05:00 |
|
Nate Jensen
|
1602e04564
|
Issue #427 cleanup
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024
Former-commit-id: 914012521e [formerly 68a3867d06] [formerly 2e5272cff9] [formerly 914012521e [formerly 68a3867d06] [formerly 2e5272cff9] [formerly ec92c842c4 [formerly 2e5272cff9 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]]]]
Former-commit-id: ec92c842c4
Former-commit-id: 8a67c1211c [formerly a16929c9bc] [formerly f71fb863c9e4b9653e1c9491189ec17650d52a26 [formerly a924bd6489]]
Former-commit-id: cf4ecfa7fcd748e841a9e1f91f716ea5138f60d3 [formerly 4ac068d140]
Former-commit-id: 35316d2fe3
|
2012-04-10 10:35:03 -05:00 |
|
Brad Gonzales
|
f2357bcd06
|
Issue #440 Changed login icon to green.
Former-commit-id: 694c8d99ff [formerly 0eefb140ac] [formerly a378fea5d1] [formerly 694c8d99ff [formerly 0eefb140ac] [formerly a378fea5d1] [formerly ca2a35d77c [formerly a378fea5d1 [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]]]]
Former-commit-id: ca2a35d77c
Former-commit-id: e1329c566e [formerly d7421465f7] [formerly 52517a936fc772f6cc69d253e33a050e945853cc [formerly 8d170cd14b]]
Former-commit-id: ff008b0f33ba4d096a29dc4118ef865520964205 [formerly a18f4944a4]
Former-commit-id: f2f5f2725d
|
2012-04-10 10:01:11 -05:00 |
|
Roger Ferrel
|
d4962cfefa
|
Issue #437 Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164
Former-commit-id: 05d20a70ea [formerly 57abf56e09] [formerly b4c8d3a0d9] [formerly 05d20a70ea [formerly 57abf56e09] [formerly b4c8d3a0d9] [formerly 521127b589 [formerly b4c8d3a0d9 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]]]]
Former-commit-id: 521127b589
Former-commit-id: a043e15035 [formerly 35c753c07f] [formerly ffe3bb947109a3d0dd60988e238123c19981b959 [formerly 946f7963c4]]
Former-commit-id: 2509f8775c43d71c4eff634741bd92c14958d8c3 [formerly 06933e6f92]
Former-commit-id: a7cd6a8ece
|
2012-04-09 16:00:25 -05:00 |
|
Matt Nash
|
fde6de2c0b
|
Issue #429 changing 'private' aspect
Former-commit-id: e94db84585 [formerly eba8ac8dd9] [formerly 9887678590] [formerly e94db84585 [formerly eba8ac8dd9] [formerly 9887678590] [formerly 98350f4ba5 [formerly 9887678590 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]]]]
Former-commit-id: 98350f4ba5
Former-commit-id: bf85a9c5b8 [formerly 1c93a3d702] [formerly 841444a4f8bb6733bfb89cf8569094f97587343f [formerly d6731254d6]]
Former-commit-id: 3648a745fd6c8947e818b0a5a763c405937e0ad9 [formerly f850f8ef2a]
Former-commit-id: b2aa6417c7
|
2012-04-09 15:21:07 -05:00 |
|
Roger Ferrel
|
aed3001803
|
Issue #437 Change to up date Presence in the Group View.
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8
Former-commit-id: 61f3e1fb0e [formerly 225a8762d1] [formerly c5399687bc] [formerly 61f3e1fb0e [formerly 225a8762d1] [formerly c5399687bc] [formerly 2109190752 [formerly c5399687bc [formerly b64a623cda4ec00d555d8542da496286e0210dac]]]]
Former-commit-id: 2109190752
Former-commit-id: e29b208070 [formerly 7be7bceeaa] [formerly 22d05609434586e7662300f737604417f4a3acb6 [formerly 1e4ed16880]]
Former-commit-id: 982d057d2248a5e22c3d4354865924404e4fede4 [formerly c620bc2ef5]
Former-commit-id: 245e7171ac
|
2012-04-09 15:16:19 -05:00 |
|
Slav Korolev
|
a969ff8908
|
Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.
Former-commit-id: 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]]]
Former-commit-id: f02da69ff5
Former-commit-id: c158df01f8 [formerly 45d4f9fb86] [formerly 7c520a3f99ccdf1fa13ed92436ba78b85df449ea [formerly 47ba302180]]
Former-commit-id: c1d0302c1c23c128a04ea83683fe62afda4fd4b2 [formerly d82def7b22]
Former-commit-id: 55a9ed9a51
|
2012-04-09 14:50:19 -04:00 |
|
Matt Nash
|
f270a05653
|
Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: 47a24a20c2 [formerly 2a7698e284] [formerly 42ce0e72f0] [formerly 47a24a20c2 [formerly 2a7698e284] [formerly 42ce0e72f0] [formerly b340718346 [formerly 42ce0e72f0 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]]]
Former-commit-id: b340718346
Former-commit-id: 638bc4ea08 [formerly 80da3ac38f] [formerly 8ffec5acab3087d00d96c6843996f230186044ba [formerly 22aec07dfd]]
Former-commit-id: f2999e7b6f251609ea9a4adff5db83ae4c2e0fa2 [formerly 37671e80ad]
Former-commit-id: a8366aca54
|
2012-04-09 12:42:44 -05:00 |
|
James Korman
|
f5e4f7a17b
|
Issue #437 - Updated Presence - Add properties and new constructor
Former-commit-id: 3e0929bc19 [formerly 9aa0176bb7] [formerly 48397d1d95] [formerly 3e0929bc19 [formerly 9aa0176bb7] [formerly 48397d1d95] [formerly 53dc047d3d [formerly 48397d1d95 [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]]]]
Former-commit-id: 53dc047d3d
Former-commit-id: 4d47a5bd03 [formerly 9a7c440f2d] [formerly 0f523247a9d4006ee425b68577045c883a21f008 [formerly 0d6a5312d1]]
Former-commit-id: 7662523ab57ec218539cbce3240456a4c44bdc8a [formerly 1a5f500029]
Former-commit-id: a2f35b7885
|
2012-04-09 11:42:19 -05:00 |
|
Brad Gonzales
|
f019daf003
|
Issue #440 added login icon. Changed Logon to Login.
Former-commit-id: 5a1970c902 [formerly 008b670b6a] [formerly 44a83e92ed] [formerly 5a1970c902 [formerly 008b670b6a] [formerly 44a83e92ed] [formerly 7937986b11 [formerly 44a83e92ed [formerly d2b9c7981006dad91c5781fe0df96113530491df]]]]
Former-commit-id: 7937986b11
Former-commit-id: faaaedf5a7 [formerly 8084909235] [formerly d66ee38a743e9cdf115c208d9f81a7a986381f5e [formerly 552ce918ef]]
Former-commit-id: b376b9ecd16f2a908c31b5a030edc5be12407b4d [formerly 98d9c96a4f]
Former-commit-id: 9fe4d27470
|
2012-04-09 11:38:08 -05:00 |
|