Fay.Liang
|
a4a2421296
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
|
2015-04-10 12:13:31 -04:00 |
|
Fay.Liang
|
abe7660994
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 6a9a1daef6 [formerly a4a2421296 [formerly a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9]]
Former-commit-id: a4a2421296
Former-commit-id: 3898abb1db
|
2015-04-10 12:13:31 -04:00 |
|
Fay.Liang
|
e7af381368
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: c83d031df8ff4087dc62c66026de39220f439dc9
|
2015-04-10 12:06:08 -04:00 |
|
Fay.Liang
|
3cdf97b865
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 9a6d44aec1 [formerly e7af381368 [formerly c83d031df8ff4087dc62c66026de39220f439dc9]]
Former-commit-id: e7af381368
Former-commit-id: cbc1e434b0
|
2015-04-10 12:06:08 -04:00 |
|
Juliya Dynina
|
e7b4b76e27
|
Merge "ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected" into asm_14.4.1
Former-commit-id: 0fc80ad597575a3c43402a347c3260e6ad44e963
|
2015-04-10 08:46:57 -05:00 |
|
Juliya Dynina
|
2f5676c2a0
|
Merge "ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected" into asm_14.4.1
Former-commit-id: b9a8b432ba [formerly e7b4b76e27 [formerly 0fc80ad597575a3c43402a347c3260e6ad44e963]]
Former-commit-id: e7b4b76e27
Former-commit-id: 41a494c735
|
2015-04-10 08:46:57 -05:00 |
|
David Gillingham
|
3594451824
|
Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b
Former-commit-id: 20d76ae4ed226d19ea6ddbb408224ace8519787b
|
2015-04-09 15:13:48 -05:00 |
|
David Gillingham
|
c454610ff7
|
Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b
Former-commit-id: 1d2fb3c135 [formerly 3594451824 [formerly 20d76ae4ed226d19ea6ddbb408224ace8519787b]]
Former-commit-id: 3594451824
Former-commit-id: acb5b4f1af
|
2015-04-09 15:13:48 -05:00 |
|
Ron Anderson
|
784f7b9433
|
Merge "Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser." into omaha_14.4.1
Former-commit-id: 73f7967f208ba6d9ff40866e6c7b585411bf5385
|
2015-04-09 15:11:44 -05:00 |
|
Ron Anderson
|
d8aa339e56
|
Merge "Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser." into omaha_14.4.1
Former-commit-id: 404782166f [formerly 784f7b9433 [formerly 73f7967f208ba6d9ff40866e6c7b585411bf5385]]
Former-commit-id: 784f7b9433
Former-commit-id: e7338f2ddd
|
2015-04-09 15:11:44 -05:00 |
|
Matthew Foster
|
2f53fba60a
|
VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688
Change-Id: Iea8f52d8ba1cf78848dc95bf0792f0f220d4dd08
Former-commit-id: 382e01a6b5b93697efa2016a21cc2cdd1ececc5f
|
2015-04-09 13:53:58 -05:00 |
|
David Gillingham
|
b13f8c7794
|
Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6
Former-commit-id: 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb
|
2015-04-09 13:26:52 -05:00 |
|
David Gillingham
|
7fe1a980ba
|
Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6
Former-commit-id: c01694607f [formerly b13f8c7794 [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]]
Former-commit-id: b13f8c7794
Former-commit-id: 2e3b98f02f
|
2015-04-09 13:26:52 -05:00 |
|
Brian Clements
|
cbb6c52f8c
|
Omaha #4386 lightning resource updates frames asynchronously
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379
Former-commit-id: 9c82bcc5c93dcd30e3c645f673611ac6710c8fab
|
2015-04-09 10:25:28 -05:00 |
|
Brian Clements
|
acbf97a041
|
Omaha #4386 lightning resource updates frames asynchronously
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379
Former-commit-id: cbe0a699fb [formerly cbb6c52f8c [formerly 9c82bcc5c93dcd30e3c645f673611ac6710c8fab]]
Former-commit-id: cbb6c52f8c
Former-commit-id: feb9518f03
|
2015-04-09 10:25:28 -05:00 |
|
Ana Rivera
|
42e1d12ccf
|
Merge branch 'master_15.1.1'(master_15.1.1-2m) into field_15.1.1
Change-Id: If8fdc78136ac00065a7c1f9a3b45e814a58c815e
Former-commit-id: 87043a26d3e1aa32f693ff0f48d4357ac416e6d9
|
2015-04-09 15:13:54 +00:00 |
|
Fay.Liang
|
696b8e4e88
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 2f43c804ce6113b74ea72857fea0c6694ad626fe
|
2015-04-09 10:43:35 -04:00 |
|
Fay.Liang
|
d4e5cd10ad
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 3462cc40ea [formerly 696b8e4e88 [formerly 2f43c804ce6113b74ea72857fea0c6694ad626fe]]
Former-commit-id: 696b8e4e88
Former-commit-id: 1a6f3f0dbc
|
2015-04-09 10:43:35 -04:00 |
|
Roger Ferrel
|
a26076f47c
|
Omaha #4346 Merge base xml files into base configuration.
Change-Id: I056a4e04cb20625408a7a3e117e0cb0babad4a0d
Former-commit-id: ed292bad0ffffd57fecae3e8d80f125fd948f903
|
2015-04-09 07:58:33 -05:00 |
|
Fay.Liang
|
a2bb04d6b9
|
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 3c4a22bf33c9f1147c6ebb263e6102294b33f65f
|
2015-04-08 12:27:57 -04:00 |
|
Fay.Liang
|
aeaca8ce50
|
Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: d7c9aeecd43125529303f37560b9ae76b2934817
|
2015-04-08 12:26:50 -04:00 |
|
Fay.Liang
|
27091192ef
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
|
2015-04-08 12:24:58 -04:00 |
|
Fay.Liang
|
b0d72bf798
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
|
2015-04-08 12:22:27 -04:00 |
|
Chip Gobs
|
07e07c3947
|
Merge remote branch 'remotes/origin/ohd_15.1.1' into ohd_15.1.1
Former-commit-id: 2438b5702f8fdcd52d79dce64613b8b394d32b16
|
2015-04-07 15:07:44 -04:00 |
|
Zhidong.Hao
|
64044b1320
|
ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option
Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06
Former-commit-id: d7d664dce1959257676755bb0632e904c05593a6
|
2015-04-07 14:37:56 -04:00 |
|
Zhidong.Hao
|
0319992a49
|
ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option
Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06
Former-commit-id: f44e6c7deb [formerly 64044b1320 [formerly d7d664dce1959257676755bb0632e904c05593a6]]
Former-commit-id: 64044b1320
Former-commit-id: aec5351938
|
2015-04-07 14:37:56 -04:00 |
|
Nate Jensen
|
2c0ed92ce6
|
Omaha #4204 keep renamed parts on 4 panel action
Change-Id: I76dcfa52bc79bd9274c11912e889728486d3ca4f
Former-commit-id: 12207dc69597a229ca732b7dc90e2d75ebbc988b
|
2015-04-07 11:15:13 -05:00 |
|
Fay.Liang
|
49108ab5f1
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 690e16f2101481202c67622cc745079465261ae9
|
2015-04-06 15:42:01 -04:00 |
|
Fay.Liang
|
8004ba3123
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: c681804958 [formerly 49108ab5f1 [formerly 690e16f2101481202c67622cc745079465261ae9]]
Former-commit-id: 49108ab5f1
Former-commit-id: fbf1ab4e11
|
2015-04-06 15:42:01 -04:00 |
|
Fay.Liang
|
c8962caee7
|
Merge tag 'OB_14.3.3-2' into master_14.4.1
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
|
2015-04-06 15:40:31 -04:00 |
|
Fay.Liang
|
36f4f953cb
|
Merge tag 'OB_14.3.3-2' into master_14.4.1
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: 618781f10c [formerly c8962caee7 [formerly f5fad51061f568aea4ea581a099ef8353758add6]]
Former-commit-id: c8962caee7
Former-commit-id: 8f3b4cb35a
|
2015-04-06 15:40:31 -04:00 |
|
David Friedman
|
f8db9d993e
|
ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected
Change-Id: Ia672d2a4f5e38dcd3b1c43373993779557e86309
Former-commit-id: 87ceca157b69dd6301f2ee0d6d9cee9aa7bb8bc8
|
2015-04-06 19:38:33 +00:00 |
|
David Friedman
|
587482c3aa
|
ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected
Change-Id: Ia672d2a4f5e38dcd3b1c43373993779557e86309
Former-commit-id: 97c938cb25 [formerly f8db9d993e [formerly 87ceca157b69dd6301f2ee0d6d9cee9aa7bb8bc8]]
Former-commit-id: f8db9d993e
Former-commit-id: f5db6cee9a
|
2015-04-06 19:38:33 +00:00 |
|
Michael Gamazaychikov
|
0d5b627a4c
|
ASM #14968 - TextWS: Problems inserting text into pathcast section.
Change-Id: I9a9bc6c91b6d15087acf0e08c9168211745dfa88
Former-commit-id: 9f42d943954adc1f3e9c365381f46d4c5a375d71
|
2015-04-06 10:08:28 -04:00 |
|
Kiran.Shrestha
|
74ea170409
|
ASM #15025 WRK product changes header to alternate- long-line pil in header block.
Change-Id: If5776bbddbf8b5eddf8dff85d913ce8a4862bd12
Former-commit-id: 3ab4df17a7fd40f93de6cb32798ee5a2385f4814
|
2015-04-03 18:43:24 +00:00 |
|
Ron Anderson
|
c456aa2776
|
Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
|
2015-04-02 17:05:47 -05:00 |
|
Fay.Liang
|
9fabaaa994
|
Merge branch 'omaha_14.3.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.3
Former-commit-id: 368369872b [formerly 410d623afa [formerly 39be5eb857ab247a1116a145aee274d25e993368]]
Former-commit-id: 410d623afa
Former-commit-id: 93b7751887
|
2015-04-02 14:51:06 -04:00 |
|
Fay.Liang
|
410d623afa
|
Merge branch 'omaha_14.3.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.3
Former-commit-id: 39be5eb857ab247a1116a145aee274d25e993368
|
2015-04-02 14:51:06 -04:00 |
|
Nate Jensen
|
e3409e80a4
|
Omaha #4204 retain part names when 4-panel swapped
Change-Id: I86b364dfe879100fa81991ab31c0e8e1122d3862
Former-commit-id: b9c5c03f403d00b7fbf0ff5d9c8ed34c82556abd
|
2015-04-02 12:06:10 -05:00 |
|
Rici.Yu
|
df0b9d2d0c
|
ASM #17194 - convert SerpConfig.py from smart tool to utility
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 0492e66d87 [formerly d47caf2552 [formerly 6968986c535bbadee8436cca5cfcc329d47c606b]]
Former-commit-id: d47caf2552
Former-commit-id: 466b38d20d
|
2015-04-02 10:48:25 -04:00 |
|
Rici.Yu
|
d47caf2552
|
ASM #17194 - convert SerpConfig.py from smart tool to utility
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 6968986c535bbadee8436cca5cfcc329d47c606b
|
2015-04-02 10:48:25 -04:00 |
|
Ron Anderson
|
0ddda332a3
|
Omaha #4288 Fixed widget is dispose error in FileTreeView
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9
Former-commit-id: 8791485de7c0885f33d03ed67cf0352406caf1a6
|
2015-04-02 09:26:13 -05:00 |
|
Ron Anderson
|
dd07ff174c
|
Omaha #4288 Fixed widget is dispose error in FileTreeView
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9
Former-commit-id: 240027df68 [formerly 0ddda332a3 [formerly 8791485de7c0885f33d03ed67cf0352406caf1a6]]
Former-commit-id: 0ddda332a3
Former-commit-id: cf01d266f1
|
2015-04-02 09:26:13 -05:00 |
|
David Gillingham
|
a7ac773da2
|
Issue #4344: Update build.properties for spellchecker plugin to include plugin.xml.
Change-Id: I1a9009ed0d165ed48c81dfd088bf6652ae68110e
Former-commit-id: bfbad2a22d [formerly a43bd0cb97 [formerly e4860cdd30d96bf7fc4347a3c92712e5350adf25]]
Former-commit-id: a43bd0cb97
Former-commit-id: c87fed86ae
|
2015-04-01 15:43:42 -05:00 |
|
David Gillingham
|
a43bd0cb97
|
Issue #4344: Update build.properties for spellchecker plugin to include plugin.xml.
Change-Id: I1a9009ed0d165ed48c81dfd088bf6652ae68110e
Former-commit-id: e4860cdd30d96bf7fc4347a3c92712e5350adf25
|
2015-04-01 15:43:42 -05:00 |
|
Jingtao Deng
|
7ce9e7833d
|
VLab Issue #6751 - DR16848 MPE color scale merge problem; fixes #6751
Change-Id: Ib85e9943c93f89b74d8f1530a99f7e819c63e7e6
Former-commit-id: 1324a6ebb687b9af972562c7b1adca402b799ced
|
2015-04-01 13:50:45 -04:00 |
|
Fay.Liang
|
8ce086e41a
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
|
2015-04-01 13:04:48 -04:00 |
|
Fay.Liang
|
7809af88b9
|
Merge tag 'OB_14.4.1-21' into master_15.1.1
14.4.1-21
Former-commit-id: f13fe9af9cb5278362da4b3c67c5997b8ecedd1a
|
2015-04-01 10:27:48 -04:00 |
|
Fay.Liang
|
3bd4d76143
|
Merge tag 'OB_14.4.1-20m' into master_15.1.1
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
|
2015-03-30 14:28:30 -04:00 |
|
David Gillingham
|
85c47683ed
|
Issue #4344: Make suggestion blacklist for spellchecker configurable via localization.
Change-Id: I1e73afcc2433329bb6b3c3200d776711dc1d7600
Former-commit-id: 2e460f4700 [formerly 19043b866a [formerly 44e092d35e214c8f11fedb1c4aee0f78e4f82acc]]
Former-commit-id: 19043b866a
Former-commit-id: e8e958c416
|
2015-03-30 11:57:33 -05:00 |
|