Steve Harris
|
352c267fc9
|
Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 310474ae9b [formerly 36df63be5c] [formerly 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: d00dc0d174 [formerly 104e6e79e8]
Former-commit-id: 6d4512fa3a
|
2013-03-20 13:45:11 -05:00 |
|
Mike Duff
|
c22d1962de
|
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 70efff8f0a [formerly b115d3611c] [formerly 70efff8f0a [formerly b115d3611c] [formerly 058064ce0d [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]
Former-commit-id: 058064ce0d
Former-commit-id: 3e1b4ba54b [formerly 7e66c8e46d]
Former-commit-id: 144223ed9b
|
2013-03-19 10:10:01 -05:00 |
|
Steve Harris
|
481cee4c74
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
|
2013-03-18 16:52:00 -05:00 |
|
Steve Harris
|
9d4d1baefe
|
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
|
2013-03-18 16:43:22 -05:00 |
|
Steve Harris
|
1c2dffd66d
|
13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
|
2013-03-18 15:43:32 -05:00 |
|
Ben Steffensmeier
|
866c873f71
|
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
|
2013-02-28 17:00:56 -06:00 |
|
Steve Harris
|
08bf724a6c
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
|
2013-01-23 11:13:03 -05:00 |
|
Max Schenkelberg
|
be1fb93c1b
|
Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
Amend: Cleaned up comments and some bugs in code after review
Amend: Rebased changes
Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d
Former-commit-id: e5cd1901a5 [formerly ff72ce0b0c] [formerly e5cd1901a5 [formerly ff72ce0b0c] [formerly db3e7bab99 [formerly ab74da7808aa343983f532ee076820c7e63fdded]]]
Former-commit-id: db3e7bab99
Former-commit-id: fac8769336 [formerly c246f56568]
Former-commit-id: 21dae56a1b
|
2013-01-15 14:41:19 -06:00 |
|
Steve Harris
|
b4556ea28f
|
13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
|
2013-01-14 18:42:21 -05:00 |
|
Steve Harris
|
b7f180d9d3
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
0b22b3c014
|
12.12.1-8 baseline
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee [formerly ee06a94735]
Former-commit-id: ec2cdc1593
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
7058ebec23
|
12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
a924a8347a
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
982804ee0e
|
12.9.1-11 baseline
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: dc5ec3d16d [formerly a14374fcd4]
Former-commit-id: f401755cde
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
7e1d1f6e08
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
03bb51ed0e
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a]
Former-commit-id: 8c5c5ad6eb
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
adf346e7d3
|
12.9.1-2 baseline
Former-commit-id: 27871051e3 [formerly d1d877d319] [formerly 27871051e3 [formerly d1d877d319] [formerly a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: de4c812834 [formerly 448ed038c2]
Former-commit-id: ed416f241e
|
2012-08-15 14:12:24 -05:00 |
|
Steve Harris
|
d3be09bd74
|
12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
36e2ad3023
|
12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
0c25458510
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
293563cfe7
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|