Richard Peter
2457d0e6f7
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: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Richard Peter
f16173803c
Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
...
Former-commit-id: dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737
2014-12-10 17:54:33 -06:00
Dave Hladky
61d25613ab
Omaha #3757 Added HTTPS flag
...
Former-commit-id: 7848dc4df9ef8faafdce556836bc71c789b74ee4
2014-12-10 17:17:12 -06:00
Bryan Kowal
aad5e554b9
Omaha #3914 - increment yajsw release
...
Former-commit-id: 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a
2014-12-10 10:34:26 -06:00
Lee Venable
9a4f87fe8f
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: d1e058cfdac1e61119308538eeaab34097f65ba2
2014-12-09 12:54:03 -06:00
Mark Peters
a721ccbcac
Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
...
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57
Former-commit-id: 447437edc9b14412615ff691784fa7545146a596
2014-12-09 11:47:22 -06:00
David Gillingham
a41cc32a40
Omaha #3885 : Fix purging of practice VTECproducts when submitted in simulated time.
...
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098
Former-commit-id: 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2
2014-12-09 11:21:29 -06:00
Lee Venable
5cdd52f6b2
Merge "Omaha #3873 - Fixed assigning timeObs for maritime record." into omaha_14.4.1
...
Former-commit-id: be1232a4e28bcd039bbe7c150932fd982212019d
2014-12-08 12:57:54 -06:00
Nathan Bowler
c07d774bd0
Omaha #1231 Fix selecting AWIPS ID
...
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e
Former-commit-id: 68e6a2fd48a062e0ca66b52098f2781a30926a80
2014-12-08 13:07:14 -05:00
Richard Peter
628324ee3c
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: 59d1091dfcf6df87d0eb30e175c863556ab73d14
2014-12-05 14:44:52 -06:00
Nathan Bowler
59f4baa5fe
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: 32621b600176a3afff5ee42228eb8cee2417c9c6
2014-12-05 15:31:46 -05:00
Slav Korolev
090bc93302
Omaha #3873 - Fixed assigning timeObs for maritime record.
...
Former-commit-id: ccdf4928b9527e85684fb0d4eaa67435f8da5559
2014-12-05 14:29:15 -05:00
Roger Ferrel
5d91f976af
Omaha #3658 Scale arrows and use consistent units.
...
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899
Former-commit-id: 0f0eafd8687edc0c10ef21495175f1e68f926577
2014-12-05 11:54:27 -06:00
Bryan Kowal
9e55db1c52
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9
2014-12-05 10:04:42 -06:00
Bryan Kowal
0d773ebd42
Omaha #3508 - fix deploy-install for yajsw.
...
Former-commit-id: 75cf2b3e03ad446408c3d201e6e36bde5f1095f2
2014-12-05 09:38:47 -06:00
Bryan Kowal
19f6551c88
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
2014-12-05 09:20:23 -06:00
Greg Armendariz
d1ba788a61
Merge "Omaha #3836 - initial commit of the groovy-based developer deployment." into omaha_14.4.1
...
Former-commit-id: 4edea3f19307e0aeb100e8fe21852994baef9c94
2014-12-05 08:57:51 -06:00
Greg Armendariz
8803a6b658
Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
...
Former-commit-id: 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23
2014-12-05 08:57:37 -06:00
Greg Armendariz
83ca3b5381
Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
...
Former-commit-id: f310e13350ba8e64e313d99a7d03d0ef3cdc6aba
2014-12-05 08:57:08 -06:00
Greg Armendariz
de088ca65b
Merge "Omaha #3216 - update postgres to use geos 3.4.2" into omaha_14.4.1
...
Former-commit-id: e524cc13694ea30fdb7ab1d8879218be4650fed6
2014-12-05 08:46:03 -06:00
Nate Jensen
0c59decfc3
Omaha #3015 correct usage of Coordinate(lon, lat)
...
Change-Id: I30029df3e963ee16e2612d5e9f29e7a0ca05a7a8
Former-commit-id: 67c3f28fa0edf3aa41726c6a9d2f18b5af586ab1
2014-12-04 19:05:38 -06:00
Bryan Kowal
71cf313666
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 9b36754ca610887a17666ceff2a1540b958913b6
2014-12-04 17:33:43 -06:00
David Gillingham
b9fe617d57
Omaha #3885 : Fix build.
...
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f
Former-commit-id: ce395804bdc86e1ea485794a0af3f931c83f3cfa
2014-12-04 17:00:00 -06:00
Bryan Kowal
8be5362dbd
Omaha #3508 - created the yajsw rpm
...
Former-commit-id: 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21
2014-12-04 16:26:55 -06:00
Bryan Kowal
c963a90ce0
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: d881ba5d55c41647e5b3c4dfecd7ea89ad7ec2eb
2014-12-04 16:17:53 -06:00
Ron Anderson
d7e0d21d27
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: 401356d7917aaf84c5ea5c8f92ca32c270d5790a
2014-12-04 15:44:46 -06:00
Ron Anderson
d19865d5d1
Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
...
Former-commit-id: 518b6de2a22f8ce80ee90f16fb8bf387e428909f
2014-12-04 13:55:24 -06:00
Nate Jensen
47b8be5b09
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
...
Former-commit-id: 84412d1185073ed35278a40150b04845c8a98de3
2014-12-04 13:24:19 -06:00
Roger Ferrel
462e0d85c0
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
2014-12-04 12:52:22 -06:00
Fay.Liang
028d6bdc33
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963
2014-12-04 13:47:03 -05:00
Fay.Liang
83a4987188
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
2014-12-04 13:46:31 -05:00
Nathan Bowler
3e7a1993e3
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: 4c64044de959e709cd00da40826b916a579c44fe
2014-12-04 13:24:04 -05:00
Greg Armendariz
6dd90bb25a
Omaha #3216 - update postgres to use geos 3.4.2
...
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b
Former-commit-id: 453247c7731adb5e1ca4e58306d14715c0f3a350
2014-12-04 11:34:45 -06:00
Nate Jensen
cc41245a73
Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
...
Former-commit-id: 96183baeadd2dcfdc4a1dd0e9199b728f49209bf
2014-12-04 11:28:01 -06:00
Mark Peters
bd3ed3935c
Omaha #3709 Support foreground/background colors by user for group chats without shared display
...
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: 73d8510ef265b47d2d45f36be3609ef8f35ece12
2014-12-04 10:37:53 -06:00
Ron Anderson
5169e7181f
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: 16e32018de233fb128a7518415b84e032074932f
2014-12-04 10:01:18 -06:00
Richard Peter
cdb38349fb
Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
...
Former-commit-id: b9afcd679acd000742ad31944b234118b6973946
2014-12-04 09:45:48 -06:00
Nate Jensen
0ffdb0ff98
Omaha #3549 fix developer deploy
...
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd
Former-commit-id: a713b9c70f48995fa52fc76a4d6db8712e3257e7
2014-12-04 09:05:54 -06:00
Nate Jensen
7fed5d8e25
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 0a84cfa53c5565f3bf598b21aa5a7d71bc012543
2014-12-04 09:00:45 -06:00
Nate Jensen
a8cfb57aef
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec
Former-commit-id: 355f20818dc20b86de630e29cb18647c5878f118
2014-12-03 18:00:03 -06:00
Nate Jensen
19d14b6107
Omaha #3549 remove dead code
...
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 70209fbc92c5459dab007224e1f5783a5bb08fd0
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
65431db2c9
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 58946bb4ff319ac5c4c84e63268ec1149c9cede0
2014-12-03 17:14:42 -06:00
Lee Venable
3acfa2eda5
Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
...
Former-commit-id: ab453bf60d663e731dcf273aeabf07472a061d90
2014-12-03 16:49:48 -06:00
Nate Jensen
ac98f9730c
Omaha #3549 remove dead code
...
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: b597b4e3151d4e91b3e1db1a02135d33014850d8
2014-12-03 16:21:10 -06:00
Nate Jensen
ec28d2f1a0
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Nate Jensen
e78c319329
Omaha #3549 fix frozen time sizing
...
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141
Former-commit-id: 5d4601f7c15323a9f926a325656843e5092e23bb
2014-12-03 14:29:52 -06:00
Nate Jensen
55817ea845
Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
...
Former-commit-id: 306c64193d02d065bba1c792e13aa34bafb6e9c3
2014-12-03 14:14:36 -06:00
Juliya Dynina
c431691d06
Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
...
Former-commit-id: 2ebcc016732b0405b183b0e4e56d528a24e9cbdf
2014-12-03 14:40:12 -05:00
Dave Hladky
3c2f18f454
Omaha #3831 Alleviate memory usage in Template creation
...
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2
Former-commit-id: dd40b635fa20789be1f4a8502530e00f264c7966
2014-12-03 12:39:04 -06:00
steve.naples
c4fad58bd9
ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
...
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4
Former-commit-id: 862cb7c4d789915067558c4508cf5f1e45a2cdf2
2014-12-03 18:35:19 +00:00
