Lee Venable
a9e77a8ee9
Merge "Omaha #3709 Add icon that displays text colors next to color change menu items" into omaha_14.4.1
...
Former-commit-id: b3b6b164ed6812dc291c
2014-12-12 14:00:43 -06:00
Mark Peters
1332b58355
Omaha #3709 Add icon that displays text colors next to color change menu items
...
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42
Former-commit-id: 7b591d8a6805eabb4a91
2014-12-12 13:09:14 -06:00
Slav Korolev
2c423adede
Omaha #3888 - Fixed NPE error in the process() method.Corrected
...
Former-commit-id: 63014f65c7ed97d72dcb
2014-12-12 12:29:03 -05:00
Lee Venable
219c690931
Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1
...
Former-commit-id: e036b3e70e2bc4cfdaae
2014-12-12 11:20:19 -06:00
Richard Peter
cc41ebd2e0
Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
...
Former-commit-id: 644a076c765ce93f49eb
2014-12-12 10:57:15 -06:00
Slav Korolev
1b5bbd269e
Omaha #3888 - Fixed NPE error in the process() method.
...
Former-commit-id: 4abd2fc8379cf99b9e88
2014-12-12 11:53:59 -05:00
Richard Peter
f7d8755ba9
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: 2457d0e6f78de1ebcb65
2014-12-12 10:36:04 -06:00
Slav Korolev
7a115d7f58
Omaha #3220 - Moved refreshing of table in the UI thread.
...
Former-commit-id: d06882f4c9fd3a6ea199
2014-12-11 15:38:47 -05:00
Richard Peter
9c162af96a
Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
...
Former-commit-id: f16173803c08734bb4e1
2014-12-10 17:54:33 -06:00
Dave Hladky
0e15b23b5f
Omaha #3757 Added HTTPS flag
...
Former-commit-id: 61d25613ab337f67b136
2014-12-10 17:17:12 -06:00
Bryan Kowal
9efc72561b
Omaha #3914 - increment yajsw release
...
Former-commit-id: aad5e554b90b65eb314d
2014-12-10 10:34:26 -06:00
Lee Venable
165b3fcb64
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: 9a4f87fe8f6b346b22e0
2014-12-09 12:54:03 -06:00
Mark Peters
dbceca27e6
Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
...
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57
Former-commit-id: a721ccbcac1880d72b9d
2014-12-09 11:47:22 -06:00
David Gillingham
877d75d520
Omaha #3885 : Fix purging of practice VTECproducts when submitted in simulated time.
...
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098
Former-commit-id: a41cc32a40ae5a0f55d1
2014-12-09 11:21:29 -06:00
Lee Venable
e9cd246339
Merge "Omaha #3873 - Fixed assigning timeObs for maritime record." into omaha_14.4.1
...
Former-commit-id: 5cdd52f6b2a60130beba
2014-12-08 12:57:54 -06:00
Nathan Bowler
b25d850fbb
Omaha #1231 Fix selecting AWIPS ID
...
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e
Former-commit-id: c07d774bd006c94a25b7
2014-12-08 13:07:14 -05:00
Richard Peter
27b41a0550
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: 628324ee3c25dd53d440
2014-12-05 14:44:52 -06:00
Nathan Bowler
1fa26e89c6
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: 59f4baa5fe18e1ede6a1
2014-12-05 15:31:46 -05:00
Slav Korolev
f697594b73
Omaha #3873 - Fixed assigning timeObs for maritime record.
...
Former-commit-id: 090bc9330263026ac59b
2014-12-05 14:29:15 -05:00
Roger Ferrel
335f9b862e
Omaha #3658 Scale arrows and use consistent units.
...
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899
Former-commit-id: 5d91f976af64b8d193f4
2014-12-05 11:54:27 -06:00
Bryan Kowal
7575599185
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 9e55db1c529e77b9635e
2014-12-05 10:04:42 -06:00
Bryan Kowal
9779219edb
Omaha #3508 - fix deploy-install for yajsw.
...
Former-commit-id: 0d773ebd4290f15ff22c
2014-12-05 09:38:47 -06:00
Bryan Kowal
9f5297504d
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: 19f6551c8848ec32e595
2014-12-05 09:20:23 -06:00
Greg Armendariz
a53ee54262
Merge "Omaha #3836 - initial commit of the groovy-based developer deployment." into omaha_14.4.1
...
Former-commit-id: d1ba788a61d2691afb97
2014-12-05 08:57:51 -06:00
Greg Armendariz
f307a34150
Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
...
Former-commit-id: 8803a6b658610f38e9ef
2014-12-05 08:57:37 -06:00
Greg Armendariz
9883443470
Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
...
Former-commit-id: 83ca3b5381ed42ecc0e8
2014-12-05 08:57:08 -06:00
Greg Armendariz
e4893b65d7
Merge "Omaha #3216 - update postgres to use geos 3.4.2" into omaha_14.4.1
...
Former-commit-id: de088ca65b180a1cb4f2
2014-12-05 08:46:03 -06:00
Nate Jensen
3bcac4fb47
Omaha #3015 correct usage of Coordinate(lon, lat)
...
Change-Id: I30029df3e963ee16e2612d5e9f29e7a0ca05a7a8
Former-commit-id: 0c59decfc34a934687aa
2014-12-04 19:05:38 -06:00
Bryan Kowal
ccb7cead64
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 71cf3136660894efaaa3
2014-12-04 17:33:43 -06:00
David Gillingham
5714cf8dac
Omaha #3885 : Fix build.
...
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f
Former-commit-id: b9fe617d579c7eff77f6
2014-12-04 17:00:00 -06:00
Bryan Kowal
c3bb142d88
Omaha #3508 - created the yajsw rpm
...
Former-commit-id: 8be5362dbd127db6aaee
2014-12-04 16:26:55 -06:00
Bryan Kowal
176d002ad4
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: c963a90ce05b7f86d9d4
2014-12-04 16:17:53 -06:00
Ron Anderson
3d7d560a9e
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: d7e0d21d27e0b9900a50
2014-12-04 15:44:46 -06:00
Ron Anderson
2c7983c262
Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
...
Former-commit-id: d19865d5d11a26141b89
2014-12-04 13:55:24 -06:00
Nate Jensen
2c282f9565
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
...
Former-commit-id: 47b8be5b0913bd914319
2014-12-04 13:24:19 -06:00
Roger Ferrel
c9f619028d
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 462e0d85c0597fdb8280
2014-12-04 12:52:22 -06:00
Fay.Liang
2c766a5b28
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 028d6bdc33f5095bed4e
2014-12-04 13:47:03 -05:00
Fay.Liang
19d1be03e0
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 83a498718819194e0aa3
2014-12-04 13:46:31 -05:00
Nathan Bowler
af2193ed2c
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: 3e7a1993e3e1af24d84e
2014-12-04 13:24:04 -05:00
Greg Armendariz
aba34ca613
Omaha #3216 - update postgres to use geos 3.4.2
...
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b
Former-commit-id: 6dd90bb25a1b1064d541
2014-12-04 11:34:45 -06:00
Nate Jensen
2ac1d5a369
Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
...
Former-commit-id: cc41245a73d4ce4aab6b
2014-12-04 11:28:01 -06:00
Mark Peters
b8c96687c3
Omaha #3709 Support foreground/background colors by user for group chats without shared display
...
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: bd3ed3935c7ae71cf1dc
2014-12-04 10:37:53 -06:00
Ron Anderson
a882a8f0d1
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: 5169e7181f2417d5a2a7
2014-12-04 10:01:18 -06:00
Richard Peter
4ba786caf6
Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
...
Former-commit-id: cdb38349fbd03177a68a
2014-12-04 09:45:48 -06:00
Nate Jensen
3e45aa78db
Omaha #3549 fix developer deploy
...
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd
Former-commit-id: 0ffdb0ff9899fa52c311
2014-12-04 09:05:54 -06:00
Nate Jensen
1bb305290f
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 7fed5d8e2568973ea94c
2014-12-04 09:00:45 -06:00
Nate Jensen
1bf02a52ae
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec
Former-commit-id: a8cfb57aef19cfdd12f4
2014-12-03 18:00:03 -06:00
Nate Jensen
a126a2290b
Omaha #3549 remove dead code
...
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 19d14b610725e09348c0
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
e9e4caa755
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 65431db2c947d1ae9825
2014-12-03 17:14:42 -06:00
Lee Venable
a606683c81
Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
...
Former-commit-id: 3acfa2eda55ab799b56f
2014-12-03 16:49:48 -06:00
