xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6474 commits 31 branches 40 tags 3.8 GiB
Commit graph

3508 commits

Author SHA1 Message Date
Brian Clements
97a6f5bfe8 Omaha #3078 added private chat to collaboration 
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 93f7d7088e7d7888a878558c6f2fcc368bf3ab05
 2014-06-17 11:52:58 -05:00
Nate Jensen
44cb0e6ae6 Omaha #3274 switch viz to G1 garbage collector 
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 0355813f030ac996427c64dfcb6cbd4dd781ad2f
 2014-06-17 10:54:57 -05:00
Brian Clements
84e3f967d9 Omaha #3288 collaboration feed venue config comes from server 
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: baab2ea12e1117446295ae60bc06228eb6139895
 2014-06-17 09:26:24 -05:00
Nate Jensen
9b7ed95e6b Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1 
Former-commit-id: 2ee54c1f78136332f1cd2c40da0c2e7953510e7f
 2014-06-16 09:26:30 -05:00
Nate Jensen
b3df7745d4 Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1 
Former-commit-id: 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d
 2014-06-16 09:00:47 -05:00
Nate Jensen
5908a4501a Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1 
Former-commit-id: 34250721f97f05be61e9e4e8b6f71758347a9f60
 2014-06-16 09:00:39 -05:00
Nate Jensen
ed36453f09 Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1 
Former-commit-id: 93f63c0d42941001e4d59a4840df5e5b525592bf
 2014-06-16 08:31:30 -05:00
Steve Harris
e1c8ad2611 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 48a7eabebb78db9b97201c44ff5c71af3ee78de7
 2014-06-16 08:19:12 -05:00
Ben Steffensmeier
29b423645e Omaha #3265 Fix potential NPE in D2D time matching. 
Former-commit-id: 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29
 2014-06-13 16:58:35 -05:00
Ben Steffensmeier
7245544e1f Omaha #3163 Fix NPE when styleless strings are sent to 14.3 
Former-commit-id: 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5
 2014-06-13 16:49:25 -05:00
Brian.Dyke
482f915b42 CM-MERGE:OB13.5.6-3 into 14.1.3 
Merge branch 'master_14.1.3_merge' into master_14.1.3


Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
 2014-06-13 14:05:49 -04:00
Brian.Dyke
81832d97e5 CM-MERGE:OB13.5.6-3 into 14.1.3 
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
 2014-06-13 13:21:19 -04:00
Nate Jensen
fc905ca588 Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1 
Former-commit-id: c8f486ed32dfffff69ff9e9fefe1320c4ec009f4
 2014-06-12 15:14:50 -05:00
Brian Clements
91eb7d40c2 Omaha #3267 fixed collaboration NPE possibility 
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: a23e57f3d1a6f4213216a7e038b85b17b6628faa
 2014-06-12 15:06:46 -05:00
Ben Steffensmeier
df2fed2be3 Omaha #3263 Check for null when mosaic time matches. 
Former-commit-id: 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9
 2014-06-12 15:00:26 -05:00
Nate Jensen
d3417d8e45 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1 
Former-commit-id: 6e2588a672ceb81a922be9fcdac9a4212376ed5f
 2014-06-12 14:27:47 -05:00
Ben Steffensmeier
35ad2f2b8d Omaha #2061 Remove dataURI from acars. 
Former-commit-id: e8b5ea58ca12878922be01c815a354703f5f4387
 2014-06-12 13:59:45 -05:00
Nate Jensen
305564d6f0 Omaha #3270 fix warngen manifest's register buddy 
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2

Former-commit-id: 796e242b031087e08b9ba5e44664d6b400405c42
 2014-06-12 13:58:27 -05:00
Brian Clements
ef0ecfd1d4 Issue #2903 changed collaboration jaxb xml to be base64 encoded 
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: afcfdf1ed08cd64deb085b909f0965e4ab68d92d
 2014-06-12 13:40:33 -05:00
Nate Jensen
f118e1b0e9 Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1 
Former-commit-id: 88280dedea4b6065a5603ac26e982eab0a2e0e72
 2014-06-12 12:36:14 -05:00
Richard Peter
7731e25983 Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1 
Former-commit-id: 3285557835e929a6b7048f4445d1da45ae8e1325
 2014-06-12 12:35:24 -05:00
Nate Jensen
95fe41966a Omaha #3247 upgrade build.cave's xalan jar 
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: c2d32dddb2bba04b46099d8745ff541989e1a281
 2014-06-12 11:38:22 -05:00
Slav Korolev
16ec392c12 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200). 
Former-commit-id: 0172e8f27b646a965e472f969f112a4e170d9f41
 2014-06-12 12:24:34 -04:00
Mike Duff
c920a24300 Omaha #3269 - Fix editing of Notifiers before saving 
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 47d57692c81757a8b8c0d3217e21f701f18cdf2c
 2014-06-12 11:21:15 -05:00
Roger Ferrel
42fe1bf5b2 Omaha #3252 Fix bug in __makeHader to prevent unexpected exception. 
Former-commit-id: 787261f13c47b5de81b2e7c4f861645614a11f1f
 2014-06-12 10:08:51 -05:00
Ben Steffensmeier
c70462fb8a Omaha #3217 Add always prompt option to thinclient connectivity dialog. 
Former-commit-id: aac3fdd00b429932d9cfa5d950f9729ace54a933
 2014-06-11 17:00:16 -05:00
Ben Steffensmeier
fc25774506 Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings. 
Former-commit-id: e267e8b0bae314abf3396db6072c6ff8adc732bf
 2014-06-11 13:45:42 -05:00
Nate Jensen
4354bac2d5 Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1 
Former-commit-id: b97df26a25976d58409dad8e43b1ca3ce7471133
 2014-06-11 13:09:34 -05:00
Ben Steffensmeier
30415ae8c5 Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs. 
Former-commit-id: b6c63e5791a2438253d6ff039b5164c61105a941
 2014-06-11 12:38:35 -05:00
David Friedman
1c84c31e30 ASM #604 - Lightning display varies depending how long CAVE has been open 
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e

Former-commit-id: a3f4fd6537f3847011e199e0f043968d9f595937
 2014-06-11 13:37:16 +00:00
Nate Jensen
955e115c00 Omaha #3266 remove unused attributes and elements from baseline menu xml 
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 797504a970ec39c4fd56c9e0d51b292acfceea1b
 2014-06-10 18:30:14 -05:00
Nate Jensen
10207907d8 Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1 
Former-commit-id: b0903898a40916383f88b920e87dfc072d9cafa9
 2014-06-10 17:14:53 -05:00
Ben Steffensmeier
cad15768cc Omaha #3263 Synchronize dataTimes of storm track resources. 
Former-commit-id: d0a3a73a3a2375a49dc3e224a1c13956530d3351
 2014-06-10 16:34:44 -05:00
Ben Steffensmeier
a98872cb89 Omaha #2061 Delete PlotResource, rename PlotResource2. 
Former-commit-id: b569c7c3e175ed1519576aea63048c3f675d3875
 2014-06-10 15:59:15 -05:00
Brian.Dyke
9ab17ddecb Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
 2014-06-10 13:56:03 -04:00
Brian.Dyke
8874d41872 CM-MERGE:OB13.5.6-1,-2 into 14.1.3 
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
 2014-06-10 12:52:59 -04:00
Nate Jensen
19bef8d080 Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1 
Former-commit-id: ffa3e069c0beb5678ecb863b2950556d8c289ae1
 2014-06-09 09:38:50 -05:00
Mike Duff
39173c380c ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing. 
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 7fe0dae041cb68aba968e22d5895cce22a210ee6
 2014-06-06 16:03:14 -04:00
Brian Clements
f39896b2d1 Omaha #3226 added total lightning decoder 
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: e2583481a77d08249030838ebd52eed6e54b2986
 2014-06-06 14:39:57 -05:00
Nate Jensen
920e53628b Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1 
Former-commit-id: 22a5da1feff7e30ea0408f089305d95657befad2
 2014-06-05 17:38:32 -05:00
Ben Steffensmeier
26325b57be Omaha #3232 Radar code improvements. 
Former-commit-id: 696f45d67c5e5b02183f97cfcc139db017f01848
 2014-06-05 14:53:25 -05:00
Michael Gamazaychikov
50ab77046b ASM #114 - Problem with Distance Speed Tool. 
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
 2014-06-05 13:43:04 +01:00
Roger Ferrel
10e7a33f08 Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data. 
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5

Former-commit-id: 3e976b7ed5cf46687bbb76073e53f35ffc2c2812
 2014-06-04 08:14:06 -05:00
Brian.Dyke
3919c9ec2f Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 36fa86071fa492bd1d135b3ded6cde54d0567474
 2014-06-04 07:46:16 -04:00
Kenneth Sperow
f2a738cc25 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5
 2014-06-03 20:55:29 -07:00
brian.dyke
b3d95ca18d Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 2d4751c000176447d28b284337fb23a60cb19cd1
 2014-06-03 16:14:16 -04:00
Ben Steffensmeier
310e6562e6 Omaha #3163 Fix collaboration string differencing 
Former-commit-id: e6f30c822de26bafae339a8871c4ba98100e6d1a
 2014-06-03 13:51:46 -05:00
Zhidong.Hao
71ab6b9ed0 ASM #106 - AvnFPS Monitor TAF valid time display different from A1 
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325

Former-commit-id: 74597b2630ffd8d984b193f72126a9a5d0b3a942
 2014-06-03 11:55:32 -04:00
Ron Anderson
304364e356 Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages. 
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1

Former-commit-id: 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37
 2014-06-02 17:14:18 -05:00
Nate Jensen
a862846e15 Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1 
Former-commit-id: 4abb30354ef4f6c6520ee993a66371656db0db9f
 2014-06-02 12:44:17 -05:00