Commit graph

6241 commits

Author SHA1 Message Date
Brian Clements
b6a2bf0ae4 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
bc48674092 Omaha #3255 attempt to fix build
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3
2014-06-17 08:42:29 -05:00
Nate Jensen
a8bae916f3 Omaha #3255 fix build
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: 579cef6ab063bae1df0cfe85411d174dc75b08bd
2014-06-17 07:40:18 -05:00
Ben Steffensmeier
14b5c0d792 Omaha #2061 Update ncep copies of radar resources.
Former-commit-id: 64b5e484c0dd8409ab0b791763c31681c94a38d3
2014-06-16 10:56:40 -05:00
Nate Jensen
b1acd1709a 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
5fad6501a7 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
181a87e72d 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
Greg Armendariz
faebbc13f7 Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: 2484a3407392f64b51b93bd3a4dab04194debea5
2014-06-16 08:57:12 -05:00
Nate Jensen
c2aa87470d 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
9213369739 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
Steve Harris
1d2b8aeb7b Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 4041e8afbb4bf1c0c416624140d74d27e963f9c8
2014-06-16 07:49:58 -05:00
Greg Armendariz
db4e94b713 Omaha #3247 - Update qpid dependency
Former-commit-id: 9a6a0c9941aaa9b49da7329cccb7e05456ad514c
2014-06-14 08:13:14 -05:00
Ben Steffensmeier
81fbf3b697 Omaha #3265 Fix potential NPE in D2D time matching.
Former-commit-id: 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
1f8f612d3a 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
30d8644fa5 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
346bf852cd CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
2014-06-13 13:21:19 -04:00
Benjamin Phillippe
a22c77cbfb Omaha #3255 Fix Build
Former-commit-id: 6a4e388f9778101d5edd6a1b8ee1d1dc41e422b6
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
0baf11790f Omaha #3255 Fix Build
Former-commit-id: 3182016dc2a85aef65a6f715dc1ed5e60bedb27d
2014-06-13 10:55:23 -05:00
Ron Anderson
ee21383c07 Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
Former-commit-id: a4102501a895730d99e03b6fbafe0e7152b198cd
2014-06-13 10:45:48 -05:00
Ron Anderson
00eac78a02 Merge "Omaha #3262 smarter detection of java packages/classes" into omaha_14.4.1
Former-commit-id: d02af9d53b1f00d21f3d7ef92c54a930d13441ae
2014-06-12 18:19:25 -05:00
Richard Peter
9f2854abe8 Merge "Omaha #3229 added bufr buoy support" into omaha_14.4.1
Former-commit-id: e5d608a8977a62143bf487737e1852cd43776cfd
2014-06-12 16:50:20 -05:00
Richard Peter
b630aa2971 Merge "Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA" into omaha_14.4.1
Former-commit-id: 5dab0d8232781688132d7df0710a86ea98f93810
2014-06-12 16:50:09 -05:00
Benjamin Phillippe
7da0490ede Omaha #3255 Fixing bundle version to fix build
Former-commit-id: 5201bd2f8cc36c2dd39ac7bab51693affa5e6da1
2014-06-12 16:39:25 -05:00
Nate Jensen
ba2f130b13 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
adbffa5ddd Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: a23e57f3d1a6f4213216a7e038b85b17b6628faa
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
5355ca8c1c Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9
2014-06-12 15:00:26 -05:00
Nate Jensen
387b0604cc Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: 6e2588a672ceb81a922be9fcdac9a4212376ed5f
2014-06-12 14:27:47 -05:00
Nate Jensen
2ef1293724 Merge "Omaha #3270 fix warngen manifest's register buddy" into omaha_14.4.1
Former-commit-id: 6bc86288772152802b164382293f040691fcc262
2014-06-12 14:20:47 -05:00
Richard Peter
912c112e09 Merge "Omaha #3255 Registry Security Features (commit 1/5)" into omaha_14.4.1
Former-commit-id: 22b5edf2bbd47eb1a80bfa60a1ffd46c8c4d0d71
2014-06-12 14:16:21 -05:00
Ben Steffensmeier
f66725a515 Omaha #2061 Remove dataURI from acars.
Former-commit-id: e8b5ea58ca12878922be01c815a354703f5f4387
2014-06-12 13:59:45 -05:00
Nate Jensen
31b3029e02 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
5424eb0258 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
4ac8246386 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
df86770b4e 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
Dave Hladky
7516b5ffbc Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA
Former-commit-id: 8b4bea63939089b805aaa3b08d6907c95c04230e
2014-06-12 11:58:42 -05:00
Nate Jensen
d4471bf759 Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: c2d32dddb2bba04b46099d8745ff541989e1a281
2014-06-12 11:38:22 -05:00
Benjamin Phillippe
cfe7bb251f Omaha #3255 Registry Security Features (commit 1/5)
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291

Former-commit-id: ec1b81d28c4b418fada53c684e78d397fee9b97d
2014-06-12 11:26:51 -05:00
Slav Korolev
2b877529ce 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
80922824a3 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
Nate Jensen
d43a01f5d8 Omaha #3262 smarter detection of java packages/classes
Change-Id: I2f38e02cfa084803c5b40318a2789a236865dda6

Former-commit-id: 6afa4c1beeba55509d3222ea908595aee59a7f38
2014-06-12 10:40:36 -05:00
Brian Clements
99e86f95be Omaha #3229 added bufr buoy support
small bufr obs refactor
fixed empty array issue in bufr parser

Change-Id: Ie21ffdafed8b137264db4751c147ce1dd13eabd2

Former-commit-id: 763ea813523d2e6a6da3fb6a80c94939ce605f6c
2014-06-12 10:12:13 -05:00
Roger Ferrel
960772ea44 Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 787261f13c47b5de81b2e7c4f861645614a11f1f
2014-06-12 10:08:51 -05:00
Ron Anderson
366e5d7fd3 Omaha #3244 Improved GFE purge error handling
Change-Id: I18fcf443b6c77a323df76659a8a60cb10b65669c

Former-commit-id: d8955e6dcd8f16b33c54de104596e9743ce7d85e
2014-06-12 08:05:56 -05:00
Lee Venable
041488064b Merge "Omaha #3217 Add always prompt option to thinclient connectivity dialog." into omaha_14.4.1
Former-commit-id: 607e2a8ec37798a3620d298077d038417d93007c
2014-06-12 07:59:53 -05:00
Brian.Dyke
a011c0b6bb Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0d441b5eebad07acf51d6d5c28ee5ac7770d9733
2014-06-12 07:07:17 -04:00
Ron Anderson
c474ec8b28 Merge "Omaha #2840 log tool can now save html reports to directory" into omaha_14.4.1
Former-commit-id: d111434bc3cae174f7e19fe670d3b8b837caad5b
2014-06-11 17:49:11 -05:00
Nate Jensen
3f586a2690 Omaha #2840 log tool can now save html reports to directory
Change-Id: Ifa2d9653d2ee689512f33169028705de98f65682

Former-commit-id: 4aec10e9b7155baa7e4243a4db78ad16440dbba7
2014-06-11 17:13:38 -05:00
Nate Jensen
944dee69a4 Merge "Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)" into omaha_14.4.1
Former-commit-id: c2e210b7157f82a2a1af625d805e3a6751ff6d0d
2014-06-11 17:12:07 -05:00
Ben Steffensmeier
b8f331bfba Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: aac3fdd00b429932d9cfa5d950f9729ace54a933
2014-06-11 17:00:16 -05:00
Steve Harris
6d58f3944e Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)
Former-commit-id: 81aab5e7001eca87d4d8889ae96367eee433ee88
2014-06-11 16:00:09 -05:00