Commit graph

5559 commits

Author SHA1 Message Date
Richard Peter
938e39a0fc Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00
Lee Venable
3a133f6626 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: a8ab7f3946 [formerly 573465f316] [formerly a8ab7f3946 [formerly 573465f316] [formerly e054a7ab98 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]
Former-commit-id: e054a7ab98
Former-commit-id: eda26e6076 [formerly 43fdbe9ab6]
Former-commit-id: ede8740acc
2014-04-28 15:24:26 -05:00
Nate Jensen
d2bfcfa53b Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: d145961f4c [formerly 48cab0ae71] [formerly d145961f4c [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 74e77d307a [formerly 11a3ae5054]
Former-commit-id: 195db736e8
2014-04-25 15:05:07 -05:00
Richard Peter
4ac0d62d7c Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: 5a0083987b [formerly 98b35d30c0] [formerly 5a0083987b [formerly 98b35d30c0] [formerly b06172a798 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]
Former-commit-id: b06172a798
Former-commit-id: c7882721b2 [formerly f5f6ff0008]
Former-commit-id: bac20bb9dd
2014-04-25 14:57:51 -05:00
Nate Jensen
8f87fdc431 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: d425f134ae [formerly 4842f08165] [formerly d425f134ae [formerly 4842f08165] [formerly 9a46583271 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]
Former-commit-id: 9a46583271
Former-commit-id: 1d6014f363 [formerly acfc3c2b20]
Former-commit-id: ac0b4dc1f2
2014-04-25 14:57:47 -05:00
Richard Peter
6775b0dce6 Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 1781500740 [formerly 36742a30f3] [formerly 1781500740 [formerly 36742a30f3] [formerly 6918dc0026 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]
Former-commit-id: 6918dc0026
Former-commit-id: 433d5a77f6 [formerly 52e821b5bb]
Former-commit-id: 5a49b7e345
2014-04-25 14:53:22 -05:00
Nate Jensen
3c4a864333 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: 3719815807 [formerly deda54488f] [formerly 3719815807 [formerly deda54488f] [formerly ca2cc7f11d [formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]]]
Former-commit-id: ca2cc7f11d
Former-commit-id: 4b24593f10 [formerly 619af04a23]
Former-commit-id: 83864b0ff0
2014-04-25 14:51:45 -05:00
Richard Peter
3cbb7cb196 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: 5fb2aef966 [formerly de249decab] [formerly 5fb2aef966 [formerly de249decab] [formerly 1cc7977b99 [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]
Former-commit-id: 1cc7977b99
Former-commit-id: 3f66895529 [formerly 7e3d3f3093]
Former-commit-id: 92c2f7fa50
2014-04-25 14:42:53 -05:00
Nate Jensen
4b6db92b9f Issue #2972 fix thin client startup
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4

Former-commit-id: 7811040f3e [formerly d47a09530a] [formerly 7811040f3e [formerly d47a09530a] [formerly 86e9502341 [formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]
Former-commit-id: 86e9502341
Former-commit-id: c802e6a05c [formerly 27ed7e5dab]
Former-commit-id: ce3c2c1341
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
1bb8ce2cbe Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 9478f8adc9 [formerly 2d96d9d2df] [formerly 9478f8adc9 [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 080c2a48f3 [formerly 7499987f52]
Former-commit-id: 86174019b5
2014-04-25 14:38:36 -05:00
Brian Clements
eb318a9a0d Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 5f746c9c56 [formerly 17ab4f6184] [formerly 5f746c9c56 [formerly 17ab4f6184] [formerly f1213c1bda [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]
Former-commit-id: f1213c1bda
Former-commit-id: ed2d66a6fa [formerly fe6af8c315]
Former-commit-id: edaaa9a426
2014-04-25 13:41:17 -05:00
Nate Jensen
e0f4544f94 Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: 64a09dbdc6 [formerly cf6992073f] [formerly 64a09dbdc6 [formerly cf6992073f] [formerly 0a245df4f1 [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]
Former-commit-id: 0a245df4f1
Former-commit-id: 1e47f6f03a [formerly b67f0a616f]
Former-commit-id: 97d3beb64b
2014-04-25 13:26:10 -05:00
Richard Peter
928de60c87 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 86d1ff9427 [formerly 44701f31f2] [formerly 86d1ff9427 [formerly 44701f31f2] [formerly 5c0f9b5ba5 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: baee58476f [formerly 60684de8b4]
Former-commit-id: 231dbfc1b9
2014-04-25 13:07:59 -05:00
David Gillingham
c6543f3335 Merge "Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE." into development
Former-commit-id: 073a31bacf [formerly 56c6622207] [formerly 073a31bacf [formerly 56c6622207] [formerly f32cf61f22 [formerly e18ad8fe1c14c098e33ef98e3eaeb319bc2d1b1a]]]
Former-commit-id: f32cf61f22
Former-commit-id: 28a1606df8 [formerly 78d5c99d63]
Former-commit-id: cbfa1e767a
2014-04-25 12:24:52 -05:00
Nate Jensen
af6ed8d300 Issue #2060 remove FFG post processor dependency on dataURI, other minor
cleanups

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

Former-commit-id: d9ad750a99 [formerly 7da49c00f5] [formerly d9ad750a99 [formerly 7da49c00f5] [formerly 74b3181107 [formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]]]
Former-commit-id: 74b3181107
Former-commit-id: f6f962691f [formerly d0dfb21b6e]
Former-commit-id: f4b040fe4d
2014-04-25 12:19:23 -05:00
Brian Clements
7baf887f56 Issue #3079 update to lightning name will continue if it encounters invalid xml
Former-commit-id: afdae7c2e1 [formerly 3305aee692] [formerly afdae7c2e1 [formerly 3305aee692] [formerly 98adf15cda [formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]]
Former-commit-id: 98adf15cda
Former-commit-id: 421461fbd8 [formerly 5ca56d292a]
Former-commit-id: 5a868353c4
2014-04-25 11:04:00 -05:00
David Gillingham
83674f8444 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: c14497b1b7 [formerly 2426e463f7] [formerly c14497b1b7 [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 48bc49fd4b [formerly 2e8b8c6e86]
Former-commit-id: c0fd32360d
2014-04-25 10:56:43 -05:00
Brian.Dyke
f31d8cc8cf Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
2014-04-25 11:06:11 -04:00
Richard Peter
15e9fe0da3 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 5b3ffb51b0 [formerly 0b765efce0] [formerly 5b3ffb51b0 [formerly 0b765efce0] [formerly 225d95171c [formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]
Former-commit-id: 225d95171c
Former-commit-id: 7371d8ccdd [formerly 02d1cf94b0]
Former-commit-id: e628067527
2014-04-24 19:15:56 -05:00
Richard Peter
dcd2468bee Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 5b14b22ee1 [formerly 37342cba87] [formerly 5b14b22ee1 [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: 2d1262e41f [formerly caccf6ca52]
Former-commit-id: b234142252
2014-04-24 19:11:50 -05:00
Nate Jensen
ac94c81cd9 Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development
Former-commit-id: 2a86a2652d [formerly 9ea03a1b3b] [formerly 2a86a2652d [formerly 9ea03a1b3b] [formerly 9cea7f88fb [formerly c73204189b318fd3aed128535166f72c99739dba]]]
Former-commit-id: 9cea7f88fb
Former-commit-id: 0cc6a6224d [formerly c86c100079]
Former-commit-id: 79fec75989
2014-04-24 18:20:27 -05:00
Lee Venable
9bbc3844f9 Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
Former-commit-id: 15c9311c97 [formerly a511f8d4e7] [formerly 15c9311c97 [formerly a511f8d4e7] [formerly e7acb04432 [formerly 9762326cea40526042cd7f371d864a96abd63842]]]
Former-commit-id: e7acb04432
Former-commit-id: ae333a34dc [formerly 20d563cd15]
Former-commit-id: 40e1bbc5f1
2014-04-24 17:53:05 -05:00
Lee Venable
70465fb1bd Merge "Issue #3045 Change column label to "Data Set"." into development
Former-commit-id: fd7a86e187 [formerly e45c999d47] [formerly fd7a86e187 [formerly e45c999d47] [formerly 9642dac1f1 [formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]
Former-commit-id: 9642dac1f1
Former-commit-id: 059a2f59b5 [formerly e776e8c3d0]
Former-commit-id: 890891c1b5
2014-04-24 17:42:12 -05:00
Roger Ferrel
0ece281810 Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13

Former-commit-id: 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 555c8cf617 [formerly 0490023b2c]
Former-commit-id: 3d744452af
2014-04-24 16:25:01 -05:00
Brian Clements
670c4e1611 Issue #3070 fixed contact request handling
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with


Former-commit-id: 334ad3ca81 [formerly 02f08d75c6] [formerly 334ad3ca81 [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 84f75ca30a [formerly 12304655e8]
Former-commit-id: c27f2d9e53
2014-04-24 16:10:27 -05:00
Richard Peter
547d2f5333 Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: c0656c811d [formerly b53d914640] [formerly c0656c811d [formerly b53d914640] [formerly a21a2bafe1 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]]
Former-commit-id: a21a2bafe1
Former-commit-id: 608b342707 [formerly d08c051727]
Former-commit-id: d71cbdb5f9
2014-04-24 15:43:15 -05:00
Nate Jensen
bac6b63a2f Issue #2060 remove dependency on grid dataURI column from more of DAT
Change-Id: I9123d2508f359e65124f90dafdfdf5efeaf1241a

Former-commit-id: 91df50ded7 [formerly 6cbd35aa47] [formerly 91df50ded7 [formerly 6cbd35aa47] [formerly e1eaca8071 [formerly e7963b0bcea141f33a00c264b26ae264d00f3abf]]]
Former-commit-id: e1eaca8071
Former-commit-id: 8ecae7aeb5 [formerly 4f41761508]
Former-commit-id: 43d4544229
2014-04-24 15:04:54 -05:00
Roger Ferrel
5fda70501e Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120

Former-commit-id: e2b03eb190 [formerly 9dad4c959b] [formerly e2b03eb190 [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: ef81949dd1 [formerly d73f61c7e7]
Former-commit-id: ca30aa6b8a
2014-04-24 14:48:15 -05:00
Slav Korolev
cd38f3636d Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
Former-commit-id: 150a132320 [formerly 689930c484] [formerly 150a132320 [formerly 689930c484] [formerly f458f75ecf [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]
Former-commit-id: f458f75ecf
Former-commit-id: 27095ecca8 [formerly e78c6edb8c]
Former-commit-id: 1bf6d72572
2014-04-24 15:40:52 -04:00
Brad Gonzales
036fbb9cf7 Issue #3035 Increment java component.spec revision value.
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf

Former-commit-id: 86036c0afb [formerly 15985b9eac] [formerly 86036c0afb [formerly 15985b9eac] [formerly 7a0694adca [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]]]
Former-commit-id: 7a0694adca
Former-commit-id: f9b04639a4 [formerly 5fa1165519]
Former-commit-id: d35d7c0b5e
2014-04-24 12:48:40 -05:00
David Gillingham
99b4c52d36 Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec

Former-commit-id: 6186e67e5c [formerly eea20ba3ef] [formerly 6186e67e5c [formerly eea20ba3ef] [formerly 16adfb2573 [formerly 0b91ae192358aa162833fb332ba4e551878199f9]]]
Former-commit-id: 16adfb2573
Former-commit-id: 123bd80fa9 [formerly 9f27fa7562]
Former-commit-id: aaa1340f81
2014-04-24 11:11:06 -05:00
Brian Clements
9e2497714b Issue #2955 ignore duplicate session invites
Former-commit-id: e81ee94171 [formerly f888819646] [formerly e81ee94171 [formerly f888819646] [formerly 4fa9afc9ae [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 39c2a1ac37 [formerly 75465b69ed]
Former-commit-id: 3b96c4c628
2014-04-24 09:25:54 -05:00
Lee Venable
6c54817117 Issue #3040 - Fixed contact request and group name issues.
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e

Former-commit-id: eed8c6cbba [formerly df05a79d63] [formerly eed8c6cbba [formerly df05a79d63] [formerly f13ac7e1b9 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 421a4e4677 [formerly 222154d094]
Former-commit-id: e81836e371
2014-04-23 18:24:25 -05:00
Nate Jensen
c1c802a601 Merge "Issue #2623 remove ecf plugins from being included in cave" into development
Former-commit-id: 6b58bd38c1 [formerly b805ff2dbf] [formerly 6b58bd38c1 [formerly b805ff2dbf] [formerly cb23307e20 [formerly 92034458933316352037188cb243c57f64be09cd]]]
Former-commit-id: cb23307e20
Former-commit-id: b8c0ae3f41 [formerly e90a79cc81]
Former-commit-id: b28fa49534
2014-04-23 17:36:51 -05:00
Richard Peter
6ad2598934 Merge "Issue #2928: Update DD WebContainer to allow loading properties from environment" into development
Former-commit-id: ad824c25ab [formerly b99353b37d] [formerly ad824c25ab [formerly b99353b37d] [formerly 2b379eaedc [formerly 560113a526caf0572dfcf6e0c4792a071f49f81c]]]
Former-commit-id: 2b379eaedc
Former-commit-id: 6d25f536be [formerly 7f3172341c]
Former-commit-id: 9fd986d8aa
2014-04-23 17:31:31 -05:00
Richard Peter
59307bd076 Merge "Issue #2971 Fix regex in warning.xml" into development
Former-commit-id: cf02c14cce [formerly 008c218efc] [formerly cf02c14cce [formerly 008c218efc] [formerly 707003e35e [formerly 51ca0128e66f22a881354bee88e403bbf8afdb93]]]
Former-commit-id: 707003e35e
Former-commit-id: 100d19c75e [formerly 9c3988031c]
Former-commit-id: b44b565c95
2014-04-23 17:31:10 -05:00
Nate Jensen
e0b54d7b7a Issue #2623 remove ecf plugins from being included in cave
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18

Former-commit-id: baa6714566 [formerly 07fec6a69c] [formerly baa6714566 [formerly 07fec6a69c] [formerly ecb6b4d0ce [formerly 98e3e2137ecb9ce14f8dfd295791a79a897867a2]]]
Former-commit-id: ecb6b4d0ce
Former-commit-id: 9bac89c776 [formerly 3671e18036]
Former-commit-id: 91b8d9b72b
2014-04-23 17:29:00 -05:00
Richard Peter
4a7642c44e Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
Former-commit-id: 99036341f3 [formerly 026575b202] [formerly 99036341f3 [formerly 026575b202] [formerly e10434a727 [formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]
Former-commit-id: e10434a727
Former-commit-id: 4d2ee42fc9 [formerly b4226666be]
Former-commit-id: bf8b504942
2014-04-23 17:25:25 -05:00
Ron Anderson
a557c344c3 Issue #2971 Fix regex in warning.xml
Change-Id: I74998354d07596551763a0453973ea4a6ea6f806

Former-commit-id: 7c3d99cf91 [formerly 27d5639b58] [formerly 7c3d99cf91 [formerly 27d5639b58] [formerly b1d43ae61a [formerly 60c4d87b387b3902fb0feacbf48807490b17e90c]]]
Former-commit-id: b1d43ae61a
Former-commit-id: cf611f1186 [formerly 5034bcd8fe]
Former-commit-id: 5382d8cc16
2014-04-23 17:24:41 -05:00
Ben Steffensmeier
fbb4703fe3 Issue #2947 Fixes for derived products with multiple records per frame.
Former-commit-id: c6fc0fd4b1 [formerly c19d52db72] [formerly c6fc0fd4b1 [formerly c19d52db72] [formerly 01fc21b6f2 [formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: e3e78283dd [formerly 0cde4689fa]
Former-commit-id: bae8296507
2014-04-23 17:14:02 -05:00
Ron Anderson
dd5c3bf2fd Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS

Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73

Former-commit-id: 2f68fb8f2c [formerly 221a06e467] [formerly 2f68fb8f2c [formerly 221a06e467] [formerly f3185dd206 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 00f2f374cd [formerly 3e37419dc6]
Former-commit-id: 78ef1d5c4c
2014-04-23 17:04:16 -05:00
Richard Peter
cefe83f83f Issue #2928: Update DD WebContainer to allow loading properties from environment
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081

Former-commit-id: cbb5854541 [formerly c74786c35c] [formerly cbb5854541 [formerly c74786c35c] [formerly 2f8da547ea [formerly 119282c58744addb3fd1a5c4a1a165f98d6437a8]]]
Former-commit-id: 2f8da547ea
Former-commit-id: 03ffce2459 [formerly a526ae0370]
Former-commit-id: e70e7fba36
2014-04-23 16:01:40 -05:00
Nate Jensen
4358177d45 Merge "Issue #2648 Update hprof info to match grid changes in 14.3" into development
Former-commit-id: ba516ceb03 [formerly abf64eafe8] [formerly ba516ceb03 [formerly abf64eafe8] [formerly e8a9f7bec1 [formerly 83adf5698e27e9d62cfc7565c4a3f4c491f8ae93]]]
Former-commit-id: e8a9f7bec1
Former-commit-id: 8c9afc819f [formerly 6abfee3b65]
Former-commit-id: c554036f2f
2014-04-23 15:44:09 -05:00
Ben Steffensmeier
bb04f26de0 Issue #2648 Update hprof info to match grid changes in 14.3
Former-commit-id: 2dcc596c83 [formerly a608d3a7e9] [formerly 2dcc596c83 [formerly a608d3a7e9] [formerly 2c82f5ea7a [formerly c391a6fbb543e467030f45a494e00bc4246c6a36]]]
Former-commit-id: 2c82f5ea7a
Former-commit-id: 8f3ad535c6 [formerly 17dfcd8c70]
Former-commit-id: de10019851
2014-04-23 15:42:33 -05:00
Nate Jensen
61eca0980f Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: 827112349a [formerly ad6e4712d6] [formerly 827112349a [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 418741ce55 [formerly a0423843b3]
Former-commit-id: 1abd65120e
2014-04-23 15:30:44 -05:00
Nate Jensen
ba32067353 Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
Former-commit-id: 547bcafdb6 [formerly c193eac6e8] [formerly 547bcafdb6 [formerly c193eac6e8] [formerly 1067e4b09c [formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]
Former-commit-id: 1067e4b09c
Former-commit-id: a2df4a7ec5 [formerly d1c581aed6]
Former-commit-id: c1aa647d6d
2014-04-23 14:24:33 -05:00
Nate Jensen
e6098ceba3 Merge "Issue #3053 - updated list selection dialog to be more configurable and fixed subset action." into development
Former-commit-id: ca0d273b2c [formerly 12f14086e2] [formerly ca0d273b2c [formerly 12f14086e2] [formerly c310707a46 [formerly b3e00882b85c8042bbe56b97044809f5b96d544b]]]
Former-commit-id: c310707a46
Former-commit-id: f921bdb96d [formerly 27dc9e88da]
Former-commit-id: d1de321b8b
2014-04-23 14:24:25 -05:00
Brian Clements
8cdeb571f3 Issue #2822 shared display invitations always go to cave
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients


Former-commit-id: 117eeca83a [formerly f3ee7b453a] [formerly 117eeca83a [formerly f3ee7b453a] [formerly 6969321db0 [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: 50acaac149 [formerly 5d2ec9b909]
Former-commit-id: d9a1bba4c8
2014-04-23 14:16:42 -05:00
Lee Venable
711d471f3e Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986

Former-commit-id: 41cd3242f5 [formerly 331dc3397f] [formerly 41cd3242f5 [formerly 331dc3397f] [formerly 765d2e80bc [formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]]]
Former-commit-id: 765d2e80bc
Former-commit-id: 029de4a1b1 [formerly 26e8c1ecf6]
Former-commit-id: 906340fb07
2014-04-23 14:07:29 -05:00
Brian.Dyke
2161c569ea Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
2014-04-23 14:05:50 -04:00