Dave Hladky
|
155903d135
|
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
|
2013-03-12 15:48:34 -05:00 |
|
Steve Harris
|
6fe4b16924
|
13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
901cbbf56d
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
|
2013-02-25 16:05:22 -06:00 |
|
Steve Harris
|
370ed98038
|
13.3.1-2 baseline
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
4f155a183a
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
0569ff413d
|
13.3.1-1 baseline
Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
e4435815c9
|
13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
b119d66cda
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ad515e28f
|
2013-02-06 11:12:01 -06:00 |
|
Steve Harris
|
7497a15e22
|
13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
|
2013-02-06 11:02:32 -06:00 |
|
Roger Ferrel
|
5328956362
|
Issue #1496 Place finally on Jobs to always clean up properly.
Change-Id: I7923482fae1dff2f467605655582f96768146008
Former-commit-id: 87ea06dfa3 [formerly fa84461ac9] [formerly fe0761d2de [formerly c25a296b3362159230f1020b9800cc0b75d83b61]]
Former-commit-id: fe0761d2de
Former-commit-id: 37f6ac440f
|
2013-02-01 10:28:06 -06:00 |
|
Roger Ferrel
|
6495252989
|
Issue #1568 Changed spell checkers shell.
Change-Id: If7fe987b46204d9edf89a0a0c461a4444320d265
Former-commit-id: 83f077a426 [formerly e3c047c96d] [formerly fd04707b7d [formerly 5444ec7e59a1499114b2d138e90f2c888aaf6e6c]]
Former-commit-id: fd04707b7d
Former-commit-id: 9183e40c5f
|
2013-01-31 16:08:54 -06:00 |
|
Roger Ferrel
|
e94e0b84f7
|
Issue #1563 Changes to force location of tooltip and always get the information for the line under the cursor.
Change-Id: I45b35e1db38335e6931086c99dbf3573a26f832b
Former-commit-id: 7dec3e3cd2 [formerly cbdf7e5e05] [formerly 647f1e4da0 [formerly cd936e54aca3ef6a20ecd5c8b95e256b2443b907]]
Former-commit-id: 647f1e4da0
Former-commit-id: 09d83a2903
|
2013-01-31 14:26:51 -06:00 |
|
Steve Harris
|
3f25b862c8
|
13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 2998f750f4
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
06f4b4ad5a
|
13.2.1-4 baseline
Former-commit-id: f2b28cfa56 [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: e6e4de6247
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
73d9455c65
|
Merge branch '13.2.1_delivery' into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: ec56acde81
Former-commit-id: 6383bf8ed2
|
2013-01-31 10:19:14 -06:00 |
|
Roger Ferrel
|
234b632c75
|
Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.)
Changes to use fewer synchronized blocks.
Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a
Former-commit-id: 97b6a1a810 [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: 4dbb053d65
|
2013-01-30 13:11:56 -06:00 |
|
Steve Harris
|
daca1c3e73
|
13.2.1-3 baseline
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 3edfa1e0be
|
2013-01-29 15:52:43 -06:00 |
|
Steve Harris
|
251a9c0195
|
13.2.1-2 baseline
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
|
2013-01-25 09:07:12 -06:00 |
|
Roger Ferrel
|
3daf0c7b37
|
Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.
Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce
Former-commit-id: 3abb6f1026 [formerly ff09ee32ab] [formerly 470abe2495 [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]
Former-commit-id: 470abe2495
Former-commit-id: 58e3bbbe97
|
2013-01-23 14:08:46 -06:00 |
|
Steve Harris
|
9d248cff7a
|
13.2.1-3 baseline
Former-commit-id: a5a0da5c02 [formerly 7435527b25] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
d9be4dce21
|
13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
8ed6a53113
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
|
2013-01-23 11:13:03 -05:00 |
|
Richard Peter
|
79ef100838
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
|
2013-01-14 18:07:17 -06:00 |
|
Steve Harris
|
e34695538d
|
13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
|
2013-01-14 18:42:21 -05:00 |
|
Richard Peter
|
c68dcf4554
|
Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff
Former-commit-id: 1d61d65a1e [formerly a4f3a2a174] [formerly e71db46db9 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]
Former-commit-id: e71db46db9
Former-commit-id: 8ea3bb4d17
|
2013-01-14 09:59:28 -06:00 |
|
Richard Peter
|
80bf1d7a28
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
|
2013-01-09 17:55:05 -06:00 |
|
Steve Harris
|
82a1ed77a4
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
|
2013-01-06 14:55:11 -06:00 |
|
Roger Ferrel
|
d3482bd513
|
Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873
Former-commit-id: 9d770cf725 [formerly 65699f7a26] [formerly 77c60c8925 [formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]]
Former-commit-id: 77c60c8925
Former-commit-id: 258dd80db8
|
2012-12-13 13:50:47 -06:00 |
|
Steve Harris
|
111e7607cf
|
12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
4f243de928
|
12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
efba080b9c
|
12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
85ad066b70
|
12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
2c82d9cb07
|
12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
725b2f8ba5
|
12.11.1-3 baseline
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
|
2012-10-15 16:30:31 -05:00 |
|
Steven Harris
|
f5e63d5f93
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
a903893a09
|
12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
684feb34e5
|
12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
e720b8ed31
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
f43a5af47f
|
12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
7fb0b17bd5
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
d7d60cc623
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
a535b51eba
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
aed7a644df
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
dab00b12e6
|
12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
f2102bfb24
|
12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
dc50bc8443
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
97c4db937e
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
33a67cdd82
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
a2a6a18fae
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
8bc60b1e32
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
|
2012-03-30 08:38:33 -05:00 |
|