Richard Peter
f2babdc51a
Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
...
Former-commit-id: 644a076c76644a076c765ce93f49ebcc41ebd2e0
2014-12-12 10:57:15 -06:00
Slav Korolev
fc8c0afbba
Omaha #3888 - Fixed NPE error in the process() method.
...
Former-commit-id: 4abd2fc8374abd2fc8379cf99b9e881b5bbd269e
2014-12-12 11:53:59 -05:00
Richard Peter
bf3ddbb62b
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: 2457d0e6f72457d0e6f78de1ebcb65f7d8755ba9
2014-12-12 10:36:04 -06:00
Juliya Dynina
c3b8d85e05
Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
...
Former-commit-id: ecaaa1f9fdecaaa1f9fda62ee436c2609eeb74d7
2014-12-12 11:05:02 -05:00
Michael Gamazaychikov
f9c9765041
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
...
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 94f06ccbc994f06ccbc940f0e77f30ab1c6feb4e
2014-12-11 19:37:00 -05:00
Slav Korolev
0854178325
Omaha #3220 - Moved refreshing of table in the UI thread.
...
Former-commit-id: d06882f4c9d06882f4c9fd3a6ea1997a115d7f58
2014-12-11 15:38:47 -05:00
Jingtao Deng
4107949e84
VLab Issue #5062 - DR17605 Hydro Alert/Alarm mismatched report format between A1 and A2; fixes #5062
...
Change-Id: Ie5d29a5f2d375d473fe79b990019f757b20ad0bc
Former-commit-id: fdd49db3c5fdd49db3c5831dbd1db6b1ebee95ae
2014-12-11 11:14:52 -05:00
Richard Peter
a6fff5273d
Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
...
Former-commit-id: f16173803cf16173803c08734bb4e19c162af96a
2014-12-10 17:54:33 -06:00
Dave Hladky
d5280b3cae
Omaha #3757 Added HTTPS flag
...
Former-commit-id: 61d25613ab61d25613ab337f67b1360e15b23b5f
2014-12-10 17:17:12 -06:00
Juliya Dynina
d44b8793cb
Merge "ASM #628 - Fixed Crest time" into asm_14.4.1
...
Former-commit-id: 47ddfd8c6947ddfd8c69ac47f1ca21df7780490d
2014-12-10 15:13:54 -05:00
Loubna Bousaidi
a8a275661c
ASM #628 - Fixed Crest time
...
Change-Id: I5f9f58cfdb1689f331628498a781bb60f5549ac5
Former-commit-id: fb5031e5b8fb5031e5b82facd8c54756de54490b
2014-12-10 20:01:42 +00:00
Bryan Kowal
e3bad2212b
Omaha #3914 - increment yajsw release
...
Former-commit-id: aad5e554b9aad5e554b90b65eb314d9efc72561b
2014-12-10 10:34:26 -06:00
David Friedman
094309fd8e
ASM #11982 - Print Icon in CAVE does not print (Actually fix print-to-file)
...
Change-Id: I89c581065424da5dbe5108e98fcc76f7381c911c
Former-commit-id: 851f67c5e7851f67c5e791bc857ffca077dee577
2014-12-09 21:57:21 +00:00
Juliya Dynina
eeb3bf2568
Merge "ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization" into asm_14.4.1
...
Former-commit-id: 8e7811740e8e7811740e25a4e0f86820d92cb22b
2014-12-09 14:13:30 -05:00
Lee Venable
77d5d861f8
Merge "Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list" into omaha_14.4.1
...
Former-commit-id: 9a4f87fe8f9a4f87fe8f6b346b22e0165b3fcb64
2014-12-09 12:54:03 -06:00
Mark Peters
8496792ecd
Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
...
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57
Former-commit-id: a721ccbcaca721ccbcac1880d72b9ddbceca27e6
2014-12-09 11:47:22 -06:00
Juliya Dynina
ba122fbc8c
Merge "ASM #16859 - Text decoder processes collectives inefficiently" into asm_14.4.1
...
Former-commit-id: 3b710ebee13b710ebee1bcb7eb353c6957bda0ea
2014-12-09 12:22:39 -05:00
David Gillingham
cb407d5749
Omaha #3885 : Fix purging of practice VTECproducts when submitted in simulated time.
...
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098
Former-commit-id: a41cc32a40a41cc32a40ae5a0f55d1877d75d520
2014-12-09 11:21:29 -06:00
Sean Webb
95171c9df3
Merge "ASM #15662 - Updated spec files to include AWIPS version" into asm_14.4.1
...
Former-commit-id: aa3cec8c99aa3cec8c9939b09b89474d65c95cf0
2014-12-09 10:41:38 -05:00
Brian Graham
10fd784dd7
ASM #15662 - Updated spec files to include AWIPS version
...
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f
Former-commit-id: 99143e004599143e0045e1b4c4abe324ca442651
2014-12-09 09:25:59 -05:00
Juliya Dynina
4e98b18a5e
Merge "ASM #634 - Missing Data not getting into HML file" into asm_14.4.1
...
Former-commit-id: 669525e06d669525e06db70186d356f17e270040
2014-12-09 08:04:00 -05:00
Xuezhi.Wei
0a55cc829e
ASM #634 - Missing Data not getting into HML file
...
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b
Former-commit-id: ac19b4b08dac19b4b08de40018f2e177fcb44555
2014-12-08 20:48:40 +00:00
Lee Venable
b5336562fa
Merge "Omaha #3873 - Fixed assigning timeObs for maritime record." into omaha_14.4.1
...
Former-commit-id: 5cdd52f6b25cdd52f6b2a60130bebae9cd246339
2014-12-08 12:57:54 -06:00
Nathan Bowler
4f917a9642
Omaha #1231 Fix selecting AWIPS ID
...
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e
Former-commit-id: c07d774bd0c07d774bd006c94a25b7b25d850fbb
2014-12-08 13:07:14 -05:00
Steve Harris
fdd138f174
Merge branch 'omaha_14.4.1' into omaha_pgen
...
Former-commit-id: 46ef76326a46ef76326ac7420a90748209f732d5
2014-12-08 11:25:28 -06:00
Richard Peter
ca376b5a92
Merge "Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled" into omaha_14.4.1
...
Former-commit-id: 628324ee3c628324ee3c25dd53d44027b41a0550
2014-12-05 14:44:52 -06:00
Nathan Bowler
bf66115f2f
Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
...
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474
Former-commit-id: 59f4baa5fe59f4baa5fe18e1ede6a11fa26e89c6
2014-12-05 15:31:46 -05:00
Slav Korolev
574b4b694f
Omaha #3873 - Fixed assigning timeObs for maritime record.
...
Former-commit-id: 090bc93302090bc9330263026ac59bf697594b73
2014-12-05 14:29:15 -05:00
Roger Ferrel
526855c99a
Omaha #3658 Scale arrows and use consistent units.
...
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899
Former-commit-id: 5d91f976af5d91f976af64b8d193f4335f9b862e
2014-12-05 11:54:27 -06:00
Bryan Kowal
cc4ee08244
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 9e55db1c529e55db1c529e77b9635e7575599185
2014-12-05 10:04:42 -06:00
Bryan Kowal
8d09387266
Omaha #3508 - fix deploy-install for yajsw.
...
Former-commit-id: 0d773ebd420d773ebd4290f15ff22c9779219edb
2014-12-05 09:38:47 -06:00
Bryan Kowal
ec8371db52
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: 19f6551c8819f6551c8848ec32e5959f5297504d
2014-12-05 09:20:23 -06:00
Steve Harris
028e23c041
Merge omaha_14.4.1 (commit '67c3f28') into omaha_pgen
...
Former-commit-id: 9c90e8bf309c90e8bf30b373614dfbf38b08ed30
2014-12-05 09:06:40 -06:00
Greg Armendariz
b59186424c
Merge "Omaha #3836 - initial commit of the groovy-based developer deployment." into omaha_14.4.1
...
Former-commit-id: d1ba788a61d1ba788a61d2691afb97a53ee54262
2014-12-05 08:57:51 -06:00
Greg Armendariz
2d6ab26fd8
Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
...
Former-commit-id: 8803a6b6588803a6b658610f38e9eff307a34150
2014-12-05 08:57:37 -06:00
Greg Armendariz
c87e692d9c
Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
...
Former-commit-id: 83ca3b538183ca3b5381ed42ecc0e89883443470
2014-12-05 08:57:08 -06:00
Greg Armendariz
4cf0c5d0f4
Merge "Omaha #3216 - update postgres to use geos 3.4.2" into omaha_14.4.1
...
Former-commit-id: de088ca65bde088ca65b180a1cb4f2e4893b65d7
2014-12-05 08:46:03 -06:00
Nate Jensen
4582a5c05c
Omaha #3015 correct usage of Coordinate(lon, lat)
...
Change-Id: I30029df3e963ee16e2612d5e9f29e7a0ca05a7a8
Former-commit-id: 0c59decfc30c59decfc34a934687aa3bcac4fb47
2014-12-04 19:05:38 -06:00
Bryan Kowal
d55f5e0c63
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 71cf31366671cf3136660894efaaa3ccb7cead64
2014-12-04 17:33:43 -06:00
David Gillingham
bd06453882
Omaha #3885 : Fix build.
...
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f
Former-commit-id: b9fe617d57b9fe617d579c7eff77f65714cf8dac
2014-12-04 17:00:00 -06:00
Bryan Kowal
27686d8783
Omaha #3508 - created the yajsw rpm
...
Former-commit-id: 8be5362dbd8be5362dbd127db6aaeec3bb142d88
2014-12-04 16:26:55 -06:00
Bryan Kowal
5f3ca819dd
Omaha #3836 - initial commit of the groovy-based developer deployment.
...
Please refer to the: build/deploy.edex/ReadMe.txt
amend: remove files that are not used by the developer deployment
Change-Id: I7caaf61e88d315ea0d065d46036d3ba9530c29ec
Former-commit-id: c963a90ce0c963a90ce05b7f86d9d4176d002ad4
2014-12-04 16:17:53 -06:00
Ron Anderson
c34aa4047a
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: d7e0d21d27d7e0d21d27e0b9900a503d7d560a9e
2014-12-04 15:44:46 -06:00
Ron Anderson
11932beb18
Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
...
Former-commit-id: d19865d5d1d19865d5d11a26141b892c7983c262
2014-12-04 13:55:24 -06:00
Nate Jensen
bf0facbe67
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
...
Former-commit-id: 47b8be5b0947b8be5b0913bd9143192c282f9565
2014-12-04 13:24:19 -06:00
Roger Ferrel
ab0c6581b2
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 462e0d85c0462e0d85c0597fdb8280c9f619028d
2014-12-04 12:52:22 -06:00
Fay.Liang
5bccfb2329
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 028d6bdc33028d6bdc33f5095bed4e2c766a5b28
2014-12-04 13:47:03 -05:00
Fay.Liang
d3c8b8a470
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 83a498718883a498718819194e0aa319d1be03e0
2014-12-04 13:46:31 -05:00
Bingfan Yin
c32bc7a6a1
VLab Issue #5413 - Changes for PGEN in D2D fourth try
...
Change-Id: Iec34f20209748a661ee07d2960bd79132233cf1a
Former-commit-id: 5fc47fb52d5fc47fb52dfe2010b4ec5e5ddae357
2014-12-04 13:38:50 -05:00
Nathan Bowler
a6e2f72f84
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: 3e7a1993e33e7a1993e3e1af24d84eaf2193ed2c
2014-12-04 13:24:04 -05:00
