Commit graph

9022 commits

Author SHA1 Message Date
Ana Rivera
9a33597d6e Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6

Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
2015-07-20 15:56:51 +00:00
Ana Rivera
d6196390e2 Merge branch 'master_15.1.1'(OB_15.1.1-24) into field_16.1.1
Change-Id: I859c9a2d9be2076e9eac89b4a5a877f37ca54074

Former-commit-id: d6f0e355d72c9be4d55c5e161331e55367bdb7b8
2015-07-20 15:46:28 +00:00
Richard Peter
dfc255531a Merge "Omaha #4500 - Fix SQL Injection Concerns." into omaha_16.1.1
Former-commit-id: 2b25be688266a27f564d5acff991d1e9a94dd081
2015-07-17 13:35:21 -05:00
Ron Anderson
df708de1e4 Omaha #4547 Fix some more issues with warngen templates
Change-Id: I4d7d2635def75a7262b2c70bd699ce37914cbe1f

Former-commit-id: 908dbaea4585226b8742f713dc2a7f20752cee2c
2015-07-17 10:09:57 -05:00
Nate Jensen
89bf57c0d1 Merge "Omaha #4658 Fixed expiration times in FFMP DAF access Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be" into omaha_16.1.1
Former-commit-id: 14012632785578189b2c196eae493d59cd9a96f8
2015-07-16 16:57:57 -05:00
Dave Hladky
91aab92db5 Omaha #4658 Fixed expiration times in FFMP DAF access
Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be

Former-commit-id: 94de80dd125cd4a004678e7d0c92fc8d0e99f70e
2015-07-16 16:15:10 -05:00
Fay.Liang
fca8f275b2 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: f8895b88d975a88553a494a7c616b4ecf702fa16
2015-07-15 14:37:27 -04:00
Fay.Liang
c97d6f5f37 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: d17bfc702388ea2ed068852c08eff0c32eed62ff
2015-07-15 14:35:58 -04:00
Nate Jensen
0f9dc9a877 Merge "Omaha #4512 Add bundle files to Redbook menus XML" into omaha_16.1.1
Former-commit-id: 4e14cbf6926602d3966ce90f270d27232a2ddacd
2015-07-14 17:38:38 -05:00
Lee Venable
bf7b520ae0 Merge "Omaha #4311 Additional fixes for alertViz to prevent display ressizing to 0 height and acknowledge confirmation dialog going behind" into omaha_16.1.1
Former-commit-id: b920e261b160e54c21128b1b6718ee3ff27863e4
2015-07-14 17:34:29 -05:00
Mark Peters
0f691a8adc Omaha #4512 Add bundle files to Redbook menus XML
Change-Id: I407c569aacbb41e980ba48a09d7a2af72ebb0708

Former-commit-id: 5262da76ebf91ac2f376e6ea65c2de16a7828176
2015-07-14 14:34:20 -05:00
Ron Anderson
f010ad8605 Omaha #4311 Additional fixes for alertViz to prevent display ressizing to 0 height
and acknowledge confirmation dialog going behind

Change-Id: Ie4b3c6f910037db765aa46d619df491bdf7221db

Former-commit-id: 5640b3c3594d74614907af06b8f9452c917a04ee
2015-07-14 10:40:35 -05:00
Ron Anderson
e86e0dd6da Merge "Omaha #4537 Fix smartInit issues with HRRR sub-hourly data." into omaha_16.1.1
Former-commit-id: 7f9cae62b3fe3274525ebb8e5161feb7fbea7e59
2015-07-14 10:30:59 -05:00
David Friedman
661500fb18 ASM #17672 - Radar decoding can fail with an OutOfMemory error on certain products
Change-Id: If5045934eb1c44e3b4270fe9ae6f3aee4f175e51

Former-commit-id: 43427def5c959a59660eb687fc1ff3c9a8737a37
2015-07-14 01:06:42 +00:00
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
c1724c364e Omaha #4537 Fix smartInit issues with HRRR sub-hourly data.
Change-Id: Ifcd616c69e5eed8455909f298aaedaf1947e990c

Former-commit-id: c32d496014b97e1787e41a01e59fd7eb8e6c53bb
2015-07-13 18:09:22 -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
Richard Peter
47bdd9984d Omaha #4500 - Fix SQL Injection Concerns.
Change-Id: I3af5ce39d163a212f66e675d3386ae5c68b9b295

Former-commit-id: 7613c06d4351c52dcc8e49d6bc64ecb0166f72e7
2015-07-13 16:31:26 -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
Fay.Liang
208bfc4b87 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: de43ecb072da23016bd82cfa1a47924201c958f3
2015-07-10 15:16:15 -04: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
Ana Rivera
7bfabbde93 Merge "VLab Issue #8975 - DCS_16961 mPING Ingest and Display" into field_16.1.1
Former-commit-id: 75bec83a58582205dab773d45451754eb78c3042
2015-07-08 19:36:34 +00:00
Aaron Anderson
c6460c3655 VLab Issue #8975 - DCS_16961 mPING Ingest and Display
Change-Id: Ia9b52718592d127fb71701c2419450f89bfec0b8

Former-commit-id: 43f7e4cc129f8d177f9586ff5f73c7adf96e18d6
2015-07-08 14:30:01 -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