Commit graph

8299 commits

Author SHA1 Message Date
Nate Jensen
e189166a34 Omaha #4259 fix missed compiler warning
Change-Id: Id63d86e74d2dee0e99c01e9c467855bd276a67df

Former-commit-id: 46d0a687a7a3e15320e4ea85f8f2bab0bbbd0320
2015-04-16 15:21:13 -05:00
Nate Jensen
a51643fe7d Omaha #4259 clean up compiler warnings
Change-Id: I1592d1b527a5c36dcd58e32d2e8fb1561aab904d

Former-commit-id: a47e86c9683ee54ddf10542c43e1ef97124fe273
2015-04-16 14:49:08 -05:00
Nate Jensen
eabd52c620 Omaha #4259 fix jep unit test threading unsafety
Change-Id: I13f58d8dcf3e3d074c3586d2682ad3fa9809a3fe

Former-commit-id: 24922b47c679227489740da2979d10d9f81088bf
2015-04-15 17:47:57 -05:00
Nate Jensen
c54c7e6173 Merge "Omaha #4362 Add spellcheck capability to collaboration chat input box" into omaha_16.1.1
Former-commit-id: a47923f94b3f21281480e327b0be9e1ccb4b871f
2015-04-15 15:09:08 -05:00
Mark Peters
2d7c0a50e2 Omaha #4362 Add spellcheck capability to collaboration chat input box
Change-Id: I532322c43985224c724a91eead825775b3d9b1ce

Former-commit-id: 8ad95da67c44cba94da1084a238b6c5ac57d3022
2015-04-15 14:52:53 -05:00
Nate Jensen
460f1a7429 Omaha #4259 fix compiler issues
Change-Id: I16fe1f201bc3676fcf6079743112d8cbaddb0892

Former-commit-id: 4741e21ae3f1b3e0904980b75d2c1dd82aace7ad
2015-04-15 12:00:20 -05:00
Nate Jensen
a6491bd9d8 Omaha #4259 more cleanup of jep
Change-Id: I84a44ea8219132033f60ed3534fe0f00d9b5bbca

Former-commit-id: 022055f57c46cafe125cd407c2e384c46a5a8ead
2015-04-14 11:06:51 -05:00
Nate Jensen
1ea2da949f Merge "Omaha #4259 cleanup based on code review comments and tests" into omaha_16.1.1
Former-commit-id: 535dc84440a08ad43d6d412c7816ee13ce0ad117
2015-04-14 11:04:00 -05:00
Lee Venable
2871601401 Merge "Omaha #4215 - Fix NullPointerException and IndexOutOfBoundsException in Hydro. Discovered during hazard services FAT testing" into omaha_16.1.1
Former-commit-id: fad587a998c9a4a3d735e781a8e2ae8c262f0b13
2015-04-13 17:16:58 -05:00
Nate Jensen
b1f34b0eab Omaha #4259 cleanup based on code review comments and tests
Change-Id: I2be78c10ba89d43ba0fb498037764805e287b12e

Former-commit-id: 36c0b8679d6af895ff91b7dcfb4c4cef7f04ffe6
2015-04-13 16:21:43 -05:00
Nate Jensen
d320075a73 Merge "Omaha #4259 fixed uncovered issues, code review comments" into omaha_16.1.1
Former-commit-id: 33161fce6267d536c36557137351c8ff612652f3
2015-04-13 13:50:13 -05:00
Steve Harris
7ec7cdf232 Merge tag 'OB_15.1.1-4' into omaha_16.1.1
15.1.1-4


Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Nate Jensen
2cc9a82f54 Omaha #4259 fixed uncovered issues, code review comments
Change-Id: If6a253f157d131669e22915f440a8364ee62f19c

Former-commit-id: 1c3825d99fe792c45a78a1942cc30aa0d17e4716
2015-04-10 15:27:45 -05:00
Nate Jensen
bcba6c956b Merge "Omaha #4259 merging most of the rest of JEP updates with our changes" into omaha_16.1.1
Former-commit-id: 0d309effe01d50a323e1a6799632c7cf3efb4b5e
2015-04-10 13:39:02 -05:00
Nate Jensen
cb64093e9d Omaha #4259 last of the jep java merges
Change-Id: I3c82218dfc3cf5fc5d4bca13d3423123c5836b46

Former-commit-id: 8a14388a49813a9dfae394a8c14dfe4c4ca56a84
2015-04-09 20:17:54 -05:00
Nate Jensen
cc092f365a Omaha #4259 merging most of the rest of JEP updates with our changes
Change-Id: I3d530e5ebf17d63d2bb61a2b8bfb818eaa2f80cb

Former-commit-id: 4ad70d2021420bff9b5060068c9f682b01c04757
2015-04-09 18:08:34 -05:00
Mark Peters
cb87d5e198 Omaha #4185 UELE when using D2D's procedure dialog to Copy In unexpected tabs
Change-Id: I70a0c2bcf586ec19afc89ece15109e40d574fa24

Former-commit-id: 29b0fef8a97eed70f49d50f9becf07d1f70eadab
2015-04-09 10:32:36 -05:00
Mike Duff
3499b1b285 Omaha #4215 - Fix NullPointerException and IndexOutOfBoundsException in Hydro. Discovered during hazard services FAT testing
Former-commit-id: 3828621a84e787cd5d19462708509aa3ec31e786
2015-04-09 09:54:05 -05:00
Fay.Liang
5accdbf2e7 Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 3c4a22bf33c9f1147c6ebb263e6102294b33f65f
2015-04-08 12:27:57 -04:00
Fay.Liang
69587e6392 Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: d7c9aeecd43125529303f37560b9ae76b2934817
2015-04-08 12:26:50 -04:00
Fay.Liang
1579e023ea Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Fay.Liang
7349df3d27 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Nate Jensen
e3c8a93e8b Merge "Omaha #4259 non-hacky support for accessing inner classes" into omaha_16.1.1
Former-commit-id: be027e9b8fdfe44efe54466d76945685a095795c
2015-04-07 14:54:11 -05:00
Chip Gobs
5377c9db38 Merge remote branch 'remotes/origin/ohd_15.1.1' into ohd_15.1.1
Former-commit-id: 2438b5702f8fdcd52d79dce64613b8b394d32b16
2015-04-07 15:07:44 -04:00
Nate Jensen
78cc9fd16c Omaha #4204 keep renamed parts on 4 panel action
Change-Id: I76dcfa52bc79bd9274c11912e889728486d3ca4f

Former-commit-id: 12207dc69597a229ca732b7dc90e2d75ebbc988b
2015-04-07 11:15:13 -05:00
Dave Hladky
879b675257 Omaha #4230 rewrote certifcate management script. Added delete cert as well as add. Cert params all interactive now.
Change-Id: I14b1c8147384b669f5429136f56adbece35b7cd4

Former-commit-id: 905cacdc9f1f317dcf521e9cdd61fce0e3dfeb8b
2015-04-07 10:03:06 -05:00
Nate Jensen
eb8d673675 Omaha #4259 non-hacky support for accessing inner classes
Change-Id: I5058ef5b5cda7bc59e1f50786ee277ae0637d9a1

Former-commit-id: 07886e9e1a91fb79d560d8f6f3c5224aab156968
2015-04-07 09:30:48 -05:00
Steve Harris
19be21406f Merge branch 'omaha_15.1.1' into omaha_16.1.1
Former-commit-id: 2333d5fa9277d727aae1136df25eda1bf316393a
2015-04-06 11:11:59 -05:00
Greg Armendariz
4623588cc5 Omaha #4330 - Fix developer build
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2

Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
2015-04-06 10:47:23 -05:00
Kiran.Shrestha
8f981c5fa4 ASM #15025 WRK product changes header to alternate- long-line pil in header block.
Change-Id: If5776bbddbf8b5eddf8dff85d913ce8a4862bd12

Former-commit-id: 3ab4df17a7fd40f93de6cb32798ee5a2385f4814
2015-04-03 18:43:24 +00:00
Ron Anderson
4132bbf6cf Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
2015-04-02 17:05:47 -05:00
Ron Anderson
45f633ee46 Merge "Omaha #4353: Remove log spam on Geometry validation errors." into omaha_16.1.1
Former-commit-id: cc0a1e2a68e46e744299bced73d5d217715fea6a
2015-04-02 17:01:06 -05:00
David Gillingham
5fddbf8ffe Omaha #4353: Remove log spam on Geometry validation errors.
Change-Id: I58f3c535e3fe582ea7402ad38d42a815823c099e

Former-commit-id: a8d6144ac52316c4e97c030c6b81cab20bbf7647
2015-04-02 16:34:22 -05:00
Ron Anderson
a957a36b4f Merge "Omaha #4103: Restore missing iscDataRec script, fix copy/paste errors in export_grids." into omaha_15.1.1
Former-commit-id: e9b6afa1ab2662de6b42fa334e9b149c21cdfdde
2015-04-02 16:30:00 -05:00
David Gillingham
c5dd1a0d93 Omaha #4103: Restore missing iscDataRec script, fix copy/paste errors in export_grids.
Change-Id: I48de7074a034e1d1184e431f7f0e78221b96fad6

Former-commit-id: a108f2da18cd891db692c34d61f4281b815a8e09
2015-04-02 16:24:44 -05:00
Brian Rapp
099fba8402 Merge "ASM #17251 - "Final check-in"" into asm_15.1.1
Former-commit-id: f89be35bf18cac72007b82466a43f8f4be3cf3f6
2015-04-02 13:47:33 -05:00
Lee Venable
e159081202 Merge "Omaha #4345 - Fixed UserAdminSelectDlg to expand vertically properly" into omaha_16.1.1
Former-commit-id: 183a063cb446d57d1e69bf09a2610dd1646aa631
2015-04-02 13:43:23 -05:00
Nate Jensen
df12c0d2a6 Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1
Former-commit-id: 3f0ab9760b2779fdb4a3557348acfa3547f30e08
2015-04-02 13:33:16 -05:00
Nate Jensen
18f76ae519 Omaha #4204 retain part names when 4-panel swapped
Change-Id: I86b364dfe879100fa81991ab31c0e8e1122d3862

Former-commit-id: b9c5c03f403d00b7fbf0ff5d9c8ed34c82556abd
2015-04-02 12:06:10 -05:00
Nate Jensen
78fb64303c Merge "Omaha #4327 Need more prominent notification of new collaboration messages when minimized" into omaha_16.1.1
Former-commit-id: 8187807ebe261b1dcd7fccebf38d7eb0ff05ba98
2015-04-02 10:20:54 -05:00
Slav Korolev
0dc34f2bc8 Omaha #4345 - Fixed UserAdminSelectDlg to expand vertically properly
Former-commit-id: dae4db1a74982458dda149c51d41e028d1ee9336
2015-04-02 11:04:28 -04:00
Nate Jensen
418d41e200 Merge "Omaha #4259 fix when java method expects string arg and gets java.lang.String instead of Py_String" into omaha_16.1.1
Former-commit-id: 842dfb0fa6e7a3cda122f14148a18b5cb83b5eee
2015-04-01 21:34:47 -05:00
Steve Harris
f7af8ee606 Merge branch 'omaha_15.1.1' into omaha_16.1.1
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
Mark Peters
2bd5916f07 Omaha #4327 Need more prominent notification of new collaboration messages when minimized
Change-Id: I83ebb9446cbabc5f15fd4eaebffbe5f56da317b9

Former-commit-id: 7c5badf7404a4199b8436c68e23873bf321dd6a1
2015-04-01 16:57:47 -05:00
Ron Anderson
1dddf3262f Merge "Omaha #4103: Create delta script to migrate svcbu.properties file." into omaha_15.1.1
Former-commit-id: ad283a5f7e7a9170229c288cf6d9f82fefd4d1d9
2015-04-01 16:50:46 -05:00
Chris Cody
ad10e23f2a Omaha #4198 Add User Permissions for editting Hazard Services settings
Former-commit-id: db304c599bdaa54280d9be0a859f840175ff0601
2015-04-01 15:46:10 -05:00
Fay.Liang
499a7c7e80 ASM #17024 - Check-in library.ohd.pproc.so after merge/build from 14.4.1-21 to 15.1.1
Former-commit-id: ef3c93c82e72b9c574c2bbba8536e568e2a078ac
2015-04-01 14:56:17 -04:00
Matthew Howard
75a1e17bf4 Merge "ASM #17288 - GFE: Implement missing RTMA/URMA parameters" into asm_15.1.1
Former-commit-id: eda07c47b4b4ef6dbcc5361d76a3c4713e8f4150
2015-04-01 13:53:12 -05:00
Jingtao Deng
47e6761918 VLab Issue #6751 - DR16848 MPE color scale merge problem; fixes #6751
Change-Id: Ib85e9943c93f89b74d8f1530a99f7e819c63e7e6

Former-commit-id: 1324a6ebb687b9af972562c7b1adca402b799ced
2015-04-01 13:50:45 -04:00
Fay.Liang
6442ecb0b5 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 3ce780c9d7ab5a190ebe7d87c1d9a839ca041f66
2015-04-01 13:28:26 -04:00