Nate Jensen
|
4676b01be6
|
Issue #427 separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: 084967f0fd [formerly d952fe084a] [formerly e8f1c0159c] [formerly 084967f0fd [formerly d952fe084a] [formerly e8f1c0159c] [formerly 9454cbd1b9 [formerly e8f1c0159c [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]]]
Former-commit-id: 9454cbd1b9
Former-commit-id: 11acde5199 [formerly 99e561a26e] [formerly 5c1f8f7212b1ee91e91f199da04bae0530630539 [formerly 4a85e47ee9]]
Former-commit-id: debb715f3ddebb303992a1736ba203f3ef86a33f [formerly 03db8baf70]
Former-commit-id: 829c6621e9
|
2012-04-27 16:12:48 -05:00 |
|
Nate Jensen
|
efb801fb84
|
Issue #427 better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 281f9b3232 [formerly cafa23c9d2] [formerly 855ec5dd4d] [formerly 281f9b3232 [formerly cafa23c9d2] [formerly 855ec5dd4d] [formerly 866acb24b2 [formerly 855ec5dd4d [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]]]
Former-commit-id: 866acb24b2
Former-commit-id: be090ce8f3 [formerly 19dfa62f58] [formerly f09a041c433c49f244db95e8e48ea63cd51c1a93 [formerly cc61a7a62f]]
Former-commit-id: 3a5f57a95a88f3410e7ded30a1c7d5750e60c765 [formerly e4afe7405c]
Former-commit-id: 79c99ecfe5
|
2012-04-27 14:47:27 -05:00 |
|
Matt Nash
|
c7764f2783
|
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: 1749033fdd [formerly 0a3a7bfba2] [formerly cc313ebcac] [formerly 1749033fdd [formerly 0a3a7bfba2] [formerly cc313ebcac] [formerly 00d11cdeaa [formerly cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]]]
Former-commit-id: 00d11cdeaa
Former-commit-id: 1f3088a776 [formerly aea9b34499] [formerly b731ef00aa8afa7e0eff5fbdcbe011b4ee37d716 [formerly af819b2e0d]]
Former-commit-id: 308aad6e970acb56c0abaca1062c1d5b55de3722 [formerly 1e75e1b24d]
Former-commit-id: 203dae601a
|
2012-04-27 14:34:55 -05:00 |
|
David Gillingham
|
c14b933aac
|
Merge "Issue #562: Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge
Former-commit-id: ddd78ed32f [formerly 0ff2041959] [formerly 4aadd41fde] [formerly ddd78ed32f [formerly 0ff2041959] [formerly 4aadd41fde] [formerly 9878793618 [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]]]
Former-commit-id: 9878793618
Former-commit-id: 576e994c04 [formerly 8c4eda7ae7] [formerly 2346b8754f4ea785e03af9338a964fe9ccdfe0d2 [formerly a1a62aa8f1]]
Former-commit-id: 7427d8ebfd4376ec5b3ce31ace2d1e11fa2556d5 [formerly dfc4e92f58]
Former-commit-id: 8b91ca3fb5
|
2012-04-27 13:26:37 -05:00 |
|
David Gillingham
|
d189b66b1f
|
Issue #562: Rename QPFRecord getters and setters to match Java-naming
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]]
Former-commit-id: 292374ce21
Former-commit-id: eeb836f5eb [formerly 1107eac65d] [formerly 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]]
Former-commit-id: e167e02e805072fdf1b2f36d3706605647061458 [formerly 01f74fa2b5]
Former-commit-id: 64df9d3b46
|
2012-04-27 12:43:04 -05:00 |
|
Richard Peter
|
b7c5a834b5
|
Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 231d98b79e [formerly c33a392a8c] [formerly 349adaeedd] [formerly 231d98b79e [formerly c33a392a8c] [formerly 349adaeedd] [formerly b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]]
Former-commit-id: b11df888d3
Former-commit-id: 51e9a72371 [formerly ae35c2f27c] [formerly 8e9c6244c73799f26e260982a3f71ee5ca3d5c9a [formerly e3323febc5]]
Former-commit-id: 0fa5241fd917758f0896a74d045990ac166bd25b [formerly 0212d3108f]
Former-commit-id: 83564a4dde
|
2012-04-27 12:08:29 -05:00 |
|
Max Schenkelberg
|
7b05f6f4d6
|
Issue #239 Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: f4cd5ebfef [formerly 4175affdc7] [formerly ff0827b51d] [formerly f4cd5ebfef [formerly 4175affdc7] [formerly ff0827b51d] [formerly df07bff0bc [formerly ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]]]
Former-commit-id: df07bff0bc
Former-commit-id: c921fd3508 [formerly c0a47ede0d] [formerly c0ecddd455d169d50d27cb31f597a127111a78fe [formerly e5e13fc3b3]]
Former-commit-id: b408bb14cbb7ec7d910d34c0325c4a6b50c149fe [formerly 8a4f34223e]
Former-commit-id: e98537b537
|
2012-04-27 11:57:53 -05:00 |
|
Matt Nash
|
07409b4137
|
Issue #429 add better notification to chat
Former-commit-id: 18e07972ca [formerly 590862b77d] [formerly e0d11ae8b1] [formerly 18e07972ca [formerly 590862b77d] [formerly e0d11ae8b1] [formerly 3b2fdaa579 [formerly e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]]]
Former-commit-id: 3b2fdaa579
Former-commit-id: 21ac4d37be [formerly e94eaf4752] [formerly a873337238e14b1e9af1b91cd3bd0b55656415ad [formerly 91035ee253]]
Former-commit-id: 781f573d2445450af1afebadcc1b9b2dc442a124 [formerly c930a63797]
Former-commit-id: 249b72e35d
|
2012-04-27 10:10:05 -05:00 |
|
Matt Nash
|
f360cb14b8
|
Issue #429 make chatting append to message before sending out to prevent delay, add notification method so if CAVE is minimized the user will still get the notification that a new chat has happened
Former-commit-id: 548e0c4b59 [formerly c1983d295d] [formerly 25201fcbad] [formerly 548e0c4b59 [formerly c1983d295d] [formerly 25201fcbad] [formerly 16de1dbafe [formerly 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]]]
Former-commit-id: 16de1dbafe
Former-commit-id: cb2d3b6d30 [formerly 051b9397f7] [formerly 7dc402eb1ed2afb56772e897b0da23e2a02c2b07 [formerly 501b74478e]]
Former-commit-id: 67266fc08258b22e624d6c7c8a221ad31ef341ea [formerly 32772c5ecc]
Former-commit-id: de1fe44cfc
|
2012-04-27 10:08:27 -05:00 |
|
Matt Nash
|
7a1ca6a82f
|
Issue #448 remove listener to help prevent exceptions
Former-commit-id: 1e27e69e3d [formerly 331adad3a3] [formerly 29b39a1df4] [formerly 1e27e69e3d [formerly 331adad3a3] [formerly 29b39a1df4] [formerly b69e13d795 [formerly 29b39a1df4 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]]]
Former-commit-id: b69e13d795
Former-commit-id: 4bd03694ca [formerly 8e4072b67d] [formerly d30f0e88e68a8ba3d75d22d5d9b8cb1f7e880924 [formerly fcecab2afb]]
Former-commit-id: 0fed643aa37f108a271921bd637f46b98c4fd9fa [formerly 20b7f4c34b]
Former-commit-id: 609c0a8ecb
|
2012-04-26 09:17:27 -05:00 |
|
Max Schenkelberg
|
8fafc768ae
|
Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a31ad22113 [formerly 2cc5794428] [formerly a912786429] [formerly a31ad22113 [formerly 2cc5794428] [formerly a912786429] [formerly f74b6b4a93 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 24fb2b356b [formerly 7bb4057d32] [formerly 8c89c3d5f0f25a3c5cb1d95eb759b2d2e999dff8 [formerly 2d25e8bb78]]
Former-commit-id: 1141c5a73ef20b9b2e65c981fb05a96c27b88f21 [formerly 936fa688c0]
Former-commit-id: cd7fe895bc
|
2012-04-25 17:28:52 -05:00 |
|
David Gillingham
|
86bd3050dc
|
Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: be0570d2fe [formerly 8592a9a50d] [formerly 526abfd36e] [formerly be0570d2fe [formerly 8592a9a50d] [formerly 526abfd36e] [formerly 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]]]
Former-commit-id: 04ab5d619b
Former-commit-id: 7bf4680605 [formerly cf74c74cc2] [formerly e77f5dcec02d5b45fb66c367e20ce30bd24262be [formerly 36717c7a3e]]
Former-commit-id: 9bbbf2a7ff6b6837a7d45fdfda006aba43507cc8 [formerly aeba62a5d9]
Former-commit-id: 84d7341a01
|
2012-04-25 17:08:21 -05:00 |
|
Nate Jensen
|
5952eab8a2
|
Issue #427 remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: 74a4671d33 [formerly 1ff944fc2d] [formerly ed4303158c] [formerly 74a4671d33 [formerly 1ff944fc2d] [formerly ed4303158c] [formerly e17dad1b54 [formerly ed4303158c [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]]]
Former-commit-id: e17dad1b54
Former-commit-id: 275c1051a4 [formerly 066638a057] [formerly 6af01bc8784fa17f3746211f497d968876849a1a [formerly 0c523369c4]]
Former-commit-id: 0568049542d9165274194e88f26a5b3333eff164 [formerly 4eb455b7b1]
Former-commit-id: e4cf062156
|
2012-04-25 16:56:19 -05:00 |
|
Max Schenkelberg
|
c2ee36a2e9
|
Got efficient sending of events working where it only sends if events changed
Change-Id: I499a38c1b9cbbd3ede5b04356d2f7788153f836b
Former-commit-id: 56add92c68 [formerly d77732bd7d] [formerly 84b8ffa490] [formerly 56add92c68 [formerly d77732bd7d] [formerly 84b8ffa490] [formerly 28693e6991 [formerly 84b8ffa490 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]]]]
Former-commit-id: 28693e6991
Former-commit-id: 46431fcca8 [formerly 51d7591203] [formerly c635667b1b6b723b474ccefb7fd56708e88cdfaf [formerly e608125f9d]]
Former-commit-id: 89c394a4b4f0d66cfa2c37a27aa2327291b2cab6 [formerly 0ba535a60b]
Former-commit-id: 3a5cdaa69a
|
2012-04-25 16:18:41 -05:00 |
|
Matt Nash
|
5625d56378
|
Issue #448 slight changes to data provider and session leader indicators
Former-commit-id: 7bedb0a6a8 [formerly 12426aba3b] [formerly 06d71f13ad] [formerly 7bedb0a6a8 [formerly 12426aba3b] [formerly 06d71f13ad] [formerly 8f93192385 [formerly 06d71f13ad [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]]]]
Former-commit-id: 8f93192385
Former-commit-id: 105bc62fdc [formerly a342e09abc] [formerly d4b35eca8b3a47b5efe2f70ae0c6365349077322 [formerly f212b1d1ae]]
Former-commit-id: 5d416afc83fd94189012342dc9f3cd2285d9ab52 [formerly 9d0fd819ff]
Former-commit-id: f73d40874d
|
2012-04-25 15:07:14 -05:00 |
|
Nate Jensen
|
6f60bdc9e6
|
Issue #427 renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c
Former-commit-id: 063244b9d3 [formerly e816529d71] [formerly 069f809596] [formerly 063244b9d3 [formerly e816529d71] [formerly 069f809596] [formerly b3723bc986 [formerly 069f809596 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]]]]
Former-commit-id: b3723bc986
Former-commit-id: f7b554ed7e [formerly a91f47146b] [formerly 6967419e371a481b7844e27719cc9cc5a4287d92 [formerly a14bccc7ac]]
Former-commit-id: 567afaf59e3e349038ba6a1fd9427a1271f518f7 [formerly 9c7af0cfeb]
Former-commit-id: 7da55177b0
|
2012-04-25 14:41:37 -05:00 |
|
Matt Nash
|
4c1a35e9b5
|
Issue #448 first pass at alias
Former-commit-id: 0611debf5e [formerly b480ccd3fe] [formerly 7d870434f6] [formerly 0611debf5e [formerly b480ccd3fe] [formerly 7d870434f6] [formerly b20b9530fd [formerly 7d870434f6 [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]]]]
Former-commit-id: b20b9530fd
Former-commit-id: c66ed279e9 [formerly e6bd4420ab] [formerly 11cd1f97f2e785640e47fe2d025064a952dbdce5 [formerly f3467023a2]]
Former-commit-id: 4467bf4afd30bd30960cda46ba13eeab2a5ee685 [formerly 23c3615fd6]
Former-commit-id: d59b3ce770
|
2012-04-25 14:25:52 -05:00 |
|
Matt Nash
|
88ef8da3d2
|
Issue #429 color final fixes
Former-commit-id: e4c9c05f36 [formerly 03174d8f66] [formerly 9bc3f0c75d] [formerly e4c9c05f36 [formerly 03174d8f66] [formerly 9bc3f0c75d] [formerly 506d3e8989 [formerly 9bc3f0c75d [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]]]
Former-commit-id: 506d3e8989
Former-commit-id: 7f937defa6 [formerly 4ff28dd769] [formerly 384db86ace751f723858b3f30df6625402b0fe89 [formerly 76e8b2e192]]
Former-commit-id: f8dca92f990c18f0fbf116632bb28d5c46f83bac [formerly d51f16cd6c]
Former-commit-id: d284b5d89a
|
2012-04-25 14:22:12 -05:00 |
|
Max Schenkelberg
|
146d112017
|
#Issue 239 Got bulk event sending and only sending events when previous frame changes.
Former-commit-id: d68aa3b431 [formerly 4c3afb8f7c] [formerly 001c52bd3a] [formerly d68aa3b431 [formerly 4c3afb8f7c] [formerly 001c52bd3a] [formerly 9607d3dd41 [formerly 001c52bd3a [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]]]]
Former-commit-id: 9607d3dd41
Former-commit-id: a803ce2f65 [formerly cb4c445a05] [formerly 6635b1d7b4e231530e2d9e45bccf98b0b2eb45de [formerly 9d8dbba20b]]
Former-commit-id: d1c1d525d4311f743e467ac5d9255a6b851334ad [formerly bf92452419]
Former-commit-id: 6915230cdf
|
2012-04-25 11:27:19 -05:00 |
|
Matt Nash
|
f2f7e0b839
|
Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: b92b22e13a [formerly abbe0c3d6b] [formerly d84865ced9] [formerly b92b22e13a [formerly abbe0c3d6b] [formerly d84865ced9] [formerly 09fc05162c [formerly d84865ced9 [formerly 46a327c929a09c21270f7b6de543e8d742476003]]]]
Former-commit-id: 09fc05162c
Former-commit-id: 9919309edd [formerly 5fa80650b3] [formerly 412fa827f65caf8f8e25db782870223e820ba13e [formerly 563e76c313]]
Former-commit-id: 3b4b0ddfa2a1bcac847ea0f2a8d95d8caf8a388c [formerly 8739f702d0]
Former-commit-id: 64cab6c5f9
|
2012-04-25 07:39:05 -05:00 |
|
Matt Nash
|
99bf9321f2
|
Issue #429 colors for collaboration session
Former-commit-id: 9a8693fda1 [formerly 190a951b26] [formerly 63dccd6b85] [formerly 9a8693fda1 [formerly 190a951b26] [formerly 63dccd6b85] [formerly bc1e35f4b4 [formerly 63dccd6b85 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]]]
Former-commit-id: bc1e35f4b4
Former-commit-id: 979c935a32 [formerly 75a76124f8] [formerly 07f08f4f7dfba60140f2e2a11bd69e2e0819758f [formerly d79ae59e19]]
Former-commit-id: a2655d5016c03fe4beb2431ef4757864358c9aa4 [formerly f614a5bb04]
Former-commit-id: 1659ccaed5
|
2012-04-24 16:39:28 -05:00 |
|
Steve Harris
|
ad3bb08978
|
12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]]
Former-commit-id: 01457fbbde
Former-commit-id: caab7c1fbb [formerly 97caaa0327] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]]
Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb]
Former-commit-id: f1eb6efb23
|
2012-04-24 15:38:29 -05:00 |
|
Nate Jensen
|
556a0ae287
|
Issue #427 minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca
Former-commit-id: a8c7d99d18 [formerly 652c2a5411] [formerly fd1f337a92] [formerly a8c7d99d18 [formerly 652c2a5411] [formerly fd1f337a92] [formerly bcc435ac28 [formerly fd1f337a92 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]]]]
Former-commit-id: bcc435ac28
Former-commit-id: 2ed24e3263 [formerly aec56b4df0] [formerly 82bac21b28bc028e941b0fb79fcf6f94cb0c42e3 [formerly 7c727f5a0e]]
Former-commit-id: adcc3d36f1ecfece393d488d6562bc817a3aa209 [formerly a867e1ab82]
Former-commit-id: 95c3235746
|
2012-04-24 15:28:36 -05:00 |
|
Steve Harris
|
8d58af7bb2
|
12.4.1-7 baseline
Former-commit-id: 98c92073b5 [formerly 6d585942fe] [formerly 90ae4bbb36] [formerly 98c92073b5 [formerly 6d585942fe] [formerly 90ae4bbb36] [formerly cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]]]
Former-commit-id: cca73b3c62
Former-commit-id: 55b2a4df32 [formerly 4c88c0ae6c] [formerly e1236b435e1110728cc2c913cb89b44372ea9903 [formerly d9f966008c]]
Former-commit-id: f6bdea5f5f0f4517b1b2e5bdb716a7c60aea1468 [formerly 5a3a53936f]
Former-commit-id: 989dd653f2
|
2012-04-24 15:24:39 -05:00 |
|
Nate Jensen
|
640e0674ae
|
Issue #427 login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c
Former-commit-id: 45bf1150e6 [formerly a2a6d2d61d] [formerly c4afe61f01] [formerly 45bf1150e6 [formerly a2a6d2d61d] [formerly c4afe61f01] [formerly bf3eb689cc [formerly c4afe61f01 [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]]]
Former-commit-id: bf3eb689cc
Former-commit-id: dec0aa083e [formerly 4d81850de4] [formerly 30e85a51e1de9957abf9bcf2eb32a466239af984 [formerly 0a7a5d44ff]]
Former-commit-id: 22e99054bcab0afa8f19415126eeb14ca3f68148 [formerly 23bd871123]
Former-commit-id: d50983a4fe
|
2012-04-24 14:11:27 -05:00 |
|
Max Schenkelberg
|
74b3843b34
|
Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: a2d730a537 [formerly 34f80169fe] [formerly f4193b0e4e] [formerly a2d730a537 [formerly 34f80169fe] [formerly f4193b0e4e] [formerly 32ade1a1f7 [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 0b1e9de1a3 [formerly 2248b6ba00] [formerly d99b1b8e424819aa687ea38c079bbd2a3d08bf34 [formerly 1ddbb3ef60]]
Former-commit-id: 405c9af2dd5c82d700f3e510eed67e2a35c20334 [formerly 836eec0684]
Former-commit-id: f07147578f
|
2012-04-24 13:44:16 -05:00 |
|
Matt Nash
|
54d0244bf4
|
Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: 9c5efdfd26 [formerly b7b1429f2c] [formerly 0241e8857f] [formerly 9c5efdfd26 [formerly b7b1429f2c] [formerly 0241e8857f] [formerly fa360c90cf [formerly 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]]]
Former-commit-id: fa360c90cf
Former-commit-id: f01ac5b787 [formerly 27855328d0] [formerly 11b02280ce4c3db8d863cdc64e4e24dc47a6d28f [formerly b428da939c]]
Former-commit-id: d429c8462975533524f6dff9d741de5b7370b220 [formerly 2c8dfc611b]
Former-commit-id: 5e889362c1
|
2012-04-24 12:20:55 -05:00 |
|
Nate Jensen
|
b930b25977
|
Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 36c4c4e66e [formerly 14f70d1122] [formerly a4b0addeee] [formerly 36c4c4e66e [formerly 14f70d1122] [formerly a4b0addeee] [formerly 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 49d8f6c799 [formerly 83e6f5acf4] [formerly 529b68b96d852df4ba7ded4f9d68e14a00cc3e18 [formerly 8130c22b64]]
Former-commit-id: a83d2bb5a6626f09d2951421f7552384f89a7fdc [formerly 776ef738f7]
Former-commit-id: 2bce81c6c8
|
2012-04-23 11:23:22 -05:00 |
|
Bryan Kowal
|
bfe9c3e330
|
Issue #517 - fix the collaboration pde build.
Former-commit-id: 70d956f8ca [formerly 611fc324ea] [formerly 19eb596d88] [formerly 70d956f8ca [formerly 611fc324ea] [formerly 19eb596d88] [formerly d97819a8df [formerly 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]]]
Former-commit-id: d97819a8df
Former-commit-id: 4a529bba46 [formerly dd14feff46] [formerly 7cc285b2ae9bde5764df3230f9a6e94ee3c0312f [formerly de9a48b0c3]]
Former-commit-id: a495aeb9420e6815bdc83f317e21020566e1c136 [formerly 160a359b30]
Former-commit-id: a9bd4c797e
|
2012-04-21 18:17:39 -05:00 |
|
Matt Nash
|
646770c683
|
Issue #429 fixes for colors, needs to refactor user id to make work
Former-commit-id: 31510dae8d [formerly ac53206f1f] [formerly b418af8aa9] [formerly 31510dae8d [formerly ac53206f1f] [formerly b418af8aa9] [formerly 7f7bd73014 [formerly b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]]]
Former-commit-id: 7f7bd73014
Former-commit-id: 5df26c4d05 [formerly bd87f5c798] [formerly 58a7b49922dc1994ad90e5f3e4c2c8b7f6fa7bda [formerly 4f3a414d6d]]
Former-commit-id: c2271b73b317515cc19f7df529e7fb4b98ec6e6e [formerly 451a6f1b2e]
Former-commit-id: 2782102d68
|
2012-04-20 15:30:58 -05:00 |
|
Matt Nash
|
5a1565bee4
|
Issue #429 color fixes
Former-commit-id: f061b5e11c [formerly 878e798141] [formerly 7116eb79cd] [formerly f061b5e11c [formerly 878e798141] [formerly 7116eb79cd] [formerly 1b9c4320fc [formerly 7116eb79cd [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]]]]
Former-commit-id: 1b9c4320fc
Former-commit-id: 825b7531fc [formerly b84be3fe98] [formerly 6a57fc31e6c27f05deaaa2355a047b18eae33bab [formerly 15478a9e21]]
Former-commit-id: b5af66c37867d1731b1ab4eec8b0d1e0e9fe6e97 [formerly 06bd050bb0]
Former-commit-id: 572b2b8cf6
|
2012-04-20 15:30:58 -05:00 |
|
Matt Nash
|
bc43a6017e
|
Issue #429 lots of color changes
Former-commit-id: ecddf3fee7 [formerly 7c047a4879] [formerly 064657306f] [formerly ecddf3fee7 [formerly 7c047a4879] [formerly 064657306f] [formerly fdddff1957 [formerly 064657306f [formerly ac71a592948b71c629f5f535a8d06840b3905c2a]]]]
Former-commit-id: fdddff1957
Former-commit-id: 441228a0ab [formerly f1d694c70a] [formerly 405eeb370c5614701c57fdbafb95d65745ea51dc [formerly fa120a1cd0]]
Former-commit-id: 289581854902b6b7afca298a5206205b3b06131f [formerly add3189b75]
Former-commit-id: 90d755c919
|
2012-04-20 15:30:57 -05:00 |
|
Matt Nash
|
0472be6d25
|
Issue #429 first round fixes color
Former-commit-id: 71c193409d [formerly 0a81707a7f] [formerly 5f47f98662] [formerly 71c193409d [formerly 0a81707a7f] [formerly 5f47f98662] [formerly d34e2722b0 [formerly 5f47f98662 [formerly 901770d888a39df452e60d9ac6c5d7e071d6a810]]]]
Former-commit-id: d34e2722b0
Former-commit-id: 5142935ba3 [formerly 0675f46988] [formerly d5463082f48a5fc9672040fd917bfacce67292cd [formerly b5f8783a94]]
Former-commit-id: 1818b4ddb01addaa97e56117c7d86c418e6a7d91 [formerly 36f8d74418]
Former-commit-id: 370d8a36b4
|
2012-04-20 15:30:57 -05:00 |
|
David Gillingham
|
b3332b11bf
|
Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61
Former-commit-id: 715dce7557 [formerly 30d5e0d2dd] [formerly bdbc16d31c] [formerly 715dce7557 [formerly 30d5e0d2dd] [formerly bdbc16d31c] [formerly 58e7a0f310 [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]]]
Former-commit-id: 58e7a0f310
Former-commit-id: 102d8422bd [formerly e8fdf9d48f] [formerly ff55759d39974cfeacc3f63affe868b26ce230a0 [formerly 5850d4cfb1]]
Former-commit-id: 4b2c95a7187d74cbbaf13ae3aeabb2b9741c4291 [formerly 7fa9358be9]
Former-commit-id: 1be4f67cbb
|
2012-04-19 17:10:08 -05:00 |
|
Max Schenkelberg
|
70c1389120
|
Issue #239 Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately
Former-commit-id: 3f4defd7a4 [formerly 9d0eecb9b1] [formerly 523c90b697] [formerly 3f4defd7a4 [formerly 9d0eecb9b1] [formerly 523c90b697] [formerly da5e17d6e3 [formerly 523c90b697 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]]]
Former-commit-id: da5e17d6e3
Former-commit-id: 005381bf33 [formerly baf778717f] [formerly 99493f0a6512f938cc206c6c3028723ee75fa6ad [formerly f05528979d]]
Former-commit-id: e630994f79260e9196ebbd39360478c957ab5c8d [formerly 04cf9dba60]
Former-commit-id: f6a582c033
|
2012-04-19 16:03:07 -05:00 |
|
Nate Jensen
|
f52b87ea27
|
Issue #427 fix peer to peer
Change-Id: Iae7f0d4c5f3f28360a957768fa755809fe47c171
Former-commit-id: 565d9e18c4 [formerly 38dcb603b2] [formerly 8da43825d0] [formerly 565d9e18c4 [formerly 38dcb603b2] [formerly 8da43825d0] [formerly 62c5527e17 [formerly 8da43825d0 [formerly b8ca7f7c0d329c1d7bb527317fc89794ea4dbac0]]]]
Former-commit-id: 62c5527e17
Former-commit-id: 4756c0274b [formerly 26f41aa6ad] [formerly 4f4c3f804ffc342d500ba13600f4badb63c6d9ce [formerly 7fdc45a275]]
Former-commit-id: 7958e7b00dc4c51421e4ecfa2063c00fa809927f [formerly 3b749bfff8]
Former-commit-id: 4fa7c6a38f
|
2012-04-19 15:27:52 -05:00 |
|
Nate Jensen
|
97777345e5
|
Issue #427 cleanup
Change-Id: I74f9d6e99849f66ef33340685fbb08b4c9c1b768
Former-commit-id: 5677f8e788 [formerly 7398c40a72] [formerly efc911ac9d] [formerly 5677f8e788 [formerly 7398c40a72] [formerly efc911ac9d] [formerly 7f08b7cd22 [formerly efc911ac9d [formerly ee08cc7a0d81fd83b90398119add8fad3428283b]]]]
Former-commit-id: 7f08b7cd22
Former-commit-id: 0e64b04ff3 [formerly 629be1f9ab] [formerly cf36d6d0c0706d43f650541919673ae7bcf1b8ca [formerly 0951143f26]]
Former-commit-id: cdc17e966647b48c39554a4f31ef9da343981430 [formerly 6367124fcf]
Former-commit-id: f0e56aa8b8
|
2012-04-19 13:38:16 -05:00 |
|
Bryan Kowal
|
f3fc0d0c89
|
Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: dbcc538fa8 [formerly 72068507a9] [formerly b1561d67a0] [formerly dbcc538fa8 [formerly 72068507a9] [formerly b1561d67a0] [formerly b90b6f101e [formerly b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]]]
Former-commit-id: b90b6f101e
Former-commit-id: 562a5377f0 [formerly 0514785b3a] [formerly 8c618e7da663f49943d266edd03a91c9b60e6eb4 [formerly a9b51192d2]]
Former-commit-id: 791fcbd072a534d67245c9440c80f6ea097a6365 [formerly a610f40857]
Former-commit-id: e14e8e473e
|
2012-04-19 13:09:58 -05:00 |
|
Max Schenkelberg
|
f0a90ad028
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 937f4b6aa3 [formerly 51a826384e] [formerly 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2]]
Former-commit-id: 7d5e1d641386de98262499c8ba677d6c85554bf1 [formerly 72a27b7ae0]
Former-commit-id: 33d08f1496
|
2012-04-19 11:11:34 -05:00 |
|
Steve Harris
|
0cf19dc505
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d]
Former-commit-id: 9b8c6e395d
|
2012-04-19 11:11:02 -05:00 |
|
Nate Jensen
|
4525465ff9
|
Issue #427 consolidated user ids
Change-Id: I008c47320bbb5819db0607e7f695b3ecffa30387
Former-commit-id: c41304a6b3 [formerly a7122f032d] [formerly 006785e374] [formerly c41304a6b3 [formerly a7122f032d] [formerly 006785e374] [formerly 919f6907d3 [formerly 006785e374 [formerly 9e137757a7ed7bd9f319a1984aed40b6de960a35]]]]
Former-commit-id: 919f6907d3
Former-commit-id: 55a55ac45e [formerly 14f83aaf72] [formerly a8091c1e3479bf21ba2e26f9268972064067bdd0 [formerly 35d4ef153f]]
Former-commit-id: 124ab2ce8e8bc52fb3e14acb15702e86bed10ecf [formerly 877ebfe2c0]
Former-commit-id: 20b78b632b
|
2012-04-19 10:45:25 -05:00 |
|
Nate Jensen
|
0a797c374e
|
Issue #427 exceptions are good
Change-Id: I67bb428804d025d20423b9e2320006c70e9b4c68
Former-commit-id: 591fece195 [formerly 818467680e] [formerly 47639de899] [formerly 591fece195 [formerly 818467680e] [formerly 47639de899] [formerly 24ae50a37b [formerly 47639de899 [formerly ec20a1f9d6076c2f72909f9fb9a6c88598201dcf]]]]
Former-commit-id: 24ae50a37b
Former-commit-id: 2005e2aab2 [formerly 2af95d03e8] [formerly 9ab7edc0e870591cd06166afaa39c1d01f392519 [formerly 0cbcc74457]]
Former-commit-id: b10b45d5527546c88f7655aa082c3ff956ab7920 [formerly c1271c3377]
Former-commit-id: 64f6cb3fb0
|
2012-04-18 17:05:27 -05:00 |
|
Nate Jensen
|
c7b6ba49fb
|
Issue #427 more cleanup
Change-Id: I82018bb21bed8c2e0d948da915f80ef33061615e
Former-commit-id: 9b0d08a25d [formerly 7157aea007] [formerly a54660c377] [formerly 9b0d08a25d [formerly 7157aea007] [formerly a54660c377] [formerly 8124a47b94 [formerly a54660c377 [formerly 1d24813371c2dec40ff90657705048083e03a9db]]]]
Former-commit-id: 8124a47b94
Former-commit-id: cfac54682a [formerly 904c93d394] [formerly 282b17e07f5c33e7ada97f6fdf14417b9f1ddb85 [formerly 888d927468]]
Former-commit-id: 556d88bf2b571576b90c51d45b497075e89a25ec [formerly acc96c95b9]
Former-commit-id: 61039a63d8
|
2012-04-18 16:20:39 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Nate Jensen
|
d8b5336d50
|
Issue #427 more cleanup
Change-Id: Id2ad63a51e9a891801d2422547f855cd769a83d3
Former-commit-id: 3aa4f62ac6 [formerly f5c1e766af] [formerly c33cf2538c] [formerly 3aa4f62ac6 [formerly f5c1e766af] [formerly c33cf2538c] [formerly fa9c91e03d [formerly c33cf2538c [formerly 258df7c2187c1ebcecf1abf905ec2cc4e60464e0]]]]
Former-commit-id: fa9c91e03d
Former-commit-id: 81657c1a77 [formerly fba5e2c176] [formerly 38ac0e6719dadb670dbfdc771c364e8223e7c8f3 [formerly 8830e1c1c9]]
Former-commit-id: a217ddec397c70273a21fdbe94c7e486efaf50bb [formerly cd30e96235]
Former-commit-id: 6cd9b40e0f
|
2012-04-18 14:15:18 -05:00 |
|
Max Schenkelberg
|
acf9369ddf
|
Issue #239 Got reprojection event working
Former-commit-id: 46c1cf8e39 [formerly 6efccf10a5] [formerly 29f24e3ec5] [formerly 46c1cf8e39 [formerly 6efccf10a5] [formerly 29f24e3ec5] [formerly 005beff18a [formerly 29f24e3ec5 [formerly 99e432cd258c9bf570a66be4702d28ac68204052]]]]
Former-commit-id: 005beff18a
Former-commit-id: 819dd84dd6 [formerly 8096fc5ad3] [formerly 8a78d45f0fa487976a4676705a2ced495365e4af [formerly 044f21e405]]
Former-commit-id: fb0b45cfb9dda20064ca4b44df06d4e89c58424a [formerly fef058d9c6]
Former-commit-id: 0e60d7deb0
|
2012-04-18 14:01:09 -05:00 |
|
Nate Jensen
|
14c52b992c
|
Issue #427 cleanup
Change-Id: I2a294a679f8cfb1ed62a63a95bcd21b4954194a3
Former-commit-id: fe0baf5515 [formerly c986c29e6c] [formerly ec2a0e39ed] [formerly fe0baf5515 [formerly c986c29e6c] [formerly ec2a0e39ed] [formerly d6e119bde1 [formerly ec2a0e39ed [formerly feaa63a200183b87c45a4fcea6b655cf4b1a826f]]]]
Former-commit-id: d6e119bde1
Former-commit-id: 5b5d7d0e7c [formerly 033e7768ed] [formerly f7707c6b096715da51ec34551f58decf2cd0391e [formerly 601b6628f7]]
Former-commit-id: 0efc903708726d0d9e19d19426195391060a5868 [formerly 3de8de66ab]
Former-commit-id: c685802c45
|
2012-04-18 13:44:24 -05:00 |
|
Max Schenkelberg
|
82ab3e438f
|
Issue #239 Added ability to remove remote graphics functionality from
editor. Execute on session shutdown
Former-commit-id: 7c09df3cc0 [formerly cc6386f9f6] [formerly bbb8d0e596] [formerly 7c09df3cc0 [formerly cc6386f9f6] [formerly bbb8d0e596] [formerly c64d84d1b5 [formerly bbb8d0e596 [formerly 8a2d8b0ce27364eae1bc7e696a5d1074e03169dc]]]]
Former-commit-id: c64d84d1b5
Former-commit-id: add307f5bd [formerly f7616d9c15] [formerly 4661f0efcc23248722873b2218c7e248eb554c0e [formerly d4bff8bbc5]]
Former-commit-id: a13cda88944579fc7e5015de2982163bf85c33c6 [formerly 03039f66a1]
Former-commit-id: 1bb54b82df
|
2012-04-18 10:49:15 -05:00 |
|
Nate Jensen
|
79d81e92e4
|
Issue #427 fix non-collaboration sessions
Change-Id: I5f39311d65c16a097692a76e087598d577fe7a4b
Former-commit-id: 8625a90436 [formerly 58633e1f18] [formerly b8cec96f21] [formerly 8625a90436 [formerly 58633e1f18] [formerly b8cec96f21] [formerly fa0f61a85e [formerly b8cec96f21 [formerly 607ec4474b96f9670c53ba69295fa66a2880ff7e]]]]
Former-commit-id: fa0f61a85e
Former-commit-id: 347cf62f56 [formerly 504f0768f0] [formerly 4e92eef5bdc3650a2b4727cb75c5997f41d09866 [formerly 9f055f8ec9]]
Former-commit-id: 96caf7d2303813696cf66f24913a22ca10bac6b5 [formerly 6be9c44303]
Former-commit-id: a21876d150
|
2012-04-18 09:49:38 -05:00 |
|
Nate Jensen
|
fff330e866
|
Issue #427 cleanup and fix errors
Change-Id: I4d949cf2e5a874793df875de8eed9b296801e32c
Former-commit-id: 2daf829da1 [formerly 82906d1200] [formerly ee90af8052] [formerly 2daf829da1 [formerly 82906d1200] [formerly ee90af8052] [formerly 6b0d3a958c [formerly ee90af8052 [formerly ae78675364b412d2b06da0819e87618b8c9ab6a8]]]]
Former-commit-id: 6b0d3a958c
Former-commit-id: 4c83cb567c [formerly 5aeccb9ed5] [formerly 80b0af7b683700c0174333695c2e49c7398a7663 [formerly e6bce354e8]]
Former-commit-id: d671c01bc53e8c460e9f0514b21c19855f4812ae [formerly 81370cd7c9]
Former-commit-id: 25f299e811
|
2012-04-17 18:05:24 -05:00 |
|