Commit graph

13 commits

Author SHA1 Message Date
Steve Harris
cf73096716 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0]
Former-commit-id: afd3d3fa2d
2014-10-06 13:57:59 -05:00
Robert Blum
473b13d9d3 Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly d5994a8a6b [formerly a1d23e4198 [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]]
Former-commit-id: d5994a8a6b
Former-commit-id: fb258e074b [formerly 4bb7ed8b2f] [formerly 2b50918a864a6561f6ca63465c557e0f0f669c60 [formerly 6c1676e743]]
Former-commit-id: afa8ac249a3defa7bcb35324e0be32ecf763713e [formerly 100e24245f]
Former-commit-id: 2d7c61f0a8
2014-10-01 10:22:25 -05:00
Steve Harris
10752cbc42 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb]
Former-commit-id: 4c4380580f
2014-09-29 12:58:56 -05:00
Ying-Lian.Shi
ef3ed45df2 ASM #16693 Fix spelling checker swear words
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e

Former-commit-id: aa0b2544fd [formerly 8eb9aac0b9] [formerly 2a38e3eca5] [formerly aa0b2544fd [formerly 8eb9aac0b9] [formerly 2a38e3eca5] [formerly 12c545ef7a [formerly 2a38e3eca5 [formerly 1686a947c8a740c34339d9cf17749a6b92d776ab]]]]
Former-commit-id: 12c545ef7a
Former-commit-id: 8f6d8ac024 [formerly 476d52b18d] [formerly c927fbb9639f542bfe373486ebda7fe580430803 [formerly f26b61bbb7]]
Former-commit-id: 00cf5257ab316663d34e68f329f2af9c3575421c [formerly 49389f41f4]
Former-commit-id: 925c953e9e
2014-09-24 12:08:43 +00:00
Ying-Lian.Shi
7d41b9e4d8 ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566

Former-commit-id: 86c761c8a4 [formerly 83536a6b09] [formerly 11b40e167c] [formerly 86c761c8a4 [formerly 83536a6b09] [formerly 11b40e167c] [formerly 6e88d5f39c [formerly 11b40e167c [formerly 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e]]]]
Former-commit-id: 6e88d5f39c
Former-commit-id: 46d6fe5fe5 [formerly 7ba6e37a19] [formerly b0530a8b37b27391b06057bbd69660a9aa6f1da7 [formerly 9b86fdbd15]]
Former-commit-id: 177eee0612c6272631ab9a1edc1926b2223793a0 [formerly 45ac127a3b]
Former-commit-id: 17ef08e2b1
2014-09-15 14:56:32 +00:00
Robert Blum
5f56a1291e Omaha #3453 Added the spell check dictionary to site level localization.
Former-commit-id: d002075985 [formerly 2ae87df58a] [formerly 9d754dc57a] [formerly d002075985 [formerly 2ae87df58a] [formerly 9d754dc57a] [formerly 5ddadc2015 [formerly 9d754dc57a [formerly f561e979ad047319c6c7f12cf13633868ed9edea]]]]
Former-commit-id: 5ddadc2015
Former-commit-id: 641b713bc4 [formerly f9cafb2d51] [formerly 6c0ec0e604926d50ebdc4cce4cac9d69b2cada60 [formerly bf4fc92db1]]
Former-commit-id: 57addafd72b434d5035291d6ef5291f88b6e219d [formerly fe5666a502]
Former-commit-id: bf291978f0
2014-08-18 15:09:30 -05:00
Robert Blum
f9ab0b24fb Omaha #3453 Refreshing the viewer on every spell check job to correctly update underlining.
Change-Id: I5e037a7b3e85fd794966bd351ae37777abb0d193

Former-commit-id: 0b67acf5ee [formerly fc1487a56b] [formerly 8b6fd81e10] [formerly 0b67acf5ee [formerly fc1487a56b] [formerly 8b6fd81e10] [formerly 6d49b0f7ae [formerly 8b6fd81e10 [formerly f27b34bc0aa50d13415dde6153676d3a9484c9ab]]]]
Former-commit-id: 6d49b0f7ae
Former-commit-id: bf18f062a6 [formerly 9e54c50009] [formerly e8471c8ec3033183f7e6e32078878b9605a55763 [formerly 344eb050a5]]
Former-commit-id: 965ba129a13d9348cc5cc458c881ff36a9084387 [formerly 5eb75cb326]
Former-commit-id: b871d4263a
2014-08-06 15:09:17 -05:00
Robert Blum
36ef4fb08d Omaha #3453 Inline spell check capability
Change-Id: I0af5f892a6231fe4e861e66906304101b909b9ed

Former-commit-id: 75dffc841c [formerly 6ada95d5e6] [formerly 46e50907cf] [formerly 75dffc841c [formerly 6ada95d5e6] [formerly 46e50907cf] [formerly 7dd3809c35 [formerly 46e50907cf [formerly faaf3b70a4a283f3131923abc722741152c5a632]]]]
Former-commit-id: 7dd3809c35
Former-commit-id: fe7d36a0ef [formerly 11a74d29d8] [formerly 102dd01c1628dc490e50772347726919c52c616f [formerly 8399057a00]]
Former-commit-id: 919ee861539c7cbe2532df3e4759e92039e8d177 [formerly c87ccb8404]
Former-commit-id: 381d1f8720
2014-07-29 09:00:52 -05:00
Richard Peter
e6a36eb12a Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 84bef1f2ec [formerly c0b0eef331] [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]]
Former-commit-id: 45b98e41300d826058702743e6eeb0852aa1ad89 [formerly 9cf5e247ab]
Former-commit-id: 42c78326f1
2013-08-14 15:23:18 -05:00
Max Schenkelberg
750f71ea98 Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: cc6950107f [formerly 4fdb3c8306] [formerly 0d46128ba8af16237227239c716ce61a2bd99042 [formerly 75c95e83ef]]
Former-commit-id: 6330e8d0028065ee6a7110c911ee4f47033f7729 [formerly 2178fac70d]
Former-commit-id: 5167a52b65
2013-08-09 14:24:49 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00