Steve Harris
|
55b82a66ff
|
Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java
Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
|
2015-07-13 18:39:29 -05:00 |
|
Steve Harris
|
30d49fff86
|
Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1
Former-commit-id: cf104ad05ee334aee224342743ab3b142d62cacd
|
2015-07-13 18:29:34 -05:00 |
|
Steve Harris
|
c2ab43b206
|
Merge tag 'OB_15.1.1-22' into omaha_15.1.1
15.1.1-22
Former-commit-id: 2db2aac7112c3cb27eee4a8ac233865ffe2d6b0b
|
2015-07-13 18:13:44 -05:00 |
|
Ron Anderson
|
cb54a0d66b
|
Merge "Omaha #4547 Fix more issues with extremWindWarningFollowup.vm" into omaha_16.1.1
Former-commit-id: f974fa93c495bfd7a0a8c8c717b912b7c84ef56d
|
2015-07-13 17:48:38 -05:00 |
|
Ron Anderson
|
aff1b9b21e
|
Omaha #4547 Fix more issues with extremWindWarningFollowup.vm
Change-Id: Ic3b1311c445507170ebd8a175767d2816731254c
Former-commit-id: 6a31d2379a8b5be9fb2bf51ac43e251a4541d523
|
2015-07-13 17:44:22 -05:00 |
|
Nate Jensen
|
79bd634511
|
Merge "Omaha #4474 Fix alert view dispose error." into omaha_16.1.1
Former-commit-id: f0c209cc9c26350cd50eb04db9fc863b84704496
|
2015-07-13 17:36:09 -05:00 |
|
Ben Steffensmeier
|
aa964932a3
|
Omaha #4474 Fix alert view dispose error.
Former-commit-id: 23c0ed05a9f3546217089af681c4cc3fff5fbc3d
|
2015-07-13 16:03:08 -05:00 |
|
Greg Armendariz
|
f9ec20ac12
|
Omaha #4555 - Source profile scripts
Former-commit-id: 65797ec98d18fff34303ff67a40bdb0ec7230c21
|
2015-07-13 13:38:42 -05:00 |
|
Ron Anderson
|
1c6dc6010f
|
Omaha #4648 Fix bullets in follow up hazard products
Change-Id: Iaeba35d5893b5f439858d35dfb849b3d7635f27b
Former-commit-id: be8cbc18536402d2b8fbd02a94bf707e8f6f2b8e
|
2015-07-13 11:59:42 -05:00 |
|
Richard Peter
|
c2323b7a00
|
Omaha #4500 - Fix sql queries
Change-Id: I2ffeccf4d8a170d229490abb2fb7c9f32eefcf9d
Former-commit-id: e62c5a7062763c968556043812002aa3005f1df9
|
2015-07-13 11:09:23 -05:00 |
|
Ron Anderson
|
190049ee38
|
Omaha #4547 Fix more issues in extremeWindWarningFollowup.vm
Change-Id: I8b8ce5da4950c581f556b4f6a2744ec87aff8d52
Former-commit-id: 3058151ebcaeef7bd794d110ac28efd7144945ad
|
2015-07-13 09:33:30 -05:00 |
|
Steve Harris
|
43281e7980
|
Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1
Former-commit-id: 1bff4d3996f81900e076a605598d61319c5c7871
|
2015-07-09 22:06:47 -05:00 |
|
Nate Jensen
|
649c63d21e
|
Merge "Omaha #4259 Updating JEP to 3.3.5" into omaha_16.1.1
Former-commit-id: 45dff8561ca85406a325f273b55f30a347b72ee1
|
2015-07-09 17:12:14 -05:00 |
|
David Lovely
|
71f7c482b9
|
Omaha #4259 Updating JEP to 3.3.5
Former-commit-id: 268e9a8081d171298f73c7c71b21e5be7a7ccb77
|
2015-07-09 16:52:47 -05:00 |
|
Richard Peter
|
1384a95801
|
Merge "Omaha #4500 - Prevent SQL Injection" into omaha_16.1.1
Former-commit-id: a33743dd27c8ab201c00e440bbbd2a60180e845c
|
2015-07-09 16:52:27 -05:00 |
|
Brian Clements
|
c0623b9757
|
Omaha #4606 added missing style rule for 15min 20-40km grid pulse lightning
Change-Id: I23edfa536b772bf20da5ad479f93451f788647e6
Former-commit-id: 2fd6ac21caa17e5c6bbacefe04d6483fe7e5efb2
|
2015-07-09 16:08:49 -05:00 |
|
Richard Peter
|
85dcc9a835
|
Merge "Omaha #4298 - Ingest and display National Blend of Global Models" into omaha_16.1.1
Former-commit-id: c6355ce860377b29e994143296427a6a79d920fc
|
2015-07-09 15:30:57 -05:00 |
|
Ron Anderson
|
5ebe917618
|
Merge "Omaha #4555 - Add tmp dir" into omaha_16.1.1
Former-commit-id: 4559b85fb9e16694ae13485211a85cb6276ecbdf
|
2015-07-09 15:29:22 -05:00 |
|
Richard Peter
|
badc21926a
|
Omaha #4500 - Prevent SQL Injection
Change-Id: Ia61d5283ac60d01af892440218cb199365a3f79d
Former-commit-id: 70b8f0d02904abaf7633dfd131672f139f37dc8f
|
2015-07-09 14:36:47 -05:00 |
|
Ron Anderson
|
af0143f330
|
Omaha #4441 Fix QC issue with snowmelt in immediate cause
Change-Id: Iffbccdd1b8230ef118ea734395f8524b68f7aee5
Former-commit-id: 1c9dc2485b2aa52bbe73c7556f5714ff11ce82ef
|
2015-07-09 13:53:29 -05:00 |
|
Ron Anderson
|
284afa7ec7
|
Omaha #4547 Fix extremeWindWarning templates
Change-Id: I6ed8480751386ceafeabeaf0a675642f7d4046c6
Former-commit-id: f8105007f4c5c632458e6d6395cef93be737df44
|
2015-07-09 13:46:31 -05:00 |
|
Ron Anderson
|
ea9ca58229
|
Omaha #4442 Fix locking of primary cause in non-convective flood warning
Change-Id: Iec6abdc69e54d1a6b0ca9971ec4c27e4eb5c2ade
Former-commit-id: 5a57cfe5f99b9d83c37d903a57df734299354086
|
2015-07-09 13:39:54 -05:00 |
|
Ron Anderson
|
dfffdececc
|
Omaha #4441 Fix UGC count error for Baltimore City
Change-Id: I8627d6835dccae8180ca608034375cf646cd30b4
Former-commit-id: b8b694cdd9a71d1054a019c8e627f89abc983b27
|
2015-07-09 13:34:30 -05:00 |
|
Greg Armendariz
|
3110cf87a6
|
Omaha #4555 - Add tmp dir
Change-Id: I509bc82d656f899ab4cc7e82740153243b255f0b
Former-commit-id: e578f386d8b5520f70c94a5b47b4e9a7b6759dcc
|
2015-07-09 13:04:18 -05:00 |
|
Slav Korolev
|
be64094eb1
|
Omaha #4298 - Ingest and display National Blend of Global Models
Former-commit-id: 76dbde2807f370b87b3e7e28935d647899bd48b3
|
2015-07-09 13:33:15 -04:00 |
|
Nate Jensen
|
bc954bd3c3
|
Merge "Omaha #4474 Make AlertView popup more interactive." into omaha_16.1.1
Former-commit-id: def84ba17c5e1560f38d8fd6b672eda9fc12a2a9
|
2015-07-08 18:18:33 -05:00 |
|
Ben Steffensmeier
|
41d8c370ab
|
Omaha #4474 Make AlertView popup more interactive.
Former-commit-id: 3b7e322a3748f339a7b470ee5d55d639e64f5b3f
|
2015-07-08 16:50:00 -05:00 |
|
Mark Peters
|
e37e8f93b4
|
Omaha #4316 Include seconds in logs of collaboration messages.
Change-Id: Iace196e567f36b0be700f707c9352a680a9b3d32
Former-commit-id: 66778ffd5d3bb702a783f6450b58a5be63187e96
|
2015-07-08 16:19:15 -05:00 |
|
Fay.Liang
|
5479b61f49
|
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/VTECTable.py
Former-commit-id: 53b87c0100e364e224b1d4a353b495b73bc86993
|
2015-07-08 15:19:45 -04:00 |
|
Ron Anderson
|
5eac3a423a
|
Omaha #4259 Fix error in SmartScript.getGrids that caused scalar grids to fail.
Change-Id: Ief6e27abe1824c326550837e2bc0a8ab2e276a98
Former-commit-id: 686ab4bd37aa6cc656fdb1e8622a87a84872529a
|
2015-07-08 12:42:54 -05:00 |
|
Steve Harris
|
8ebb6d1e9c
|
Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1
Former-commit-id: ca0e0057f01d73b542dc6d7563d8bf455c6c4d82
|
2015-07-08 10:47:08 -05:00 |
|
Shawn.Hooper
|
eaafeec8a9
|
ASM #17714 - Remove duplicate entry of WW.Y from VTECTable.py
Change-Id: Iafdf2fdd33cc92f758fd807413f4682bb434abd9
Former-commit-id: 4189f0b0d5fd574b4f048739630c2831a93b28ac
|
2015-07-08 11:44:17 -04:00 |
|
Ana Rivera
|
31c8bec107
|
VLab Issue #9304 - DR17714 GFE: Duplicate entry of WW.Y on the upgradeHazardsDict; fixes #9304
Change-Id: I58bc959b3e512b6773dd7667e1745b1f3e1a3c9e
Former-commit-id: 29f3d29bd3938a7a499f0ff5b2b496ceb7211a9f
|
2015-07-08 14:13:55 +00:00 |
|
Ron Anderson
|
4626fd62a9
|
Omaha #4259 Remove comment from SmartScript.getLatLonGrids() as it does not apply here.
Change-Id: Id5b4663cc3cd866ac72a80f2d5bf3dfa3883c60c
Former-commit-id: 4604302350e3c09fa6770fe0d1a644bf18a65c4c
|
2015-07-07 13:24:21 -05:00 |
|
Ron Anderson
|
8083c4994c
|
Omaha #4547 Fix capitalization of area names in Areal Flood Warning Followups
Change-Id: Ica9357d4eb62e3fb9f46831df43f6e9f91bb8434
Former-commit-id: e0c224bbcb537ca6e23527bb8f63a9fee57cd3f1
|
2015-07-07 12:39:52 -05:00 |
|
Ron Anderson
|
893492ba3c
|
Merge "Omaha #4442 Fix locking of area notations in followups." into omaha_16.1.1
Former-commit-id: d83d8b2f6caf7185a1c9af7732635c16fee03ce2
|
2015-07-07 12:38:25 -05:00 |
|
Ana Rivera
|
48b74662ab
|
Merge branch 'master_15.1.1'(OB_15.1.1-20) into field_15.1.1
Change-Id: I5ca5839be8e8ed4fc7aa60b1aae3e3071ec69ef7
Former-commit-id: 5be170e9e9922f26a195f23e978fa705efab6318
|
2015-07-07 17:17:36 +00:00 |
|
Nate Jensen
|
084e3efcec
|
Merge "Omaha #4375: Fix geotools warning about CRS." into omaha_16.1.1
Former-commit-id: c1f6aeb4edef8cf7eca498fea36458f3b8a9d30e
|
2015-07-07 11:52:07 -05:00 |
|
Ron Anderson
|
b49c7f1d8f
|
Omaha #4442 Fix locking of area notations in followups.
Change-Id: I4ad06f23004c1436c84767d022efaf7df36f2f19
Former-commit-id: 9fb4fcc33d9eaf2df0e0c89c5bf3bb09670bab64
|
2015-07-07 11:30:10 -05:00 |
|
Ron Anderson
|
b1501e5871
|
Merge "Omaha #4259 Fix lat/lon grids and ifpnetCDF parmList issues" into omaha_16.1.1
Former-commit-id: 54aaa408ce3e236131fb132001bf9994fe04439b
|
2015-07-07 11:27:08 -05:00 |
|
Richard Peter
|
31c6819956
|
Merge "Omaha #4612 Get all sites matching the preferredafosFirstLetter." into omaha_15.1.1
Former-commit-id: 579cb71f0e1c1fb787e51a22c4c27980972a2df5
|
2015-07-07 11:25:51 -05:00 |
|
David Gillingham
|
f8781f5d24
|
Omaha #4375: Fix geotools warning about CRS.
Change-Id: Ic7d293ba18be71478d7c7314e79ca28cfc7b24d9
Former-commit-id: f796bb932380f986b3319550c7a4d96ba1044d5c
|
2015-07-07 11:10:02 -05:00 |
|
Richard Peter
|
d5fd5d9dab
|
Merge "Omaha #4537 Put back needed NTAT changes removed in 4422." into omaha_16.1.1
Former-commit-id: dbc04d10aff24ab3ad3bd080e83b2387c1faa882
|
2015-07-07 10:56:25 -05:00 |
|
Ron Anderson
|
2853d08519
|
Omaha #4259 Fix lat/lon grids and ifpnetCDF parmList issues
Change-Id: Ie1437c6455a7c88a31ba0152bd56976ab6ce70c3
Former-commit-id: 26faf2500b76504bddcda0e6eb5dbe334e6cdc3f
|
2015-07-07 10:35:17 -05:00 |
|
Greg Armendariz
|
db54d583b2
|
Merge "Omaha #4295 Added branding to Cave" into omaha_16.1.1
Former-commit-id: fc9543198f4dca66aa21e6edfb16c84b1f8d3047
|
2015-07-07 10:34:51 -05:00 |
|
Nate Jensen
|
42bd95d458
|
Merge "Omaha #4375: Better error message when loading empty damage path." into omaha_16.1.1
Former-commit-id: b0a442308769d1af28a707ac6d7285c4cd32baa2
|
2015-07-07 10:12:02 -05:00 |
|
David Gillingham
|
6def7f4a02
|
Omaha #4375: Better error message when loading empty damage path.
Change-Id: Idc47731168c99254663b06862da87270c71567c2
Former-commit-id: 1af180de3d92d21b6764cea68c01507055f5e578
|
2015-07-07 10:08:11 -05:00 |
|
David Lovely
|
52bd59da9b
|
Omaha #4021 Update 'caveVersion' in Cave and AlertViz plugin.xml's
Change-Id: Ia0839586092e9384fbbe2945dc1d869a5006e1f7
Former-commit-id: f261aa8703159ee16d6c7354d7f30123abd3a65c
|
2015-07-07 08:55:19 -05:00 |
|
David Lovely
|
a4f16b4d20
|
Omaha #4295 Added branding to Cave
Former-commit-id: e97cd6fcb31d75b1259dccea564723d7c34ce287
|
2015-07-07 06:53:47 -05:00 |
|
Steve Harris
|
2c4d323ac4
|
Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1
Former-commit-id: cb5db9b9bda5ee03596b00e8dfb885b9b0c30b5c
|
2015-07-06 22:36:56 -05:00 |
|