Brian.Dyke
|
6f6daaa249
|
Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: f22cc09d0a6fdc7a806726d5207f6b3507972b94
|
2014-08-04 16:40:02 -04:00 |
|
Brian.Dyke
|
9abb02ea8a
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
3598f7b549
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 96ff2234e0d8893695b33a79d24a026a1a409073
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
976c7b2d4a
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: d272d426f8bd218954a75a7b2e19d21b30f975cb
|
2014-07-30 14:03:51 -04:00 |
|
Juliya Dynina
|
fc27de56d2
|
Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
Former-commit-id: 264920b8af1b2665b17c1015afe02e6f4a719419
|
2014-07-30 07:48:43 -05:00 |
|
Daniel.Huffman
|
aca63e248f
|
ASM #15648 Change to Cities.xml
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2
Former-commit-id: 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7
|
2014-07-29 21:41:00 +00:00 |
|
Brian.Dyke
|
c8a7361ec6
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2e0b11b6afbcda488399920642dced37545c7541
|
2014-07-29 16:00:59 -04:00 |
|
Michael Gamazaychikov
|
ba4c386f30
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: 00ec5e2d47809d084b3e24e1f1503af96d129fed
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
1eca5ef51a
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 3b971d52a82099142fe08986df879a379dfa6314
|
2014-07-28 12:36:07 -04:00 |
|
Ron Anderson
|
17b681f355
|
Issue #3423 Move alarm/alert product requests off UI thread
Change-Id: I44149b5af54fbeac75231d6caeb3929fbf6ecf5e
Former-commit-id: c3401cee78edae8dea6d21736fac25bfed996fb3
|
2014-07-24 14:02:10 -05:00 |
|
Zhidong.Hao
|
26c4bb2414
|
ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7
Former-commit-id: 192948e00538bcf0dfc0aaf20ea1dcb216313ffb
|
2014-07-23 14:37:28 -04:00 |
|
Steve Harris
|
eaa4456fa7
|
Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 2c17b02a196584edbaa2cef33d8e9adc91567f8e
|
2014-07-23 13:07:11 -05:00 |
|
Jonathan Sanchez
|
86a8ca4a30
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 135d7ffa84af58d7b3c9575e654fa1298b76b2e2
|
2014-07-22 15:32:12 -05:00 |
|
Steve Harris
|
bce7039508
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: c0033681d38af55bff79efbceec119606fcc5c2f
|
2014-07-22 10:26:33 -05:00 |
|
Brian.Dyke
|
e55b892fc3
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 499b825592fdbdf150c918e5f3abacc4f37ddd70
|
2014-07-21 11:18:25 -04:00 |
|
David Friedman
|
ec25c44fe7
|
ASM #15049 - LAPS time matching problem
Change-Id: I52eee87defb407b741208e183b9829558bfa6733
Former-commit-id: 624c3a4225910863d5cc0b795493a39c0422a3e3
|
2014-07-18 17:06:05 +00:00 |
|
Nate Jensen
|
da731be2f7
|
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 894e6ac1db5b34e6466c68aefa5877b9405bfd59
|
2014-07-17 13:27:48 -05:00 |
|
Nate Jensen
|
6e21526fd2
|
Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: c7167ad2f59ba02edc842f321d12cd36cd6da8bb
|
2014-07-15 18:27:09 -05:00 |
|
steve.naples
|
339fcbc18a
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 24b9a6e0801cc653062a71d86090df3836aa86a4
|
2014-07-09 15:42:51 +00:00 |
|
Ron Anderson
|
111b04296c
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: b01b72b896b894568acce6a8dc4d45328a06067a
|
2014-07-09 08:56:06 -05:00 |
|
steve.naples
|
75969ceec2
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 9021eca6b32dd2b3859cd928c14a0e40a4907c13
|
2014-07-08 16:32:08 +00:00 |
|
Brian.Dyke
|
2ef4767652
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: 845aebda9d8af143e3a6828c066b291e0343a020
|
2014-07-07 13:33:35 -04:00 |
|
David Friedman
|
a45fe1dad0
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
244b2f5f3a
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: d6ae0d12f104de38b8fa770e4576b96a32da360c
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
136af3f7e2
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: c88d3136dbadab41df5fbf37b4b7c821dfcd07d9
|
2014-07-02 13:38:08 -05:00 |
|
steve.naples
|
66c3241bc4
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: b9f868e0ced53987accf675bfe2ce1a1f4f34da1
|
2014-07-02 15:30:48 +00:00 |
|
Nate Jensen
|
c003d70168
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: db10ba5a37dbe219110f4f902bf9257f2f220b3d
|
2014-07-02 09:24:15 -05:00 |
|
Steve Harris
|
1c8dc56d49
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 382c772c196711d230395f34a04559c188880622
|
2014-07-01 13:38:18 -05:00 |
|
Brian.Dyke
|
b64d38be69
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 765d6440b1b19d7b0cf789fb7a873e14b4a679e1
|
2014-07-01 13:47:12 -04:00 |
|
Steve Harris
|
d4dc1723c1
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
b5e4bc1fdc
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb
|
2014-07-01 10:05:57 -05:00 |
|
steve.naples
|
34956449ef
|
ASM #665 Updated getCv_use in DisplayFieldData class to return name
Change-Id: I1acbe41ca6a11794ff2f3cc4234422b78a39b0d2
Former-commit-id: 324ee4e77b4b6ff1a7f1385fde1a44c13aa86570
|
2014-06-30 17:41:43 +00:00 |
|
Qinglu.Lin
|
1200633cd2
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 4d50beaed59d785d923e357f8ce036f6625ce4b4
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
18b3b61afc
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: 993663cbee3f794981fc7f4cc97f96e3b86c47f8
|
2014-06-27 19:17:55 +00:00 |
|
Brian.Dyke
|
a5ae302690
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 632577244e843dd122c00b745e973730c7920246
|
2014-06-26 10:39:49 -04:00 |
|
Steve Harris
|
89606076ec
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
|
2014-06-24 10:57:56 -05:00 |
|
Ben Steffensmeier
|
aaa146b2d0
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 2fdb5867131b54f5d74ef3edd8c621c8807d4d99
|
2014-06-24 10:57:02 -05:00 |
|
steve.naples
|
efe877d82b
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: fcd20d35abf3617701cc797baf9ba2b3984379c8
|
2014-06-24 15:52:23 +00:00 |
|
Michael Gamazaychikov
|
7004d99fb8
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: I6d3a180d850060483742130c1550ac88f133d6e6
Former-commit-id: 7b7a2fcb393b09b9f0cb2077f1603410edcc9dab
|
2014-06-23 13:58:38 -04:00 |
|
Nate Jensen
|
51da67dd3f
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
b84dda5930
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
399c06820a
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Brian Clements
|
9946f78241
|
Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 5d298b39786d37aa365ccfe2c337214d1e46f1a9
|
2014-06-17 17:01:23 -05:00 |
|
Nate Jensen
|
c2aa87470d
|
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: 93f63c0d42941001e4d59a4840df5e5b525592bf
|
2014-06-16 08:31:30 -05:00 |
|
Brian.Dyke
|
30d8644fa5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
346bf852cd
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
|
2014-06-13 13:21:19 -04:00 |
|
Brian Clements
|
5424eb0258
|
Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: afcfdf1ed08cd64deb085b909f0965e4ab68d92d
|
2014-06-12 13:40:33 -05:00 |
|
David Friedman
|
b8542c1332
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: a3f4fd6537f3847011e199e0f043968d9f595937
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
f72380ad60
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
c1b3f9d180
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
|
2014-06-10 12:52:59 -04:00 |
|