Ron Anderson
|
809548b283
|
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b10be8ae235c4528c4ce83088daeccf8a0928933
|
2014-05-20 11:10:26 -05:00 |
|
Brian.Dyke
|
d5a4669fc4
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: 19032f03b1d2166f4afd936bb2b56e0b4851d9f4
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
06c2478539
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
9c1587b92d
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
|
2014-05-19 15:40:41 +01:00 |
|
brian.dyke
|
58683ad040
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
e9bd17a21f
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
d3fa10028c
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f7d6bee49c5777e5d63c724eba1242a1baf153ac
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
c5097660c2
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
|
2014-05-14 15:30:16 -04:00 |
|
Bryan Kowal
|
8d5326cc1b
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 2b13221d7c644147f6eda1acb8b126667be00926
|
2014-05-13 14:43:04 -05:00 |
|
Brian.Dyke
|
fb4c7e55b3
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: 019c1405290753ed47cecd9a0bb26c220d78d010
|
2014-05-13 11:23:55 -04:00 |
|
Matthew Howard
|
576a2d63ec
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 2052df4ca5f68165b477994b21357c245ff73546
|
2014-05-13 07:49:18 -05:00 |
|
Steve Harris
|
fc2bf6b45c
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: a830db2a282e6a29d119fc0d3357c2223c48d175
|
2014-05-12 16:13:19 -05:00 |
|
Zhidong.Hao
|
030b767299
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: a48b81894fed165aba58a0097359bbd0f1931be5
|
2014-05-12 15:16:38 -04:00 |
|
Juliya Dynina
|
e33a27684c
|
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 0c54c56efa1306d781d64621ccf7f62b3bf70997
|
2014-05-12 14:01:40 -05:00 |
|
Juliya Dynina
|
4f7fa8a8de
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 350448988d24fd2eb58812128b062e3a0f44b956
|
2014-05-12 14:01:07 -05:00 |
|
Ana Rivera
|
81a9d4fa44
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: e71ef5db23122405fc6aab71526a9cc3ec3ad823
|
2014-05-12 18:55:06 +00:00 |
|
Matthew Howard
|
0dc1db0072
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
d3be6d0476
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
074713bb4a
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
41ba5fc348
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
42cce01396
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: 59fb75bdc025a3b2feb95d20d263060b55e87b28
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
96d1555012
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: df46f9fc541a47e5f31210663ef69c4c5863fa28
|
2014-05-12 13:38:04 -04:00 |
|
Bryan Kowal
|
faa6b09ac9
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: c94c973ef6a663f93a6b1a6301f5553d4e88ac73
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
8a9c7ecb11
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 988d5f26d3bd3e42397f62288a8c9b10e341495b
|
2014-05-12 13:33:58 +01:00 |
|
Lee Venable
|
e3c6407be3
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: 06b3cb4dd8f07600e6513a15a2495b485b0812b6
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
963a58ebba
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 789fffccf3389143a1660a477301cfcb43a82890
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
a81569849b
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 84bd0800b2652b31c06015fa49f816f1402f461d
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
e8c4279d10
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 25e500435693940e378df086739fce8eefdba3bb
|
2014-05-09 09:53:25 -05:00 |
|
Mike Duff
|
038b2b7500
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: a44e412190741fcb0a91dd451ae538277ae0d79f
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
9d4c33ba91
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 59f12cd4cc60f0908c106cbc0572d3f84d0d509b
|
2014-05-08 18:18:08 -05:00 |
|
Ana Rivera
|
1b4450ec5f
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
335c02d2c6
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
1496955e44
|
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: a47409fd1673c9584c46aba496be1b7203d9c45d
|
2014-05-08 14:47:03 -05:00 |
|
Mike Duff
|
6a67638a94
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 57755db0d6d77f32d64b4b569bb0af88002a23da
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
ecc5c5849f
|
Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: a139113883f69be89a0e0a771f8d6f48d3948686
|
2014-05-08 14:08:06 -05:00 |
|
Kiran.Shrestha
|
f1a707cf64
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: 1ac375914b05ea937439b6c0802291f49ff38938
|
2014-05-08 15:07:42 -04:00 |
|
Michael Gamazaychikov
|
588cfd0608
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: f934537da168238e76f0be04fc518f6ad315637e
|
2014-05-08 14:02:21 +01:00 |
|
Juliya Dynina
|
92202928c9
|
Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 433a3be9362e151d8da6af2d69cdcd50f4a87b93
|
2014-05-07 14:18:01 -05:00 |
|
Ben Steffensmeier
|
7274d01d64
|
Issue #3119 Optimize plot rendering.
Former-commit-id: 006df5b77f8f09e0b083b3c3e644744653f3d269
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
30bbd2d1cd
|
Merged 13.5.5 -4 into 1412
Former-commit-id: 5644361dffaae25c63748a52c23506907210c741
|
2014-05-07 13:07:15 -04:00 |
|
Nate Jensen
|
0f1cab916a
|
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 37c2d25d9ff0076d1cab4f818e45c6ccead82105
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
70df0ee87e
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 35845fa63be35661893d31510f83e2d9ab6f60af
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
8f8ea5d014
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 26eb2500104f7afe3fb07ddd66299aa1486375d2
|
2014-05-06 16:15:41 -05:00 |
|
Nate Jensen
|
7cea97ab15
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 949d132cf3260db5f75ea665f21601ab91440958
|
2014-05-06 12:26:21 -05:00 |
|
Brian.Dyke
|
e3b0b44b71
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: c6ba49e1206ed113b57a9fa39f5720ee9b3b979a
|
2014-05-06 11:34:46 -04:00 |
|
Brian.Dyke
|
04b8da6f73
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 9adc24725f9bd3499d8f498990413df7718de83e
|
2014-05-06 11:25:15 -04:00 |
|
Chip Gobs
|
e42bef2a33
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
|
2014-05-06 10:48:35 -04:00 |
|
Brian Clements
|
1432aa1302
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
|
2014-05-06 09:30:07 -05:00 |
|
Lee Venable
|
b0a251f4e3
|
Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: d875f73ff44986b2c7862f0dee06504d576fd96b
|
2014-05-05 16:13:31 -05:00 |
|
Melissa Porricel
|
92231e051d
|
ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: 012fa438f085498027402c1cd0897dd13c0d4edc
|
2014-05-05 14:56:58 -04:00 |
|