Max Schenkelberg
|
96d727d49d
|
Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286
Former-commit-id: a1436f6b0a [formerly 7814fca6e9] [formerly af162bedf5] [formerly a1436f6b0a [formerly 7814fca6e9] [formerly af162bedf5] [formerly 3d15400eb7 [formerly af162bedf5 [formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]]]]
Former-commit-id: 3d15400eb7
Former-commit-id: 7768702058 [formerly abb74d20fe] [formerly 63d9bc13201c8722c88b4447310a4c626184a6f5 [formerly 846ae30be9]]
Former-commit-id: 363372db31a51a4f84a8c7399f14f2fd676528c8 [formerly d57034bbff]
Former-commit-id: 558cb37f97
|
2012-05-03 15:54:22 -05:00 |
|
Max Schenkelberg
|
c94d7965b5
|
Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: 120415f663 [formerly 0f6240eaea] [formerly d4c10e5548] [formerly 120415f663 [formerly 0f6240eaea] [formerly d4c10e5548] [formerly c81c225a6e [formerly d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]]
Former-commit-id: c81c225a6e
Former-commit-id: 5056e1689b [formerly 726c543266] [formerly 26da60b90fed75fefa7c7b072d9e37d5dceb286f [formerly c6edfad263]]
Former-commit-id: 17e817f125710b8e9fd9aa72d95c5754ccb32543 [formerly 1189dba8a7]
Former-commit-id: 42c569430b
|
2012-05-03 13:07:43 -05:00 |
|
Max Schenkelberg
|
ca3ecdc5ef
|
Issue #584 Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: a0d7197b99 [formerly eb948b3dc1] [formerly 65f8b18194] [formerly a0d7197b99 [formerly eb948b3dc1] [formerly 65f8b18194] [formerly 5d9da5e1ef [formerly 65f8b18194 [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]]]
Former-commit-id: 5d9da5e1ef
Former-commit-id: b26422d08c [formerly 06871710c3] [formerly 76a293686c0c992159fda79ea854e7016c01cacf [formerly 01ae8134b2]]
Former-commit-id: a99bdf5f9f646e0f6a41aafd0cdfe218c9e774ba [formerly a3baaa9ae8]
Former-commit-id: 78925afe73
|
2012-05-02 16:40:55 -05:00 |
|
Matt Nash
|
03be3d829c
|
Issue #429 add capability for session leader to change other's colors
Former-commit-id: 6a8c6594ea [formerly dee26f4fd5] [formerly 817bd297c8] [formerly 6a8c6594ea [formerly dee26f4fd5] [formerly 817bd297c8] [formerly c746441432 [formerly 817bd297c8 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]]]
Former-commit-id: c746441432
Former-commit-id: 208d22623b [formerly f62991f7b2] [formerly 8eccfce550c24254f53426cefffc6a489b93c2ce [formerly df25bbf079]]
Former-commit-id: ffc559da8a503d8b8d3200e4768df07750dcab3f [formerly 5aecb3340e]
Former-commit-id: 6f5a90b259
|
2012-05-02 14:36:58 -05:00 |
|
Matt Nash
|
e3c8219136
|
Issue #437 fix change status, remove double posting
Former-commit-id: 378772408e [formerly 8bb1342bfb] [formerly e9f75e7f50] [formerly 378772408e [formerly 8bb1342bfb] [formerly e9f75e7f50] [formerly 3c8143e8bc [formerly e9f75e7f50 [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]]]
Former-commit-id: 3c8143e8bc
Former-commit-id: 4c6451f056 [formerly bdd71c5347] [formerly 9f37b3ecfdd9ed5688155a30e80979ee332e5a38 [formerly 1e4d656cf9]]
Former-commit-id: 91dcbb364319b63cd86a0c674070b24a924e890d [formerly 2da26e7ed5]
Former-commit-id: 9100e0e372
|
2012-05-02 14:36:58 -05:00 |
|
Max Schenkelberg
|
0a5e7d6a0a
|
Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: 918a417e51 [formerly 3ffb18b767] [formerly a045f6f3b9] [formerly 918a417e51 [formerly 3ffb18b767] [formerly a045f6f3b9] [formerly b82eb49055 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]]
Former-commit-id: b82eb49055
Former-commit-id: a77524a3c5 [formerly 887177aa84] [formerly 57f260c947b3fc3c2e2883f06031b6787b085456 [formerly 6a1b035c2d]]
Former-commit-id: 791d1c7e80ed49ab6bdd71028cc768d0a89c5b65 [formerly f4bd13133e]
Former-commit-id: e9e4327ec9
|
2012-05-02 10:20:20 -05:00 |
|
Matt Nash
|
50cae42293
|
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: ff25949b49 [formerly e1213ccea9] [formerly 167767dcbc] [formerly ff25949b49 [formerly e1213ccea9] [formerly 167767dcbc] [formerly d1f23b8dee [formerly 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]]]
Former-commit-id: d1f23b8dee
Former-commit-id: 7a5ef764f7 [formerly 3dbdc7246f] [formerly 24d74e2fdbc4cf9b4faedcf06aaa5b35ecd3d8d0 [formerly b0beab3044]]
Former-commit-id: 8204aa3555a8d919dcc3f2f324663e38502735bf [formerly 49fa359d9a]
Former-commit-id: 75ace5ee68
|
2012-05-02 09:42:50 -05:00 |
|
Max Schenkelberg
|
590641ad79
|
Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: 9d9e5bb8b7 [formerly 69cb2ff5ee] [formerly adabe413f6] [formerly 9d9e5bb8b7 [formerly 69cb2ff5ee] [formerly adabe413f6] [formerly 0326936e85 [formerly adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]]]
Former-commit-id: 0326936e85
Former-commit-id: 66a1338a59 [formerly edf13162a6] [formerly ccae8d70f6e4cbd9c0d75dc71e716ed0c4104489 [formerly a608dcb59b]]
Former-commit-id: 2b46319a4eb8d835dccb63170353fbfccacfeea3 [formerly 11cf1f3a23]
Former-commit-id: 6340cddacc
|
2012-05-02 09:25:44 -05:00 |
|
Max Schenkelberg
|
50caaa47a4
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]]
Former-commit-id: e3d6962fe6
Former-commit-id: c5b45b0265 [formerly 338f80fa87] [formerly b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]]
Former-commit-id: 9ffb2ad0cd59863353c63a130f22384e8bd16572 [formerly 9f72069996]
Former-commit-id: 4ddcccc3c7
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
3419f72215
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0
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
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35]
Former-commit-id: 491aa53a0c
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Nate Jensen
|
f63e9e2093
|
Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: dd1cb83f03 [formerly 8bed608bc5] [formerly 9a992aab78] [formerly dd1cb83f03 [formerly 8bed608bc5] [formerly 9a992aab78] [formerly 0b6b92c9ff [formerly 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]]]
Former-commit-id: 0b6b92c9ff
Former-commit-id: eb89648334 [formerly 8c88416642] [formerly 57dc35d7b3200d377fbe132557e432bf08e6a4f8 [formerly e89143161c]]
Former-commit-id: f3a5ec4c9b25ea93adf9ce6e85feb63e24e3562a [formerly 6bcab11947]
Former-commit-id: 069394a973
|
2012-05-01 17:33:55 -05:00 |
|
Matt Nash
|
4363f319cf
|
Issue #448 clean up group code
Former-commit-id: 543c9ae9cb [formerly 9ca693dd1e] [formerly ae7b40634e] [formerly 543c9ae9cb [formerly 9ca693dd1e] [formerly ae7b40634e] [formerly 8791b7329a [formerly ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]]]]
Former-commit-id: 8791b7329a
Former-commit-id: af638d02e0 [formerly e2260c94a7] [formerly 535d306b6d2225a943f13598dc3863c24ec1486f [formerly 5d3c2686cd]]
Former-commit-id: 28916c8547cd848ce86dd7d967a3df84a5104363 [formerly f99b59b0fd]
Former-commit-id: fcb1eac45b
|
2012-05-01 16:14:33 -05:00 |
|
Max Schenkelberg
|
670b81f310
|
Issue #239 Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: caa38ef109 [formerly c72650baef] [formerly edacf7a4b3] [formerly caa38ef109 [formerly c72650baef] [formerly edacf7a4b3] [formerly 4b8f81dbcb [formerly edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]]]
Former-commit-id: 4b8f81dbcb
Former-commit-id: bed4dc9522 [formerly 55ecffce8b] [formerly 685cf1c6847c76bee5059129d41c7b3beecf8b24 [formerly 0b5623654a]]
Former-commit-id: 2e5da25c9053ad35f363a170901e003840b3cc2f [formerly 37077c6b3e]
Former-commit-id: 59ffa4cbed
|
2012-05-01 15:51:15 -05:00 |
|
Matt Nash
|
47a65c2f1e
|
Issue #448 fix icons
Former-commit-id: c3b72c3873 [formerly 7b96d1e9bc] [formerly fd515ad766] [formerly c3b72c3873 [formerly 7b96d1e9bc] [formerly fd515ad766] [formerly 9764210b93 [formerly fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]]]
Former-commit-id: 9764210b93
Former-commit-id: 2a38c6222d [formerly cd36f4cd8a] [formerly 410584a46ea01b45ddc16b1807f81978115b9068 [formerly 529444c746]]
Former-commit-id: d0af18fbbce1df30a4bbd343ed5db8ab1315d931 [formerly a55f4c6402]
Former-commit-id: d9787cab1c
|
2012-05-01 15:07:46 -05:00 |
|
Matt Nash
|
443d4772b7
|
Issue #448 problem where the file is not there and null is returned
Former-commit-id: 356ab7b820 [formerly 27ea55dad3] [formerly cef6bd81a8] [formerly 356ab7b820 [formerly 27ea55dad3] [formerly cef6bd81a8] [formerly 1872503cd8 [formerly cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]]]
Former-commit-id: 1872503cd8
Former-commit-id: 0786b47f2d [formerly 72a6207eb7] [formerly f7ee48cfe756484bc1c1554d823c0ace7f6b8905 [formerly 7a89fa8342]]
Former-commit-id: ca62111e6a117efbb897cb2817484a1d65b77f12 [formerly e39edb5776]
Former-commit-id: 0b42e393c9
|
2012-05-01 11:55:12 -05:00 |
|
Matt Nash
|
6aafe52036
|
Issue #448 aliasing works on tabs and such now too
Former-commit-id: 2966485e68 [formerly 8a0f32b639] [formerly 88b20d568e] [formerly 2966485e68 [formerly 8a0f32b639] [formerly 88b20d568e] [formerly 4a0b1e36ca [formerly 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]]]
Former-commit-id: 4a0b1e36ca
Former-commit-id: 6944cd202d [formerly b7a2b627f6] [formerly 1696cd103d9cda276a8531c4f38d12adfb70ec83 [formerly f121499f7a]]
Former-commit-id: b9a90bcfac4aec4f0a1ec3695d7db1cfa1554c2f [formerly a601af019e]
Former-commit-id: 2b31a87bc2
|
2012-05-01 10:28:20 -05:00 |
|
Matt Nash
|
fbf130b939
|
Issue #448 further aliasing
Former-commit-id: cb79489dcd [formerly 9c6768f254] [formerly 603b114ae7] [formerly cb79489dcd [formerly 9c6768f254] [formerly 603b114ae7] [formerly efd6485647 [formerly 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]]]
Former-commit-id: efd6485647
Former-commit-id: 7c935c51ab [formerly 77e0495f50] [formerly 93d8c9b52ab8f8845146412f77caa7c4737791a8 [formerly b797bf94b9]]
Former-commit-id: acfa1e7900a98ee9dea71507487e24fbf639e9b5 [formerly 7ce6186e51]
Former-commit-id: f9848ce8bf
|
2012-04-30 17:28:01 -05:00 |
|
Matt Nash
|
c18ffbd169
|
Issue #448 aliasing for group view
Former-commit-id: c270c99caa [formerly 8ae54b2e0c] [formerly cb6aa40f42] [formerly c270c99caa [formerly 8ae54b2e0c] [formerly cb6aa40f42] [formerly 49bda84329 [formerly cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]]]
Former-commit-id: 49bda84329
Former-commit-id: 2f37ddf632 [formerly f7f9e9fee7] [formerly 3ad31f8dfb2b731bf4b7c221eb9efa19f639cc4e [formerly 77e3b905b0]]
Former-commit-id: 5cd6297f080b741a11bb4e8c420aee67f1890f4d [formerly 278729c19d]
Former-commit-id: d843a72dd6
|
2012-04-30 16:45:35 -05:00 |
|
Nate Jensen
|
062a5f2972
|
Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: 4fc32a8178 [formerly c958d3a471] [formerly 6a034283b5] [formerly 4fc32a8178 [formerly c958d3a471] [formerly 6a034283b5] [formerly eac55b7587 [formerly 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]]]
Former-commit-id: eac55b7587
Former-commit-id: 326f7b8197 [formerly d91295cf0a] [formerly c85a6928e18e8149f4d53c868d1e99c25d96cb2d [formerly fafdf1de48]]
Former-commit-id: 0797189ade7b60c678275577e32b7480d3cf2a23 [formerly 226437c8a0]
Former-commit-id: 9952659521
|
2012-04-30 15:49:44 -05:00 |
|
Nate Jensen
|
4816fc4082
|
Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: 2df5c95e6c [formerly 56ae7eab86] [formerly 7aa1e562d8] [formerly 2df5c95e6c [formerly 56ae7eab86] [formerly 7aa1e562d8] [formerly bfd45d703f [formerly 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]]]]
Former-commit-id: bfd45d703f
Former-commit-id: 7c1b7ee98f [formerly 85067c02b7] [formerly 83fb7f2bcb2a8555dd49a709baa58d57198620f0 [formerly 9f32676a86]]
Former-commit-id: 1679dd174ae7e18d7b3237ba80004ec1737b7c5c [formerly a844d4f24d]
Former-commit-id: 97d6aa8701
|
2012-04-30 15:33:59 -05:00 |
|
Max Schenkelberg
|
f6d0103e92
|
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: b2ee1fc849 [formerly 5e5e362f39] [formerly 9e2cf73f7a] [formerly b2ee1fc849 [formerly 5e5e362f39] [formerly 9e2cf73f7a] [formerly 60aac07962 [formerly 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]]]
Former-commit-id: 60aac07962
Former-commit-id: ddf8f4cbb9 [formerly b060788489] [formerly 6eae10aeb570077e3e808a98a06d092a3a64c545 [formerly 7bfaa9474b]]
Former-commit-id: 7deac05508f12d4c05a6bd923f8835da4548cfbb [formerly 37d9d12838]
Former-commit-id: e95bc35d1a
|
2012-04-30 15:01:37 -05:00 |
|
Dave Hladky
|
8f500ff6d6
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]]
Former-commit-id: 5b7ecea866
Former-commit-id: 9ae2445f9f [formerly a1a3a361dd] [formerly d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]]
Former-commit-id: 07953e4b449645e4adcfef80f1595ec0513eb00f [formerly d2e16d486b]
Former-commit-id: 7fc0c65ef4
|
2012-04-30 13:43:34 -05:00 |
|
Bryan Kowal
|
b500c9d2a8
|
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
Former-commit-id: e1b95c6c29 [formerly ed83cb8a52] [formerly ed878bc13d] [formerly e1b95c6c29 [formerly ed83cb8a52] [formerly ed878bc13d] [formerly 84e3c4704e [formerly ed878bc13d [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]]]
Former-commit-id: 84e3c4704e
Former-commit-id: 20ca51800b [formerly b75ff37fd3] [formerly 5fcf69d7e9bef889e37b3001c45ce69988cce28a [formerly a2d1cc317d]]
Former-commit-id: 3eb3c018344ae627270f7bc1e6d3039a72987054 [formerly 4fcc1870b4]
Former-commit-id: 354eda8407
|
2012-04-30 12:45:30 -05:00 |
|
Nate Jensen
|
d558104eae
|
Issue #427 remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: e6d8ea11ba [formerly 6de861e9b5] [formerly d5a3acc97b] [formerly e6d8ea11ba [formerly 6de861e9b5] [formerly d5a3acc97b] [formerly bba6d5e400 [formerly d5a3acc97b [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]]]
Former-commit-id: bba6d5e400
Former-commit-id: c42763e6af [formerly 844946764c] [formerly 77605eece2f1b2d40c2c6e5c3ca69b0be8b0c890 [formerly 2e02578b63]]
Former-commit-id: d28a1371f58de07e898161724ce9f14017377614 [formerly a20cf866e5]
Former-commit-id: 946adcfb0c
|
2012-04-27 16:22:27 -05:00 |
|
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 |
|