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
|
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 |
|
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 |
|
Matt Nash
|
c66ed279e9
|
Issue #448 first pass at alias
Former-commit-id: 0611debf5e [formerly b480ccd3fe] [formerly 7d870434f6] [formerly b20b9530fd [formerly 7d870434f6 [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]]]
Former-commit-id: b20b9530fd
Former-commit-id: 11cd1f97f2e785640e47fe2d025064a952dbdce5 [formerly f3467023a2]
Former-commit-id: e6bd4420ab
|
2012-04-25 14:25:52 -05:00 |
|
Matt Nash
|
7f937defa6
|
Issue #429 color final fixes
Former-commit-id: e4c9c05f36 [formerly 03174d8f66] [formerly 9bc3f0c75d] [formerly 506d3e8989 [formerly 9bc3f0c75d [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]]
Former-commit-id: 506d3e8989
Former-commit-id: 384db86ace751f723858b3f30df6625402b0fe89 [formerly 76e8b2e192]
Former-commit-id: 4ff28dd769
|
2012-04-25 14:22:12 -05:00 |
|
Max Schenkelberg
|
a803ce2f65
|
#Issue 239 Got bulk event sending and only sending events when previous frame changes.
Former-commit-id: d68aa3b431 [formerly 4c3afb8f7c] [formerly 001c52bd3a] [formerly 9607d3dd41 [formerly 001c52bd3a [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]]]
Former-commit-id: 9607d3dd41
Former-commit-id: 6635b1d7b4e231530e2d9e45bccf98b0b2eb45de [formerly 9d8dbba20b]
Former-commit-id: cb4c445a05
|
2012-04-25 11:27:19 -05:00 |
|
Matt Nash
|
9919309edd
|
Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: b92b22e13a [formerly abbe0c3d6b] [formerly d84865ced9] [formerly 09fc05162c [formerly d84865ced9 [formerly 46a327c929a09c21270f7b6de543e8d742476003]]]
Former-commit-id: 09fc05162c
Former-commit-id: 412fa827f65caf8f8e25db782870223e820ba13e [formerly 563e76c313]
Former-commit-id: 5fa80650b3
|
2012-04-25 07:39:05 -05:00 |
|
Matt Nash
|
979c935a32
|
Issue #429 colors for collaboration session
Former-commit-id: 9a8693fda1 [formerly 190a951b26] [formerly 63dccd6b85] [formerly bc1e35f4b4 [formerly 63dccd6b85 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]]
Former-commit-id: bc1e35f4b4
Former-commit-id: 07f08f4f7dfba60140f2e2a11bd69e2e0819758f [formerly d79ae59e19]
Former-commit-id: 75a76124f8
|
2012-04-24 16:39:28 -05:00 |
|
Steve Harris
|
caab7c1fbb
|
12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]
Former-commit-id: 97caaa0327
|
2012-04-24 15:38:29 -05:00 |
|
Nate Jensen
|
2ed24e3263
|
Issue #427 minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca
Former-commit-id: a8c7d99d18 [formerly 652c2a5411] [formerly fd1f337a92] [formerly bcc435ac28 [formerly fd1f337a92 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]]]
Former-commit-id: bcc435ac28
Former-commit-id: 82bac21b28bc028e941b0fb79fcf6f94cb0c42e3 [formerly 7c727f5a0e]
Former-commit-id: aec56b4df0
|
2012-04-24 15:28:36 -05:00 |
|
Steve Harris
|
55b2a4df32
|
12.4.1-7 baseline
Former-commit-id: 98c92073b5 [formerly 6d585942fe] [formerly 90ae4bbb36] [formerly cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]]
Former-commit-id: cca73b3c62
Former-commit-id: e1236b435e1110728cc2c913cb89b44372ea9903 [formerly d9f966008c]
Former-commit-id: 4c88c0ae6c
|
2012-04-24 15:24:39 -05:00 |
|
Nate Jensen
|
dec0aa083e
|
Issue #427 login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c
Former-commit-id: 45bf1150e6 [formerly a2a6d2d61d] [formerly c4afe61f01] [formerly bf3eb689cc [formerly c4afe61f01 [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]]
Former-commit-id: bf3eb689cc
Former-commit-id: 30e85a51e1de9957abf9bcf2eb32a466239af984 [formerly 0a7a5d44ff]
Former-commit-id: 4d81850de4
|
2012-04-24 14:11:27 -05:00 |
|
Max Schenkelberg
|
0b1e9de1a3
|
Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: a2d730a537 [formerly 34f80169fe] [formerly f4193b0e4e] [formerly 32ade1a1f7 [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]]
Former-commit-id: 32ade1a1f7
Former-commit-id: d99b1b8e424819aa687ea38c079bbd2a3d08bf34 [formerly 1ddbb3ef60]
Former-commit-id: 2248b6ba00
|
2012-04-24 13:44:16 -05:00 |
|
Matt Nash
|
f01ac5b787
|
Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: 9c5efdfd26 [formerly b7b1429f2c] [formerly 0241e8857f] [formerly fa360c90cf [formerly 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]]
Former-commit-id: fa360c90cf
Former-commit-id: 11b02280ce4c3db8d863cdc64e4e24dc47a6d28f [formerly b428da939c]
Former-commit-id: 27855328d0
|
2012-04-24 12:20:55 -05:00 |
|
Nate Jensen
|
49d8f6c799
|
Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 36c4c4e66e [formerly 14f70d1122] [formerly a4b0addeee] [formerly 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 529b68b96d852df4ba7ded4f9d68e14a00cc3e18 [formerly 8130c22b64]
Former-commit-id: 83e6f5acf4
|
2012-04-23 11:23:22 -05:00 |
|
Bryan Kowal
|
4a529bba46
|
Issue #517 - fix the collaboration pde build.
Former-commit-id: 70d956f8ca [formerly 611fc324ea] [formerly 19eb596d88] [formerly d97819a8df [formerly 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]]
Former-commit-id: d97819a8df
Former-commit-id: 7cc285b2ae9bde5764df3230f9a6e94ee3c0312f [formerly de9a48b0c3]
Former-commit-id: dd14feff46
|
2012-04-21 18:17:39 -05:00 |
|
Matt Nash
|
5df26c4d05
|
Issue #429 fixes for colors, needs to refactor user id to make work
Former-commit-id: 31510dae8d [formerly ac53206f1f] [formerly b418af8aa9] [formerly 7f7bd73014 [formerly b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]]
Former-commit-id: 7f7bd73014
Former-commit-id: 58a7b49922dc1994ad90e5f3e4c2c8b7f6fa7bda [formerly 4f3a414d6d]
Former-commit-id: bd87f5c798
|
2012-04-20 15:30:58 -05:00 |
|
Matt Nash
|
825b7531fc
|
Issue #429 color fixes
Former-commit-id: f061b5e11c [formerly 878e798141] [formerly 7116eb79cd] [formerly 1b9c4320fc [formerly 7116eb79cd [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]]]
Former-commit-id: 1b9c4320fc
Former-commit-id: 6a57fc31e6c27f05deaaa2355a047b18eae33bab [formerly 15478a9e21]
Former-commit-id: b84be3fe98
|
2012-04-20 15:30:58 -05:00 |
|
Matt Nash
|
441228a0ab
|
Issue #429 lots of color changes
Former-commit-id: ecddf3fee7 [formerly 7c047a4879] [formerly 064657306f] [formerly fdddff1957 [formerly 064657306f [formerly ac71a592948b71c629f5f535a8d06840b3905c2a]]]
Former-commit-id: fdddff1957
Former-commit-id: 405eeb370c5614701c57fdbafb95d65745ea51dc [formerly fa120a1cd0]
Former-commit-id: f1d694c70a
|
2012-04-20 15:30:57 -05:00 |
|
Matt Nash
|
5142935ba3
|
Issue #429 first round fixes color
Former-commit-id: 71c193409d [formerly 0a81707a7f] [formerly 5f47f98662] [formerly d34e2722b0 [formerly 5f47f98662 [formerly 901770d888a39df452e60d9ac6c5d7e071d6a810]]]
Former-commit-id: d34e2722b0
Former-commit-id: d5463082f48a5fc9672040fd917bfacce67292cd [formerly b5f8783a94]
Former-commit-id: 0675f46988
|
2012-04-20 15:30:57 -05:00 |
|
Max Schenkelberg
|
005381bf33
|
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 da5e17d6e3 [formerly 523c90b697 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]]
Former-commit-id: da5e17d6e3
Former-commit-id: 99493f0a6512f938cc206c6c3028723ee75fa6ad [formerly f05528979d]
Former-commit-id: baf778717f
|
2012-04-19 16:03:07 -05:00 |
|
Nate Jensen
|
4756c0274b
|
Issue #427 fix peer to peer
Change-Id: Iae7f0d4c5f3f28360a957768fa755809fe47c171
Former-commit-id: 565d9e18c4 [formerly 38dcb603b2] [formerly 8da43825d0] [formerly 62c5527e17 [formerly 8da43825d0 [formerly b8ca7f7c0d329c1d7bb527317fc89794ea4dbac0]]]
Former-commit-id: 62c5527e17
Former-commit-id: 4f4c3f804ffc342d500ba13600f4badb63c6d9ce [formerly 7fdc45a275]
Former-commit-id: 26f41aa6ad
|
2012-04-19 15:27:52 -05:00 |
|