Commit graph

3018 commits

Author SHA1 Message Date
Matthew Howard
6a44f74885 Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: f1dfdd2878 [formerly d40d9931db] [formerly f1dfdd2878 [formerly d40d9931db] [formerly 42cce01396 [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]]]
Former-commit-id: 42cce01396
Former-commit-id: 6106a76640 [formerly a4827323e6]
Former-commit-id: aeef207dff
2014-05-12 13:00:55 -05:00
Rici.Yu
120a23223b ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127

Former-commit-id: 34069a96be [formerly 2ea1c1fa60] [formerly 34069a96be [formerly 2ea1c1fa60] [formerly 96d1555012 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]]
Former-commit-id: 96d1555012
Former-commit-id: 0ba9da16b0 [formerly 473496b99a]
Former-commit-id: be10c8d49c
2014-05-12 13:38:04 -04:00
Juliya Dynina
f31ab03907 Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 448dfef9e7 [formerly dd13f453e6] [formerly 448dfef9e7 [formerly dd13f453e6] [formerly 963a58ebba [formerly 789fffccf3389143a1660a477301cfcb43a82890]]]
Former-commit-id: 963a58ebba
Former-commit-id: ad2be95671 [formerly 267244d378]
Former-commit-id: 8c0412111a
2014-05-09 11:08:12 -05:00
Kiran.Shrestha
412ee7d428 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b

Former-commit-id: c1d2c93db3 [formerly f013b49282] [formerly c1d2c93db3 [formerly f013b49282] [formerly f1a707cf64 [formerly 1ac375914b05ea937439b6c0802291f49ff38938]]]
Former-commit-id: f1a707cf64
Former-commit-id: 94be466b40 [formerly 6d19b6efd7]
Former-commit-id: 074c4725b7
2014-05-08 15:07:42 -04:00
Michael Gamazaychikov
b9d57aa0b4 ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf

Former-commit-id: 4a7d050dd4 [formerly e7341afe4d] [formerly 4a7d050dd4 [formerly e7341afe4d] [formerly 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]]]
Former-commit-id: 588cfd0608
Former-commit-id: 5c73491447 [formerly 31c221bc37]
Former-commit-id: 7b5e8942cf
2014-05-08 14:02:21 +01:00
Juliya Dynina
547c86f36f Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 2f3f953823 [formerly d6a796c476] [formerly 2f3f953823 [formerly d6a796c476] [formerly 92202928c9 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]]
Former-commit-id: 92202928c9
Former-commit-id: 87433219cc [formerly 3be2acf831]
Former-commit-id: 5e9af9b47d
2014-05-07 14:18:01 -05:00
Melissa Porricel
9b7d84bfc4 ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
2014-05-05 14:56:58 -04:00
Qinglu.Lin
03f7862321 ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: 5f0e0bda69 [formerly 18e92f03c1] [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]
Former-commit-id: d8753a4145
Former-commit-id: 580d7e3ba7 [formerly 8de2d2f718]
Former-commit-id: 6ba15bd00c
2014-05-05 11:54:56 -04:00
Juliya Dynina
35bbea77af Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: 1d2297e489 [formerly cf742e4dc0] [formerly 1d2297e489 [formerly cf742e4dc0] [formerly 9da4eaaad5 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]]]
Former-commit-id: 9da4eaaad5
Former-commit-id: 2611615ee3 [formerly a9556d4d2e]
Former-commit-id: a7e8e4a9c4
2014-05-02 12:37:00 -05:00
Xuezhi.Wei
2bc8a6c5fd ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a647b1ddf3 [formerly c4fc2f169b] [formerly a647b1ddf3 [formerly c4fc2f169b] [formerly 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]
Former-commit-id: 071a1ae06a
Former-commit-id: f31f39a875 [formerly 1ce32e2be1]
Former-commit-id: 57a6bcfca6
2014-05-02 16:55:36 +00:00
steve.naples
18c51dac23 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: a7092ac01d [formerly b58b7d3d5a] [formerly a7092ac01d [formerly b58b7d3d5a] [formerly 8a00348730 [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]
Former-commit-id: 8a00348730
Former-commit-id: 452cbdcc4e [formerly d079dbcb7c]
Former-commit-id: 39437970c7
2014-05-02 16:15:04 +00:00
Matthew Howard
f99bcfc97f Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: 3b48dcc680 [formerly 55b1198186] [formerly 3b48dcc680 [formerly 55b1198186] [formerly 9e7a0e0a61 [formerly ef1c0313455700304e9dc8e130f2b8658fdd1ed7]]]
Former-commit-id: 9e7a0e0a61
Former-commit-id: fce48ae3fd [formerly 571a45c6ea]
Former-commit-id: 4f5e129201
2014-05-01 16:07:11 -05:00
brian.dyke
22ffaef982 Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: 2a934def82 [formerly 5d7b8eca6a] [formerly 2a934def82 [formerly 5d7b8eca6a] [formerly d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]
Former-commit-id: d5c3f112c1
Former-commit-id: b68c49053a [formerly 302366dac1]
Former-commit-id: b72e2d4289
2014-05-01 15:20:36 -04:00
Gang.Zhang
d4b87f3bad ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 090ed29386 [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]]]
Former-commit-id: 090ed29386
Former-commit-id: 3131e25e69 [formerly 7c7adbd77d]
Former-commit-id: 2b25e8c401
2014-05-01 15:49:48 +01:00
Juliya Dynina
bac2c83f58 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1
Former-commit-id: 308e775017 [formerly d804167bb2] [formerly 308e775017 [formerly d804167bb2] [formerly 4ef3cfa9c3 [formerly ceb84b3c7de12a1c64f389a800125443920fbf41]]]
Former-commit-id: 4ef3cfa9c3
Former-commit-id: cc93e11ce8 [formerly 6282dd45cb]
Former-commit-id: 80e6ae71d0
2014-04-30 14:53:36 -05:00
Brian.Dyke
f16c305ae4 Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
2014-04-30 12:57:09 -04:00
Juliya Dynina
18c84c47bc Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: 00bbbf32c1 [formerly d37490acb1] [formerly 00bbbf32c1 [formerly d37490acb1] [formerly 78bb549533 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]
Former-commit-id: 78bb549533
Former-commit-id: b28bb8e3ac [formerly d5290b8bbf]
Former-commit-id: a4073b805e
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
ecbad2efac ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: 1b5bccc451 [formerly 760ee964d6] [formerly 1b5bccc451 [formerly 760ee964d6] [formerly 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 93a6523f46 [formerly e28ec3469d]
Former-commit-id: 84640a8936
2014-04-29 21:09:34 +00:00
Brian.Dyke
1aec51b7c4 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
2014-04-29 12:07:21 -04:00
brian.dyke
864e83994e Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


Former-commit-id: ffad42f2ef [formerly 8bda882ed0] [formerly ffad42f2ef [formerly 8bda882ed0] [formerly 4621d66089 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]]]
Former-commit-id: 4621d66089
Former-commit-id: c27ffd0678 [formerly 1939a06ced]
Former-commit-id: d6287274b2
2014-04-28 13:25:41 -04:00
steve.naples
b5e6653935 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: 58b091e37b [formerly e0b6f674f3] [formerly 58b091e37b [formerly e0b6f674f3] [formerly 760fc00028 [formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]]
Former-commit-id: 760fc00028
Former-commit-id: 399702b22b [formerly bed2334f57]
Former-commit-id: 26da8e332a
2014-04-28 13:55:21 +00:00
David Friedman
eed80b716a ASM #525 - Text Workstation expiration pop-up inconsistent
Change-Id: I3867a0050962d97125ca6612fcded2fe62b48619

Former-commit-id: 01b0960ac9 [formerly 8b595435e2] [formerly 01b0960ac9 [formerly 8b595435e2] [formerly ae90da3011 [formerly f7bfa197b1b61b69029efd8e225ba5dea22c17f2]]]
Former-commit-id: ae90da3011
Former-commit-id: 2a2cfa122a [formerly 4f54767780]
Former-commit-id: 3742b82fc1
2014-04-25 19:32:47 +00: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
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
brian.dyke
8f28d7213d Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java

Former-commit-id: c7d785d503 [formerly 805af72ef8] [formerly c7d785d503 [formerly 805af72ef8] [formerly 24316a7f66 [formerly 3f3c0a55218af9f27abce65c0ec3e8704485c36e]]]
Former-commit-id: 24316a7f66
Former-commit-id: ab43d20b28 [formerly acc904e4e8]
Former-commit-id: 8540e0de6f
2014-04-22 16:50:57 -04:00
Dave Hladky
4ce5dfcd92 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
2014-04-21 12:26:47 -05:00
Brian.Dyke
8275f3907f Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
2014-04-17 14:42:44 -04:00
Brian.Dyke
de500c093f Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
2014-04-17 14:42:35 -04:00
Nate Jensen
f607630d72 Issue #3018 addressing code review comments
Former-commit-id: 54951100af [formerly e327f5e0bf] [formerly 54951100af [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328 [formerly 8b6650c898]
Former-commit-id: 3737ad85b6
2014-04-17 09:28:47 -05:00
Ron Anderson
d704f90445 Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 85a1f55ea0 [formerly f9a393172f] [formerly 85a1f55ea0 [formerly f9a393172f] [formerly 1ba72371be [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 2139c2308e [formerly 7d09397faa]
Former-commit-id: 94f852cda7
2014-04-16 18:02:11 -05:00
Nate Jensen
de32624fdf Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 781ec3ecd6 [formerly a085b71c81] [formerly 781ec3ecd6 [formerly a085b71c81] [formerly c362af04f3 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 1a40bc4824 [formerly e1caa66625]
Former-commit-id: e4aeb8394d
2014-04-16 17:25:09 -05:00
Nate Jensen
64e7ac4225 Issue #3039 fix ifpImage class cast exception
Former-commit-id: a5edace073 [formerly 2b6db445c0] [formerly a5edace073 [formerly 2b6db445c0] [formerly 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: 19f0be6afc [formerly a1dd7f24fa]
Former-commit-id: 7e7bbfd784
2014-04-16 16:17:05 -05:00
Ron Anderson
072102dff0 Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
2014-04-15 17:22:12 -05:00
Richard Peter
4ca584c465 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: a4eba6e6df [formerly ffd74e6787]
Former-commit-id: c072d0d0ca
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8 Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: b120feab6f [formerly 6c92b645f0]
Former-commit-id: 0b6ca56417
2014-04-11 17:37:59 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
2014-04-11 16:23:09 -05:00
Qinglu.Lin
a849842e06 ASM #505 - Color table editor does not allow enough significant digits
Change-Id: I2b98ec0de0ebef7b585574d063ddf87834edd44a

Former-commit-id: 6741deb3c2 [formerly 3bae853360] [formerly 6741deb3c2 [formerly 3bae853360] [formerly 18804fe98e [formerly 2b9cb3e46fbd1598e95a4ea3a866741fed6603d9]]]
Former-commit-id: 18804fe98e
Former-commit-id: dd6ff185c7 [formerly 2659a9ce4d]
Former-commit-id: 1c242f9e50
2014-04-11 12:22:44 -04:00
brian.dyke
f299a28f9b Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 6a9ccba393 [formerly 6575f77fe3] [formerly 6a9ccba393 [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 88ddd667b6 [formerly ad63114f16]
Former-commit-id: 1c4e02168c
2014-04-11 10:58:48 -04:00
Richard Peter
b6c8960328 Merge "Issue #2864 - Change how saved subset files are stored." into development
Former-commit-id: 69c6217ae9 [formerly 8a682a5e23] [formerly 69c6217ae9 [formerly 8a682a5e23] [formerly 695878c6aa [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b4cc44faa0 [formerly 0fa4180959]
Former-commit-id: e858f14a8c
2014-04-11 09:41:31 -05:00
Mike Duff
8b46df102d Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: a58f279b54 [formerly 82cf444d6f] [formerly a58f279b54 [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]
Former-commit-id: 890faf2d73
Former-commit-id: dc2a5b0c6f [formerly 6d8bead4a7]
Former-commit-id: 583a4b1cea
2014-04-11 08:27:42 -05:00
Nate Jensen
0bac0fa185 Merge "Issue #2937 Connect to the venue after the feed view is available." into development
Former-commit-id: c7593d61c4 [formerly 5fc6942fab] [formerly c7593d61c4 [formerly 5fc6942fab] [formerly b3b9dbff67 [formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]]
Former-commit-id: b3b9dbff67
Former-commit-id: 7f32159599 [formerly 4a395ff2bc]
Former-commit-id: ff5519566f
2014-04-10 16:59:17 -05:00
Everett Kladstrup
9327eebf87 Issue #2725 Moving derivparam plugins to the lowest applicable features
Former-commit-id: 7fd3d7ce3d [formerly b074c88957] [formerly 7fd3d7ce3d [formerly b074c88957] [formerly ed0c157e33 [formerly 4397d0c6018858ab967110884cfdb7771c08e199]]]
Former-commit-id: ed0c157e33
Former-commit-id: 70a383f68d [formerly b9f67d3bae]
Former-commit-id: 5f280b7352
2014-04-10 16:00:22 -05:00
Everett Kladstrup
1467f1a316 Issue #2725 Put derivparam plugins in viz and edex separately
Former-commit-id: 90244ad7ec [formerly d76aaed2f0] [formerly 90244ad7ec [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: fa9ee97662 [formerly db413dc65f]
Former-commit-id: 1a68ea889a
2014-04-10 14:08:42 -05:00
Brad Gonzales
91d546d015 Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 5fcec27765 [formerly cc0fd1e9af] [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: e41f9defa4 [formerly 3b25edad9a]
Former-commit-id: 8f72707b3a
2014-04-10 14:01:53 -05:00
Nate Jensen
7cae36a45e Merge "Issue #1803 fix redbook sharing in collaboration" into development
Former-commit-id: 74a7189143 [formerly e88519c5e3] [formerly 74a7189143 [formerly e88519c5e3] [formerly 666b271528 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: 5d17f07d25 [formerly 573981b0d5]
Former-commit-id: 4cffa91903
2014-04-10 13:50:55 -05:00
Brian.Dyke
fbefee3e1d Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 73be1016c0 [formerly 8c2f601b59] [formerly 73be1016c0 [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: afc1da9015 [formerly ff51498036]
Former-commit-id: f051b95a7a
2014-04-10 13:26:42 -04:00
David Gillingham
2ab21ac335 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 1c7e650e6a [formerly c8a6dc8769] [formerly 1c7e650e6a [formerly c8a6dc8769] [formerly da31ab2042 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: 0385a4395e [formerly 72229cfb94]
Former-commit-id: 89046665f6
2014-04-10 11:24:40 -05:00
Nate Jensen
71e01e0264 Issue #1803 fix redbook sharing in collaboration
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: 4cccdac37e [formerly 1efb9a2a4d] [formerly 4cccdac37e [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: 2750a173dc [formerly a191b473e2]
Former-commit-id: a3fef22e8b
2014-04-10 10:50:33 -05:00
Nate Jensen
c2f1f5542a Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: 56b820ab97 [formerly ec40cb3dfc] [formerly 56b820ab97 [formerly ec40cb3dfc] [formerly eaf1382178 [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: a0e2342126 [formerly 952586230a]
Former-commit-id: 8c6704e442
2014-04-09 16:07:25 -05:00
Everett Kladstrup
de0f935f69 Issue #2725 Add new project to alertviz feature
Former-commit-id: 963ce8716e [formerly e4633811fc] [formerly 963ce8716e [formerly e4633811fc] [formerly 02b47e4d5a [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: c2a96ba985 [formerly 55638c0916]
Former-commit-id: a00b1dd9f6
2014-04-09 16:01:57 -05:00