Bradley.Mabe
196be14989
Merge branch 'omaha_14.4.1' into ncep_14.4.1
...
Former-commit-id: 858bacc6ca858bacc6ca752d081ba62eb85efac3
2014-12-18 13:15:43 -05:00
Stephen Gilbert
b6b587a86f
Merge branch 'ncep_14.2.2-n' into ncep_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/dao/NcUairToRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.gempak/src/gov/noaa/nws/ncep/viz/gempak/util/GempakGrid.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
tests/.classpath
Former-commit-id: 33c9f191b433c9f191b40911e5a4ef93d92085ec
2014-12-16 13:06:21 -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
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
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
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
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
Nathan Bowler
a6e2f72f84
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: 3e7a1993e33e7a1993e3e1af24d84eaf2193ed2c
2014-12-04 13:24:04 -05:00
Greg Armendariz
88cd053b81
Omaha #3216 - update postgres to use geos 3.4.2
...
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b
Former-commit-id: 6dd90bb25a6dd90bb25a1b1064d541aba34ca613
2014-12-04 11:34:45 -06:00
Nate Jensen
925b9fcba9
Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
...
Former-commit-id: cc41245a73cc41245a73d4ce4aab6b2ac1d5a369
2014-12-04 11:28:01 -06:00
Mark Peters
f1d2c729fb
Omaha #3709 Support foreground/background colors by user for group chats without shared display
...
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: bd3ed3935cbd3ed3935c7ae71cf1dcb8c96687c3
2014-12-04 10:37:53 -06:00
Ron Anderson
89ce99fde1
Omaha #3885 : Merge VTEC route and request changes from VLab.
...
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9
Former-commit-id: 5169e7181f5169e7181f2417d5a2a7a882a8f0d1
2014-12-04 10:01:18 -06:00
Richard Peter
de2538521e
Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
...
Former-commit-id: cdb38349fbcdb38349fbd03177a68a4ba786caf6
2014-12-04 09:45:48 -06:00
Nate Jensen
27a14f3a1b
Omaha #3549 fix developer deploy
...
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd
Former-commit-id: 0ffdb0ff980ffdb0ff9899fa52c3113e45aa78db
2014-12-04 09:05:54 -06:00
Nate Jensen
6ea7f5572f
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 7fed5d8e257fed5d8e2568973ea94c1bb305290f
2014-12-04 09:00:45 -06:00
Nate Jensen
59f8e0233e
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec
Former-commit-id: a8cfb57aefa8cfb57aef19cfdd12f41bf02a52ae
2014-12-03 18:00:03 -06:00
Nate Jensen
20fef1386d
Omaha #3549 remove dead code
...
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 19d14b610719d14b610725e09348c0a126a2290b
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
f74fbb95b7
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 65431db2c965431db2c947d1ae9825e9e4caa755
2014-12-03 17:14:42 -06:00
Lee Venable
729971f9c8
Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
...
Former-commit-id: 3acfa2eda53acfa2eda55ab799b56fa606683c81
2014-12-03 16:49:48 -06:00
Nate Jensen
4b4b404d0d
Omaha #3549 remove dead code
...
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: ac98f9730cac98f9730c1b4db26cd83c3437b8cc
2014-12-03 16:21:10 -06:00
Nate Jensen
e53063661e
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: ec28d2f1a0ec28d2f1a08dbe6abbe4291de3f039
2014-12-03 15:47:10 -06:00
Nate Jensen
b694406add
Omaha #3549 fix frozen time sizing
...
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141
Former-commit-id: e78c319329e78c319329d26ba30c880ad33b4c53
2014-12-03 14:29:52 -06:00
Nate Jensen
9e23d82ad0
Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
...
Former-commit-id: 55817ea84555817ea8453b0fdec2e523f34891a9
2014-12-03 14:14:36 -06:00
Dave Hladky
89dc7ffa97
Omaha #3831 Alleviate memory usage in Template creation
...
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2
Former-commit-id: 3c2f18f4543c2f18f45445ebc9cd05c8ca0f8cc0
2014-12-03 12:39:04 -06:00
Lee Venable
07c95313bb
Merge "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." into omaha_14.4.1
...
Former-commit-id: 18e897619318e89761937aba701fdd60e959c77d
2014-12-02 17:49:54 -06:00
Bryan Kowal
b71482c5ae
Merge "Omaha #3216 - Increment pypies release number" into omaha_14.4.1
...
Former-commit-id: 79500123f179500123f159e79603c9370c4ce466
2014-12-02 15:45:37 -06:00
Nate Jensen
0d64677b42
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 8bf1cdc69f8bf1cdc69f02112622278ff10d37bf
2014-12-02 15:25:58 -06:00
Greg Armendariz
2b3b672618
Omaha #3216 - Increment pypies release number
...
Former-commit-id: 7ac9281ba67ac9281ba644af2c4ff1bed2187d35
2014-12-02 14:45:04 -06:00
Ron Anderson
165c3c5f50
Merge "Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time." into omaha_14.4.1
...
Former-commit-id: 45ab0cd4d045ab0cd4d03abd48731751380e1dc9
2014-12-02 12:34:23 -06:00
Nate Jensen
171900df06
Merge "Omaha #3709 Support foreground/background colors by site for nws-collaborate room" into omaha_14.4.1
...
Former-commit-id: 370a090480370a09048099b30457c5b2e5a6f790
2014-12-02 12:08:22 -06:00
