Max Schenkelberg
|
985ee5a034
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01]
Former-commit-id: 2db836b296
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
fe7ac96625
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
43f936900c
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]
Former-commit-id: 9c9e01dbda
|
2012-05-09 13:14:00 -05:00 |
|
Nate Jensen
|
bc232148ec
|
Issue #440 add listeners before connecting and fix populateGroups()
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94
Former-commit-id: 617a1185a3 [formerly 4152290029] [formerly f59d388be1] [formerly cb3527bca8 [formerly f59d388be1 [formerly ea146f69c6fca818589587d37aace2afc75e7147]]]
Former-commit-id: cb3527bca8
Former-commit-id: fb05ec405f13f5fa593966daeeff87398f68990a [formerly 41ec3f0606]
Former-commit-id: a5806f837b
|
2012-05-08 17:55:22 -05:00 |
|
Matt Nash
|
7b62b89d1e
|
Issue #440 fix spooky mistake of plugin customization file
Former-commit-id: 6878586deb [formerly e2388a1cdb] [formerly 32552c7aca] [formerly a32f40ce0a [formerly 32552c7aca [formerly 24f52653518c0f0430ba13aea98b6b6d6ef1f494]]]
Former-commit-id: a32f40ce0a
Former-commit-id: 23444601f4e3869b306daa1e156008766b1c792a [formerly 24d60a6d2e]
Former-commit-id: 198ab99bb2
|
2012-05-08 16:11:43 -05:00 |
|
Nate Jensen
|
66845b067d
|
Issue #440 fix duplicate groups
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae
Former-commit-id: 38576af210 [formerly f4be87da62] [formerly 5b0f431131] [formerly 51971ac305 [formerly 5b0f431131 [formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]]]
Former-commit-id: 51971ac305
Former-commit-id: 9cb3ec68606a5110907ad0fe4ee1d2fcdd53423e [formerly 4a1d2d906e]
Former-commit-id: cda9247d09
|
2012-05-08 15:55:06 -05:00 |
|
Nate Jensen
|
fddb2b1a47
|
Issue #440 fix errors
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b
Former-commit-id: a354c92edd [formerly 880604feed] [formerly ccccaf2d28] [formerly 6c057c9d7a [formerly ccccaf2d28 [formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]]]
Former-commit-id: 6c057c9d7a
Former-commit-id: bae21a022d30e8d755163549841930bd7ba18c2d [formerly 13d56f04f0]
Former-commit-id: a7fb88f5bf
|
2012-05-08 14:37:24 -05:00 |
|
Matt Nash
|
3989c8702f
|
Issue #440 remove duplicate roster/presence classes
Former-commit-id: 9de9df2336 [formerly 8ab1597db7] [formerly 01dc5ddbb3] [formerly f91d457e5d [formerly 01dc5ddbb3 [formerly cc3031e4d2142f79d935e441ed0bed9824b54251]]]
Former-commit-id: f91d457e5d
Former-commit-id: a6365585b90c465fb7ff92344a15d101f17ca6e3 [formerly 76e037485f]
Former-commit-id: b06f5e43dd
|
2012-05-08 12:57:12 -05:00 |
|
Matt Nash
|
8449535d28
|
Issue #440 Login dialog off the UI thread
Former-commit-id: afe837e8eb [formerly ca4c0788f1] [formerly 1b12a27631] [formerly 3f53ab4a89 [formerly 1b12a27631 [formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]]]
Former-commit-id: 3f53ab4a89
Former-commit-id: 8d60eab75cde7aa90162befc251b4fa7fa7185b9 [formerly 408263e5a7]
Former-commit-id: 61b1fe7314
|
2012-05-08 10:58:16 -05:00 |
|
Max Schenkelberg
|
7768702058
|
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 3d15400eb7 [formerly af162bedf5 [formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]]]
Former-commit-id: 3d15400eb7
Former-commit-id: 63d9bc13201c8722c88b4447310a4c626184a6f5 [formerly 846ae30be9]
Former-commit-id: abb74d20fe
|
2012-05-03 15:54:22 -05:00 |
|
Max Schenkelberg
|
5056e1689b
|
Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: 120415f663 [formerly 0f6240eaea] [formerly d4c10e5548] [formerly c81c225a6e [formerly d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]
Former-commit-id: c81c225a6e
Former-commit-id: 26da60b90fed75fefa7c7b072d9e37d5dceb286f [formerly c6edfad263]
Former-commit-id: 726c543266
|
2012-05-03 13:07:43 -05:00 |
|
Max Schenkelberg
|
b26422d08c
|
Issue #584 Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: a0d7197b99 [formerly eb948b3dc1] [formerly 65f8b18194] [formerly 5d9da5e1ef [formerly 65f8b18194 [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]]
Former-commit-id: 5d9da5e1ef
Former-commit-id: 76a293686c0c992159fda79ea854e7016c01cacf [formerly 01ae8134b2]
Former-commit-id: 06871710c3
|
2012-05-02 16:40:55 -05:00 |
|
Matt Nash
|
208d22623b
|
Issue #429 add capability for session leader to change other's colors
Former-commit-id: 6a8c6594ea [formerly dee26f4fd5] [formerly 817bd297c8] [formerly c746441432 [formerly 817bd297c8 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]]
Former-commit-id: c746441432
Former-commit-id: 8eccfce550c24254f53426cefffc6a489b93c2ce [formerly df25bbf079]
Former-commit-id: f62991f7b2
|
2012-05-02 14:36:58 -05:00 |
|
Matt Nash
|
4c6451f056
|
Issue #437 fix change status, remove double posting
Former-commit-id: 378772408e [formerly 8bb1342bfb] [formerly e9f75e7f50] [formerly 3c8143e8bc [formerly e9f75e7f50 [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]]
Former-commit-id: 3c8143e8bc
Former-commit-id: 9f37b3ecfdd9ed5688155a30e80979ee332e5a38 [formerly 1e4d656cf9]
Former-commit-id: bdd71c5347
|
2012-05-02 14:36:58 -05:00 |
|
Max Schenkelberg
|
a77524a3c5
|
Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: 918a417e51 [formerly 3ffb18b767] [formerly 55a6bc645e8d5d103bb03592344ed2c36a3e9468 [formerly a045f6f3b9]] [formerly b82eb49055 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]
Former-commit-id: b82eb49055
Former-commit-id: 57f260c947b3fc3c2e2883f06031b6787b085456 [formerly 6a1b035c2d]
Former-commit-id: 887177aa84
|
2012-05-02 10:20:20 -05:00 |
|
Matt Nash
|
7a5ef764f7
|
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 d1f23b8dee [formerly 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]]
Former-commit-id: d1f23b8dee
Former-commit-id: 24d74e2fdbc4cf9b4faedcf06aaa5b35ecd3d8d0 [formerly b0beab3044]
Former-commit-id: 3dbdc7246f
|
2012-05-02 09:42:50 -05:00 |
|
Max Schenkelberg
|
66a1338a59
|
Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: 9d9e5bb8b7 [formerly 69cb2ff5ee] [formerly adabe413f6] [formerly 0326936e85 [formerly adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]]
Former-commit-id: 0326936e85
Former-commit-id: ccae8d70f6e4cbd9c0d75dc71e716ed0c4104489 [formerly a608dcb59b]
Former-commit-id: edf13162a6
|
2012-05-02 09:25:44 -05:00 |
|
Max Schenkelberg
|
c5b45b0265
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]
Former-commit-id: 338f80fa87
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
3992b18e28
|
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 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
40aa780b3d
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
|
2012-05-01 18:06:13 -05:00 |
|
Nate Jensen
|
eb89648334
|
Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: dd1cb83f03 [formerly 8bed608bc5] [formerly 9a992aab78] [formerly 0b6b92c9ff [formerly 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]]
Former-commit-id: 0b6b92c9ff
Former-commit-id: 57dc35d7b3200d377fbe132557e432bf08e6a4f8 [formerly e89143161c]
Former-commit-id: 8c88416642
|
2012-05-01 17:33:55 -05:00 |
|
Matt Nash
|
af638d02e0
|
Issue #448 clean up group code
Former-commit-id: 543c9ae9cb [formerly 9ca693dd1e] [formerly ae7b40634e] [formerly 8791b7329a [formerly ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]]]
Former-commit-id: 8791b7329a
Former-commit-id: 535d306b6d2225a943f13598dc3863c24ec1486f [formerly 5d3c2686cd]
Former-commit-id: e2260c94a7
|
2012-05-01 16:14:33 -05:00 |
|
Max Schenkelberg
|
bed4dc9522
|
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 4b8f81dbcb [formerly edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]]
Former-commit-id: 4b8f81dbcb
Former-commit-id: 685cf1c6847c76bee5059129d41c7b3beecf8b24 [formerly 0b5623654a]
Former-commit-id: 55ecffce8b
|
2012-05-01 15:51:15 -05:00 |
|
Matt Nash
|
2a38c6222d
|
Issue #448 fix icons
Former-commit-id: c3b72c3873 [formerly 7b96d1e9bc] [formerly fd515ad766] [formerly 9764210b93 [formerly fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]]
Former-commit-id: 9764210b93
Former-commit-id: 410584a46ea01b45ddc16b1807f81978115b9068 [formerly 529444c746]
Former-commit-id: cd36f4cd8a
|
2012-05-01 15:07:46 -05:00 |
|
Matt Nash
|
0786b47f2d
|
Issue #448 problem where the file is not there and null is returned
Former-commit-id: 356ab7b820 [formerly 27ea55dad3] [formerly cef6bd81a8] [formerly 1872503cd8 [formerly cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]]
Former-commit-id: 1872503cd8
Former-commit-id: f7ee48cfe756484bc1c1554d823c0ace7f6b8905 [formerly 7a89fa8342]
Former-commit-id: 72a6207eb7
|
2012-05-01 11:55:12 -05:00 |
|
Matt Nash
|
6944cd202d
|
Issue #448 aliasing works on tabs and such now too
Former-commit-id: 2966485e68 [formerly 8a0f32b639] [formerly 88b20d568e] [formerly 4a0b1e36ca [formerly 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]]
Former-commit-id: 4a0b1e36ca
Former-commit-id: 1696cd103d9cda276a8531c4f38d12adfb70ec83 [formerly f121499f7a]
Former-commit-id: b7a2b627f6
|
2012-05-01 10:28:20 -05:00 |
|
Matt Nash
|
7c935c51ab
|
Issue #448 further aliasing
Former-commit-id: cb79489dcd [formerly 9c6768f254] [formerly 603b114ae7] [formerly efd6485647 [formerly 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]]
Former-commit-id: efd6485647
Former-commit-id: 93d8c9b52ab8f8845146412f77caa7c4737791a8 [formerly b797bf94b9]
Former-commit-id: 77e0495f50
|
2012-04-30 17:28:01 -05:00 |
|
Matt Nash
|
2f37ddf632
|
Issue #448 aliasing for group view
Former-commit-id: c270c99caa [formerly 8ae54b2e0c] [formerly cb6aa40f42] [formerly 49bda84329 [formerly cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]]
Former-commit-id: 49bda84329
Former-commit-id: 3ad31f8dfb2b731bf4b7c221eb9efa19f639cc4e [formerly 77e3b905b0]
Former-commit-id: f7f9e9fee7
|
2012-04-30 16:45:35 -05:00 |
|
Nate Jensen
|
326f7b8197
|
Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: 4fc32a8178 [formerly c958d3a471] [formerly 6a034283b5] [formerly eac55b7587 [formerly 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]]
Former-commit-id: eac55b7587
Former-commit-id: c85a6928e18e8149f4d53c868d1e99c25d96cb2d [formerly fafdf1de48]
Former-commit-id: d91295cf0a
|
2012-04-30 15:49:44 -05:00 |
|
Nate Jensen
|
7c1b7ee98f
|
Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: 2df5c95e6c [formerly 56ae7eab86] [formerly 7aa1e562d8] [formerly bfd45d703f [formerly 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]]]
Former-commit-id: bfd45d703f
Former-commit-id: 83fb7f2bcb2a8555dd49a709baa58d57198620f0 [formerly 9f32676a86]
Former-commit-id: 85067c02b7
|
2012-04-30 15:33:59 -05:00 |
|
Max Schenkelberg
|
ddf8f4cbb9
|
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: b2ee1fc849 [formerly 5e5e362f39] [formerly 9e2cf73f7a] [formerly 60aac07962 [formerly 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]]
Former-commit-id: 60aac07962
Former-commit-id: 6eae10aeb570077e3e808a98a06d092a3a64c545 [formerly 7bfaa9474b]
Former-commit-id: b060788489
|
2012-04-30 15:01:37 -05:00 |
|
Dave Hladky
|
9ae2445f9f
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]
Former-commit-id: a1a3a361dd
|
2012-04-30 13:43:34 -05:00 |
|
Bryan Kowal
|
20ca51800b
|
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 272d67d188297309f23563a85d5010d2e2d9b38a [formerly ed878bc13d]] [formerly 84e3c4704e [formerly ed878bc13d [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]]
Former-commit-id: 84e3c4704e
Former-commit-id: 5fcf69d7e9bef889e37b3001c45ce69988cce28a [formerly a2d1cc317d]
Former-commit-id: b75ff37fd3
|
2012-04-30 12:45:30 -05:00 |
|
Nate Jensen
|
c42763e6af
|
Issue #427 remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: e6d8ea11ba [formerly 6de861e9b5] [formerly d5a3acc97b] [formerly bba6d5e400 [formerly d5a3acc97b [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]]
Former-commit-id: bba6d5e400
Former-commit-id: 77605eece2f1b2d40c2c6e5c3ca69b0be8b0c890 [formerly 2e02578b63]
Former-commit-id: 844946764c
|
2012-04-27 16:22:27 -05:00 |
|
Nate Jensen
|
11acde5199
|
Issue #427 separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: 084967f0fd [formerly d952fe084a] [formerly e8f1c0159c] [formerly 9454cbd1b9 [formerly e8f1c0159c [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]]
Former-commit-id: 9454cbd1b9
Former-commit-id: 5c1f8f7212b1ee91e91f199da04bae0530630539 [formerly 4a85e47ee9]
Former-commit-id: 99e561a26e
|
2012-04-27 16:12:48 -05:00 |
|
Nate Jensen
|
be090ce8f3
|
Issue #427 better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 281f9b3232 [formerly cafa23c9d2] [formerly 855ec5dd4d] [formerly 866acb24b2 [formerly 855ec5dd4d [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]]
Former-commit-id: 866acb24b2
Former-commit-id: f09a041c433c49f244db95e8e48ea63cd51c1a93 [formerly cc61a7a62f]
Former-commit-id: 19dfa62f58
|
2012-04-27 14:47:27 -05:00 |
|
Matt Nash
|
1f3088a776
|
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: 1749033fdd [formerly 0a3a7bfba2] [formerly cc313ebcac] [formerly 00d11cdeaa [formerly cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]]
Former-commit-id: 00d11cdeaa
Former-commit-id: b731ef00aa8afa7e0eff5fbdcbe011b4ee37d716 [formerly af819b2e0d]
Former-commit-id: aea9b34499
|
2012-04-27 14:34:55 -05:00 |
|
David Gillingham
|
576e994c04
|
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 2c9c0b316aaf92bc0ffe380d32f526e9d027ef82 [formerly 4aadd41fde]] [formerly 9878793618 [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]]
Former-commit-id: 9878793618
Former-commit-id: 2346b8754f4ea785e03af9338a964fe9ccdfe0d2 [formerly a1a62aa8f1]
Former-commit-id: 8c4eda7ae7
|
2012-04-27 13:26:37 -05:00 |
|
David Gillingham
|
eeb836f5eb
|
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 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]
Former-commit-id: 292374ce21
Former-commit-id: 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]
Former-commit-id: 1107eac65d
|
2012-04-27 12:43:04 -05:00 |
|
Richard Peter
|
51e9a72371
|
Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 231d98b79e [formerly c33a392a8c] [formerly 349adaeedd] [formerly b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]
Former-commit-id: b11df888d3
Former-commit-id: 8e9c6244c73799f26e260982a3f71ee5ca3d5c9a [formerly e3323febc5]
Former-commit-id: ae35c2f27c
|
2012-04-27 12:08:29 -05:00 |
|
Max Schenkelberg
|
c921fd3508
|
Issue #239 Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: f4cd5ebfef [formerly 4175affdc7] [formerly ff0827b51d] [formerly df07bff0bc [formerly ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]]
Former-commit-id: df07bff0bc
Former-commit-id: c0ecddd455d169d50d27cb31f597a127111a78fe [formerly e5e13fc3b3]
Former-commit-id: c0a47ede0d
|
2012-04-27 11:57:53 -05:00 |
|
Matt Nash
|
21ac4d37be
|
Issue #429 add better notification to chat
Former-commit-id: 18e07972ca [formerly 590862b77d] [formerly e0d11ae8b1] [formerly 3b2fdaa579 [formerly e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]]
Former-commit-id: 3b2fdaa579
Former-commit-id: a873337238e14b1e9af1b91cd3bd0b55656415ad [formerly 91035ee253]
Former-commit-id: e94eaf4752
|
2012-04-27 10:10:05 -05:00 |
|
Matt Nash
|
cb2d3b6d30
|
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 16de1dbafe [formerly 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]]
Former-commit-id: 16de1dbafe
Former-commit-id: 7dc402eb1ed2afb56772e897b0da23e2a02c2b07 [formerly 501b74478e]
Former-commit-id: 051b9397f7
|
2012-04-27 10:08:27 -05:00 |
|
Matt Nash
|
4bd03694ca
|
Issue #448 remove listener to help prevent exceptions
Former-commit-id: 1e27e69e3d [formerly 331adad3a3] [formerly 29b39a1df4] [formerly b69e13d795 [formerly 29b39a1df4 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]]
Former-commit-id: b69e13d795
Former-commit-id: d30f0e88e68a8ba3d75d22d5d9b8cb1f7e880924 [formerly fcecab2afb]
Former-commit-id: 8e4072b67d
|
2012-04-26 09:17:27 -05:00 |
|
Max Schenkelberg
|
24fb2b356b
|
Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a31ad22113 [formerly 2cc5794428] [formerly a912786429] [formerly f74b6b4a93 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 8c89c3d5f0f25a3c5cb1d95eb759b2d2e999dff8 [formerly 2d25e8bb78]
Former-commit-id: 7bb4057d32
|
2012-04-25 17:28:52 -05:00 |
|
David Gillingham
|
7bf4680605
|
Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: be0570d2fe [formerly 8592a9a50d] [formerly 526abfd36e] [formerly 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]]
Former-commit-id: 04ab5d619b
Former-commit-id: e77f5dcec02d5b45fb66c367e20ce30bd24262be [formerly 36717c7a3e]
Former-commit-id: cf74c74cc2
|
2012-04-25 17:08:21 -05:00 |
|
Nate Jensen
|
275c1051a4
|
Issue #427 remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: 74a4671d33 [formerly 1ff944fc2d] [formerly ed4303158c] [formerly e17dad1b54 [formerly ed4303158c [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]]
Former-commit-id: e17dad1b54
Former-commit-id: 6af01bc8784fa17f3746211f497d968876849a1a [formerly 0c523369c4]
Former-commit-id: 066638a057
|
2012-04-25 16:56:19 -05:00 |
|
Max Schenkelberg
|
46431fcca8
|
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 28693e6991 [formerly 84b8ffa490 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]]]
Former-commit-id: 28693e6991
Former-commit-id: c635667b1b6b723b474ccefb7fd56708e88cdfaf [formerly e608125f9d]
Former-commit-id: 51d7591203
|
2012-04-25 16:18:41 -05:00 |
|
Matt Nash
|
105bc62fdc
|
Issue #448 slight changes to data provider and session leader indicators
Former-commit-id: 7bedb0a6a8 [formerly 12426aba3b] [formerly 06d71f13ad] [formerly 8f93192385 [formerly 06d71f13ad [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]]]
Former-commit-id: 8f93192385
Former-commit-id: d4b35eca8b3a47b5efe2f70ae0c6365349077322 [formerly f212b1d1ae]
Former-commit-id: a342e09abc
|
2012-04-25 15:07:14 -05:00 |
|
Nate Jensen
|
f7b554ed7e
|
Issue #427 renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c
Former-commit-id: 063244b9d3 [formerly e816529d71] [formerly 069f809596] [formerly b3723bc986 [formerly 069f809596 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]]]
Former-commit-id: b3723bc986
Former-commit-id: 6967419e371a481b7844e27719cc9cc5a4287d92 [formerly a14bccc7ac]
Former-commit-id: a91f47146b
|
2012-04-25 14:41:37 -05:00 |
|