Richard Peter
|
59e9fe78f2
|
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: 23eafaba3d [formerly 2457d0e6f7] [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885 [formerly f7d8755ba9]
Former-commit-id: bf3ddbb62b
|
2014-12-12 10:36:04 -06:00 |
|
Juliya Dynina
|
034fc1cd67
|
Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
Former-commit-id: 790b5a47f2 [formerly ecaaa1f9fd] [formerly 790b5a47f2 [formerly ecaaa1f9fd] [formerly a62ee436c2 [formerly 63036a13a555c9a1e7fab05dd48a369221fc27b9]]]
Former-commit-id: a62ee436c2
Former-commit-id: 9d5503a7b8 [formerly 609eeb74d7]
Former-commit-id: c3b8d85e05
|
2014-12-12 11:05:02 -05:00 |
|
Ana Rivera
|
1c09e46c99
|
Merge "VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129" into field_14.4.1
Former-commit-id: b9fe58ea8b [formerly 41c487a291] [formerly b9fe58ea8b [formerly 41c487a291] [formerly 062d78a6e8 [formerly 3934ea2d8dc5507899ee6942e327c7c5d8eb28cf]]]
Former-commit-id: 062d78a6e8
Former-commit-id: bfe43f2b24 [formerly c7acf3c46f]
Former-commit-id: 4d61d265b3
|
2014-12-12 15:42:39 +00:00 |
|
Michael Gamazaychikov
|
9e62b21e10
|
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 6123ee67c1 [formerly 94f06ccbc9] [formerly 6123ee67c1 [formerly 94f06ccbc9] [formerly 40f0e77f30 [formerly 3c1ce33424799b39db14f909d8de2946e5aca1bc]]]
Former-commit-id: 40f0e77f30
Former-commit-id: 082fb31b94 [formerly ab1c6feb4e]
Former-commit-id: f9c9765041
|
2014-12-11 19:37:00 -05:00 |
|
Slav Korolev
|
264aa14206
|
Omaha #3220 - Moved refreshing of table in the UI thread.
Former-commit-id: 974cc09ca5 [formerly d06882f4c9] [formerly 974cc09ca5 [formerly d06882f4c9] [formerly fd3a6ea199 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004]]]
Former-commit-id: fd3a6ea199
Former-commit-id: a64df60d4c [formerly 7a115d7f58]
Former-commit-id: 0854178325
|
2014-12-11 15:38:47 -05:00 |
|
Joshua Watson
|
8789ca8e8e
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: 0c8b629c96 [formerly a8f5bb480b] [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]
Former-commit-id: bca4b40eed
Former-commit-id: ce1476d78f [formerly 9383635749]
Former-commit-id: 33e4b8bc88
|
2014-12-11 11:39:00 -05:00 |
|
Richard Peter
|
333701f9f9
|
Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
Former-commit-id: 46611ec961 [formerly f16173803c] [formerly 46611ec961 [formerly f16173803c] [formerly 08734bb4e1 [formerly dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737]]]
Former-commit-id: 08734bb4e1
Former-commit-id: 2cd131629e [formerly 9c162af96a]
Former-commit-id: a6fff5273d
|
2014-12-10 17:54:33 -06:00 |
|
Dave Hladky
|
b0468116f5
|
Omaha #3757 Added HTTPS flag
Former-commit-id: a69c83e534 [formerly 61d25613ab] [formerly a69c83e534 [formerly 61d25613ab] [formerly 337f67b136 [formerly 7848dc4df9ef8faafdce556836bc71c789b74ee4]]]
Former-commit-id: 337f67b136
Former-commit-id: 7d58dacbba [formerly 0e15b23b5f]
Former-commit-id: d5280b3cae
|
2014-12-10 17:17:12 -06:00 |
|
Juliya Dynina
|
fe1b88aec0
|
Merge "ASM #628 - Fixed Crest time" into asm_14.4.1
Former-commit-id: 66961409ac [formerly 47ddfd8c69] [formerly 66961409ac [formerly 47ddfd8c69] [formerly ac47f1ca21 [formerly 909dba375f65ef5d1a9b984758f049728e1d4700]]]
Former-commit-id: ac47f1ca21
Former-commit-id: 6573765139 [formerly df7780490d]
Former-commit-id: d44b8793cb
|
2014-12-10 15:13:54 -05:00 |
|
Loubna Bousaidi
|
f48c2f643d
|
ASM #628 - Fixed Crest time
Change-Id: I5f9f58cfdb1689f331628498a781bb60f5549ac5
Former-commit-id: 52364ff0eb [formerly fb5031e5b8] [formerly 52364ff0eb [formerly fb5031e5b8] [formerly 2facd8c547 [formerly cddb0ff5626f25dd3555853d578928d7b93dcacb]]]
Former-commit-id: 2facd8c547
Former-commit-id: dcea3fa0a7 [formerly 56de54490b]
Former-commit-id: a8a275661c
|
2014-12-10 20:01:42 +00:00 |
|
David Friedman
|
8112029883
|
ASM #11982 - Print Icon in CAVE does not print (Actually fix print-to-file)
Change-Id: I89c581065424da5dbe5108e98fcc76f7381c911c
Former-commit-id: 0f9d3f5f4f [formerly 851f67c5e7] [formerly 0f9d3f5f4f [formerly 851f67c5e7] [formerly 91bc857ffc [formerly d3b32c796f36148386120cfe46fb9b098d66a643]]]
Former-commit-id: 91bc857ffc
Former-commit-id: d2a02d0ec2 [formerly a077dee577]
Former-commit-id: 094309fd8e
|
2014-12-09 21:57:21 +00:00 |
|
Juliya Dynina
|
28856fb16d
|
Merge "ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization" into asm_14.4.1
Former-commit-id: 36b1144775 [formerly 8e7811740e] [formerly 36b1144775 [formerly 8e7811740e] [formerly 25a4e0f868 [formerly 6ec74c43a16cd6dade550b4bfc0c4163ce0f7454]]]
Former-commit-id: 25a4e0f868
Former-commit-id: 37add68b21 [formerly 20d92cb22b]
Former-commit-id: eeb3bf2568
|
2014-12-09 14:13:30 -05:00 |
|
Mark Peters
|
c75be31133
|
Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57
Former-commit-id: e1bf45baef [formerly a721ccbcac] [formerly e1bf45baef [formerly a721ccbcac] [formerly 1880d72b9d [formerly 447437edc9b14412615ff691784fa7545146a596]]]
Former-commit-id: 1880d72b9d
Former-commit-id: 2c8f6b6132 [formerly dbceca27e6]
Former-commit-id: 8496792ecd
|
2014-12-09 11:47:22 -06:00 |
|
Juliya Dynina
|
f427a8f034
|
Merge "ASM #634 - Missing Data not getting into HML file" into asm_14.4.1
Former-commit-id: bc03e466ef [formerly 669525e06d] [formerly bc03e466ef [formerly 669525e06d] [formerly b70186d356 [formerly 08bac3a76f734a7acc543069bcc73969e2c02ccd]]]
Former-commit-id: b70186d356
Former-commit-id: 3c38845d72 [formerly f17e270040]
Former-commit-id: 4e98b18a5e
|
2014-12-09 08:04:00 -05:00 |
|
Xuezhi.Wei
|
cfe2e20f64
|
ASM #634 - Missing Data not getting into HML file
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b
Former-commit-id: c0a72e92bf [formerly ac19b4b08d] [formerly c0a72e92bf [formerly ac19b4b08d] [formerly e40018f2e1 [formerly 947f9dd3435219ff32890cc4a26d8ae5e43686cf]]]
Former-commit-id: e40018f2e1
Former-commit-id: f71838abb9 [formerly 77fcb44555]
Former-commit-id: 0a55cc829e
|
2014-12-08 20:48:40 +00:00 |
|
Nathan Bowler
|
091648a348
|
Omaha #1231 Fix selecting AWIPS ID
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e
Former-commit-id: 3baaa2ea5e [formerly c07d774bd0] [formerly 3baaa2ea5e [formerly c07d774bd0] [formerly 06c94a25b7 [formerly 68e6a2fd48a062e0ca66b52098f2781a30926a80]]]
Former-commit-id: 06c94a25b7
Former-commit-id: f72df72bc1 [formerly b25d850fbb]
Former-commit-id: 4f917a9642
|
2014-12-08 13:07:14 -05:00 |
|
Jordan Gerth
|
171382d923
|
VLab Issue #5422 - Make warning polygon outline settable in bundle file
Change-Id: I3f6395fa143a9ff54b748490795ecffb2cc35979
Former-commit-id: 763f8876c8 [formerly 02ed7390d2] [formerly 763f8876c8 [formerly 02ed7390d2] [formerly c9eabcc1d4 [formerly ab9de202c00d86fba4851a733c9b6977eccf73d1]]]
Former-commit-id: c9eabcc1d4
Former-commit-id: bfdffbf940 [formerly 74fc60a2fa]
Former-commit-id: f6a489d9d8
|
2014-12-05 17:10:26 -06:00 |
|
Nathan Bowler
|
9c06b6c433
|
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: 907425cb04 [formerly 59f4baa5fe] [formerly 907425cb04 [formerly 59f4baa5fe] [formerly 18e1ede6a1 [formerly 32621b600176a3afff5ee42228eb8cee2417c9c6]]]
Former-commit-id: 18e1ede6a1
Former-commit-id: 28a002c7ee [formerly 1fa26e89c6]
Former-commit-id: bf66115f2f
|
2014-12-05 15:31:46 -05:00 |
|
Ron Anderson
|
3d87784ba6
|
Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: c4d27803cc [formerly d7e0d21d27] [formerly c4d27803cc [formerly d7e0d21d27] [formerly e0b9900a50 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]]
Former-commit-id: e0b9900a50
Former-commit-id: 9e61a12c32 [formerly 3d7d560a9e]
Former-commit-id: c34aa4047a
|
2014-12-04 15:44:46 -06:00 |
|
Nate Jensen
|
d0e4ee817f
|
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
Former-commit-id: 8f0375f71e [formerly 47b8be5b09] [formerly 8f0375f71e [formerly 47b8be5b09] [formerly 13bd914319 [formerly 84412d1185073ed35278a40150b04845c8a98de3]]]
Former-commit-id: 13bd914319
Former-commit-id: 0d0df3a330 [formerly 2c282f9565]
Former-commit-id: bf0facbe67
|
2014-12-04 13:24:19 -06:00 |
|
Fay.Liang
|
c4434a7051
|
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 6e9ff9e139 [formerly 028d6bdc33] [formerly 6e9ff9e139 [formerly 028d6bdc33] [formerly f5095bed4e [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]]
Former-commit-id: f5095bed4e
Former-commit-id: 05120de669 [formerly 2c766a5b28]
Former-commit-id: 5bccfb2329
|
2014-12-04 13:47:03 -05:00 |
|
Fay.Liang
|
5f6842175d
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: f327b9dd5a [formerly 83a4987188] [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]
Former-commit-id: 19194e0aa3
Former-commit-id: 3404290a55 [formerly 19d1be03e0]
Former-commit-id: d3c8b8a470
|
2014-12-04 13:46:31 -05:00 |
|
Nathan Bowler
|
ac5318dff8
|
Omaha #3848 Fix cancelling geotiff import.
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: a5bc553461 [formerly 3e7a1993e3] [formerly a5bc553461 [formerly 3e7a1993e3] [formerly e1af24d84e [formerly 4c64044de959e709cd00da40826b916a579c44fe]]]
Former-commit-id: e1af24d84e
Former-commit-id: e446d63e7d [formerly af2193ed2c]
Former-commit-id: a6e2f72f84
|
2014-12-04 13:24:04 -05:00 |
|
Nate Jensen
|
0278b68237
|
Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
Former-commit-id: 7fe0fc4cb9 [formerly cc41245a73] [formerly 7fe0fc4cb9 [formerly cc41245a73] [formerly d4ce4aab6b [formerly 96183baeadd2dcfdc4a1dd0e9199b728f49209bf]]]
Former-commit-id: d4ce4aab6b
Former-commit-id: 064962d97b [formerly 2ac1d5a369]
Former-commit-id: 925b9fcba9
|
2014-12-04 11:28:01 -06:00 |
|
Mark Peters
|
56c2821d3a
|
Omaha #3709 Support foreground/background colors by user for group chats without shared display
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: 1b30658214 [formerly bd3ed3935c] [formerly 1b30658214 [formerly bd3ed3935c] [formerly 7ae71cf1dc [formerly 73d8510ef265b47d2d45f36be3609ef8f35ece12]]]
Former-commit-id: 7ae71cf1dc
Former-commit-id: 881018690f [formerly b8c96687c3]
Former-commit-id: f1d2c729fb
|
2014-12-04 10:37:53 -06:00 |
|
Ron Anderson
|
3be3ae232b
|
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: fd25fe9efc [formerly 5169e7181f] [formerly fd25fe9efc [formerly 5169e7181f] [formerly 2417d5a2a7 [formerly 16e32018de233fb128a7518415b84e032074932f]]]
Former-commit-id: 2417d5a2a7
Former-commit-id: 2d30089bbe [formerly a882a8f0d1]
Former-commit-id: 89ce99fde1
|
2014-12-04 10:01:18 -06:00 |
|
Bruce.Hundermark
|
c064a1040b
|
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: c4ca149d67 [formerly 6f73b491f8] [formerly c4ca149d67 [formerly 6f73b491f8] [formerly c11898f30a [formerly 25f4c8acdd8975d3001528212cbc7617cfd39500]]]
Former-commit-id: c11898f30a
Former-commit-id: 7e86c51b75 [formerly d791958e8a]
Former-commit-id: cb80fe733a
|
2014-12-04 15:56:01 +00:00 |
|
Nate Jensen
|
a6230a400b
|
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: c4ffdbc7e8 [formerly 7fed5d8e25] [formerly c4ffdbc7e8 [formerly 7fed5d8e25] [formerly 68973ea94c [formerly 0a84cfa53c5565f3bf598b21aa5a7d71bc012543]]]
Former-commit-id: 68973ea94c
Former-commit-id: 58c12ff7b5 [formerly 1bb305290f]
Former-commit-id: 6ea7f5572f
|
2014-12-04 09:00:45 -06:00 |
|
Nate Jensen
|
875642c489
|
Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: cb745b34f3 [formerly 19d14b6107] [formerly cb745b34f3 [formerly 19d14b6107] [formerly 25e09348c0 [formerly 70209fbc92c5459dab007224e1f5783a5bb08fd0]]]
Former-commit-id: 25e09348c0
Former-commit-id: 27c14d5cc9 [formerly a126a2290b]
Former-commit-id: 20fef1386d
|
2014-12-03 17:35:08 -06:00 |
|
Ben Steffensmeier
|
10bf5b2438
|
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 8c69731c75 [formerly 65431db2c9] [formerly 8c69731c75 [formerly 65431db2c9] [formerly 47d1ae9825 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]]]
Former-commit-id: 47d1ae9825
Former-commit-id: 58580b09a1 [formerly e9e4caa755]
Former-commit-id: f74fbb95b7
|
2014-12-03 17:14:42 -06:00 |
|
Lee Venable
|
ff103b19ea
|
Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
Former-commit-id: 8cb91f471b [formerly 3acfa2eda5] [formerly 8cb91f471b [formerly 3acfa2eda5] [formerly 5ab799b56f [formerly ab453bf60d663e731dcf273aeabf07472a061d90]]]
Former-commit-id: 5ab799b56f
Former-commit-id: 436259994f [formerly a606683c81]
Former-commit-id: 729971f9c8
|
2014-12-03 16:49:48 -06:00 |
|
Nate Jensen
|
2941ebd3f3
|
Omaha #3549 remove dead code
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: a651246f08 [formerly ac98f9730c] [formerly a651246f08 [formerly ac98f9730c] [formerly 1b4db26cd8 [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]]]
Former-commit-id: 1b4db26cd8
Former-commit-id: 11d70597df [formerly 3c3437b8cc]
Former-commit-id: 4b4b404d0d
|
2014-12-03 16:21:10 -06:00 |
|
Nate Jensen
|
0bb18f02d0
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0] [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039]
Former-commit-id: e53063661e
|
2014-12-03 15:47:10 -06:00 |
|
Nate Jensen
|
6c893a5db3
|
Omaha #3549 fix frozen time sizing
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141
Former-commit-id: 5b7fd51d75 [formerly e78c319329] [formerly 5b7fd51d75 [formerly e78c319329] [formerly d26ba30c88 [formerly 5d4601f7c15323a9f926a325656843e5092e23bb]]]
Former-commit-id: d26ba30c88
Former-commit-id: 203804a5fc [formerly 0ad33b4c53]
Former-commit-id: b694406add
|
2014-12-03 14:29:52 -06:00 |
|
Juliya Dynina
|
b605a89c50
|
Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: d49e57a971 [formerly c431691d06] [formerly d49e57a971 [formerly c431691d06] [formerly 354a421da7 [formerly 2ebcc016732b0405b183b0e4e56d528a24e9cbdf]]]
Former-commit-id: 354a421da7
Former-commit-id: de28a15f08 [formerly 3466788534]
Former-commit-id: c4ba582ff4
|
2014-12-03 14:40:12 -05:00 |
|
steve.naples
|
872c537dbe
|
ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4
Former-commit-id: 91c240f8bd [formerly c4fad58bd9] [formerly 91c240f8bd [formerly c4fad58bd9] [formerly b5389ced26 [formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]]
Former-commit-id: b5389ced26
Former-commit-id: ffe6a3d92f [formerly f33429b6f0]
Former-commit-id: 21f7cc1c0d
|
2014-12-03 18:35:19 +00:00 |
|
Sarah Pontius
|
36803469fe
|
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 2b37fe2994 [formerly 171a802190] [formerly 2b37fe2994 [formerly 171a802190] [formerly 5d696b412d [formerly 24c01f47449607347812e0e676f1d14849d3b47e]]]
Former-commit-id: 5d696b412d
Former-commit-id: 8e424a1790 [formerly 854434c095]
Former-commit-id: ad108902c5
|
2014-12-03 11:19:06 -07:00 |
|
David Friedman
|
779ec6c13c
|
ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization
Change-Id: I8e2cbe627942570a9544d21cd41b09701d65fccf
Former-commit-id: 756359ea4b [formerly 7fb946e4b8] [formerly 756359ea4b [formerly 7fb946e4b8] [formerly 5164b85f2f [formerly e2ab243f69cc96248284f78bbcd3c83f57f23b6d]]]
Former-commit-id: 5164b85f2f
Former-commit-id: a21b83ad29 [formerly aa56375e39]
Former-commit-id: 8554f4c811
|
2014-12-03 15:55:20 +00:00 |
|
Lee Venable
|
f0ee690d53
|
Merge "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." into omaha_14.4.1
Former-commit-id: d43c20b408 [formerly 18e8976193] [formerly d43c20b408 [formerly 18e8976193] [formerly 7aba701fdd [formerly d4e460721777642fed02c3bdd8cc49964ba2b4ba]]]
Former-commit-id: 7aba701fdd
Former-commit-id: a788ee02a4 [formerly 60e959c77d]
Former-commit-id: 07c95313bb
|
2014-12-02 17:49:54 -06:00 |
|
Matthew Howard
|
cbb485f757
|
Merge "ASM #625 - modify checkGroup() to display models in multiple columns if needed" into asm_14.4.1
Former-commit-id: 786cbef2ef [formerly 52d59a2bc9] [formerly 786cbef2ef [formerly 52d59a2bc9] [formerly 8261961462 [formerly 781b484eeec14113a120055595b4ac6528bbbf21]]]
Former-commit-id: 8261961462
Former-commit-id: 1df829e9e7 [formerly 2db6fffaa4]
Former-commit-id: 1761d32426
|
2014-12-02 17:28:30 -05:00 |
|
Rici.Yu
|
09e0185054
|
ASM #625 - modify checkGroup() to display models in multiple columns if needed
Change-Id: I94c5400d21b10b57cf08f4767a5160bfcc554eb9
Former-commit-id: da032a4681 [formerly fb347e4a93] [formerly da032a4681 [formerly fb347e4a93] [formerly 21e3e584b3 [formerly 07c826efbcfe30dc3fc178601e550a6dbd31eb0b]]]
Former-commit-id: 21e3e584b3
Former-commit-id: 5c5141febb [formerly 9fa4a43575]
Former-commit-id: c0b1dd8d21
|
2014-12-02 17:05:56 -05:00 |
|
Nate Jensen
|
a4d6a6b2e7
|
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 22d6b8ce65 [formerly 8bf1cdc69f] [formerly 22d6b8ce65 [formerly 8bf1cdc69f] [formerly 0211262227 [formerly 0d05a028c3137cf7b1b289e403e58c006ada7d3c]]]
Former-commit-id: 0211262227
Former-commit-id: c1b5f6242a [formerly 8ff10d37bf]
Former-commit-id: 0d64677b42
|
2014-12-02 15:25:58 -06:00 |
|
Juliya Dynina
|
6e8fa4a76a
|
Merge "ASM #643 - Text Workstation mishandles editing WRK products with numbers in PIL." into asm_14.4.1
Former-commit-id: 8614eccfc4 [formerly ecff60b24a] [formerly 8614eccfc4 [formerly ecff60b24a] [formerly 69cb7d2b59 [formerly 80b63dcc4e0d2c87eeb7ca4502fcc97be0ab09a6]]]
Former-commit-id: 69cb7d2b59
Former-commit-id: 92c8751a9c [formerly d70b1937e2]
Former-commit-id: f2e86a8447
|
2014-12-02 15:54:54 -05:00 |
|
Michael Gamazaychikov
|
5dfa4a3b19
|
ASM #643 - Text Workstation mishandles editing WRK products with numbers in PIL.
Change-Id: I493c457a45640a820fabaa5c8a4aa0ecc3e23e53
Former-commit-id: 0438e3ebf8 [formerly 81066e7985] [formerly 0438e3ebf8 [formerly 81066e7985] [formerly 0444ccbb17 [formerly 4c2f49e3cc961ff8d02a42bac0f31f9c31973782]]]
Former-commit-id: 0444ccbb17
Former-commit-id: fac3953456 [formerly ee04b05bd5]
Former-commit-id: 31090d231d
|
2014-12-02 13:35:39 -05:00 |
|
Ron Anderson
|
21dc805750
|
Merge "Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time." into omaha_14.4.1
Former-commit-id: 5ae2cc1ab2 [formerly 45ab0cd4d0] [formerly 5ae2cc1ab2 [formerly 45ab0cd4d0] [formerly 3abd487317 [formerly 91529770985ffc634cc06383b07a5b292b8a9051]]]
Former-commit-id: 3abd487317
Former-commit-id: 63440fb1cc [formerly 51380e1dc9]
Former-commit-id: 165c3c5f50
|
2014-12-02 12:34:23 -06:00 |
|
Nate Jensen
|
4f5fd65106
|
Merge "Omaha #3709 Support foreground/background colors by site for nws-collaborate room" into omaha_14.4.1
Former-commit-id: a3827ad7bd [formerly 370a090480] [formerly a3827ad7bd [formerly 370a090480] [formerly 99b30457c5 [formerly f2751d48244d29af3f047d49da5ae117ce14a86b]]]
Former-commit-id: 99b30457c5
Former-commit-id: de93a4a893 [formerly b2e5a6f790]
Former-commit-id: 171900df06
|
2014-12-02 12:08:22 -06:00 |
|
Ron Anderson
|
7528731249
|
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: f6e374db79 [formerly 4efd17db74] [formerly f6e374db79 [formerly 4efd17db74] [formerly ebeb4440ef [formerly e656ec3ccf20ae4a9eae23040e1a08d7032ee42a]]]
Former-commit-id: ebeb4440ef
Former-commit-id: b07622b4b3 [formerly c2f16e991d]
Former-commit-id: 44b648517c
|
2014-12-02 11:45:05 -06:00 |
|
Mark Peters
|
59c2bee3ab
|
Omaha #3709 Support foreground/background colors by site for nws-collaborate room
Change-Id: Id090446cf3ee5e9755039c228a0924fa3756add0
Former-commit-id: 3a10a13053 [formerly a558047f95] [formerly 3a10a13053 [formerly a558047f95] [formerly 5ad0cde96b [formerly 999feecc3880c10f5d19a2829d7552fa49595bd5]]]
Former-commit-id: 5ad0cde96b
Former-commit-id: 23ead493e7 [formerly 48f416a4f8]
Former-commit-id: f8785abf54
|
2014-12-02 11:24:01 -06:00 |
|
Brian.Dyke
|
cc516be6d9
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5c476c7a35 [formerly 6777dfad30] [formerly 5c476c7a35 [formerly 6777dfad30] [formerly 3b0a70d21e [formerly 5972d08bfe8bc836a3437251bcf9f5e68e14b6a1]]]
Former-commit-id: 3b0a70d21e
Former-commit-id: 4a237f37b1 [formerly e49d1b27b6]
Former-commit-id: ff75ac2290
|
2014-12-02 12:17:32 -05:00 |
|
Paul.Grell
|
a335d1383c
|
ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764
Former-commit-id: 2aecc9933d [formerly 63ae1fe88c] [formerly 2aecc9933d [formerly 63ae1fe88c] [formerly 370466a7e8 [formerly 38d9bc8c4e385e339df5bdd010160728730bed8d]]]
Former-commit-id: 370466a7e8
Former-commit-id: 5269897368 [formerly c6cec6b252]
Former-commit-id: 08f47bfadd
|
2014-12-02 11:35:28 -05:00 |
|