Commit graph

4853 commits

Author SHA1 Message Date
Brian Clements
6fd9741873 Issue #2699 fixed assumption that usersearch was exact
usersearch returns matches for any part of string
added method to restrict to exact matches only


Former-commit-id: 2858504408 [formerly ddbfe9a763] [formerly bebd62c6b6] [formerly bebd62c6b6 [formerly cfa3c9e0e8]] [formerly 2858504408 [formerly ddbfe9a763] [formerly bebd62c6b6] [formerly bebd62c6b6 [formerly cfa3c9e0e8]] [formerly 6ea009a2e1 [formerly bebd62c6b6 [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: 1b4cc0a1ec [formerly 876b60e15d] [formerly bc75d43bc3] [formerly d9e2a1d8638d727218bc0f1da87ee0ca47989cd8 [formerly 32509d9365c50f4522e4f0eb5ec73059ee0d9acf] [formerly bc75d43bc3 [formerly aff354a3d7]]]
Former-commit-id: 00b045a8014901b2ad52efab14e677e9847079a4 [formerly 0e4922ca913a4b5bfebceb41096f25f36219a7f2] [formerly cd1b7dec1b [formerly 9370df47fe]]
Former-commit-id: 4e0f7f90157285aff67abceca9e79315019281ba [formerly cd1b7dec1b]
Former-commit-id: 04f027986f
2014-02-03 15:34:58 -06:00
Greg Armendariz
72b92044e0 Issue #2754 - Fix import
Former-commit-id: bf59965b4c [formerly 11db377bf8] [formerly 5490e216be] [formerly 5490e216be [formerly e611dbe912]] [formerly bf59965b4c [formerly 11db377bf8] [formerly 5490e216be] [formerly 5490e216be [formerly e611dbe912]] [formerly 2e79658417 [formerly 5490e216be [formerly e611dbe912] [formerly 2e79658417 [formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]]]]]
Former-commit-id: 2e79658417
Former-commit-id: d7c5cd05a4 [formerly 4cc403c2e7] [formerly 744c6fd9b1] [formerly 1d251b66409db7c72c2af414d887f8518c010ac8 [formerly 7f15c3386a71f2f598d58c1cb6cc6594a4e6792d] [formerly 744c6fd9b1 [formerly 23f17b3f63]]]
Former-commit-id: d7a983fb1d5626b9980a4c2d00098c079e9a780a [formerly 0b20dae07d945ca03185d36e38562999d99055f7] [formerly e47453df3b [formerly ac169b4f24]]
Former-commit-id: e47453df3b
Former-commit-id: 8a8127ab0c
2014-02-03 14:45:47 -06:00
Lee Venable
ccdf6f557d Merge "Issue #2757. Fixed issues in Area Configuration Dialogs." into development
Former-commit-id: 4c59e6c4a2 [formerly 39021a203a] [formerly 72a4a12e89] [formerly 72a4a12e89 [formerly 19b883a407]] [formerly 4c59e6c4a2 [formerly 39021a203a] [formerly 72a4a12e89] [formerly 72a4a12e89 [formerly 19b883a407]] [formerly c44b120176 [formerly 72a4a12e89 [formerly 19b883a407] [formerly c44b120176 [formerly ecb833d823cf072f4e02b312fe320c2ade5162a2]]]]]
Former-commit-id: c44b120176
Former-commit-id: 8871d8729a [formerly 803102f8b3] [formerly 3e3805e1a7] [formerly daa66d18e901690b43df2c559def6f3822a38fe3 [formerly d7c9c51cbb759b4283d0b5b2756b8b47c1ba7581] [formerly 3e3805e1a7 [formerly 15f94a61b5]]]
Former-commit-id: a81c147e4de1a6d6db0551ba6bcd5adb766d547f [formerly 0a393f43928fc43da068f439b074fcfb4f402dcd] [formerly c483877308 [formerly e65a289e97]]
Former-commit-id: c483877308
Former-commit-id: 94705e9533
2014-02-03 14:31:28 -06:00
Nate Jensen
43e7be4318 Merge "Issue #2699 added handle config to prefs" into development
Former-commit-id: b5d270f6a3 [formerly af3fcacedc] [formerly 611faedbeb] [formerly 611faedbeb [formerly 0c569ed407]] [formerly b5d270f6a3 [formerly af3fcacedc] [formerly 611faedbeb] [formerly 611faedbeb [formerly 0c569ed407]] [formerly f796e81400 [formerly 611faedbeb [formerly 0c569ed407] [formerly f796e81400 [formerly a58ae34cf5b40b7d6732b0de5cce2dd94709ba1e]]]]]
Former-commit-id: f796e81400
Former-commit-id: 77bb3a54ec [formerly bac8729a30] [formerly 09813c5943] [formerly e0e3d1944ecf3b5e0ed610b81ddbeec90133e340 [formerly 7e0d16e011843b31a7f211fc9c640af9bc4b890e] [formerly 09813c5943 [formerly 486702d99e]]]
Former-commit-id: a80494503ad97d25166dcb8878697405216035f8 [formerly 2c46122b28327fe0e0afb6faeda7ffa031e42899] [formerly 20ed92e4e8 [formerly 5c4a0f61be]]
Former-commit-id: 20ed92e4e8
Former-commit-id: 8c0e2fd743
2014-02-03 14:23:23 -06:00
Ben Steffensmeier
e260050fab Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: 90169c4f75 [formerly fc0d044bd9] [formerly 921401ffe9] [formerly 921401ffe9 [formerly 8865177c6b]] [formerly 90169c4f75 [formerly fc0d044bd9] [formerly 921401ffe9] [formerly 921401ffe9 [formerly 8865177c6b]] [formerly 97a64f89f1 [formerly 921401ffe9 [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]]]
Former-commit-id: 97a64f89f1
Former-commit-id: 7dd091eb17 [formerly a63cd52b14] [formerly 1f34342948] [formerly 2a5dcc2a52901ffaba893267046943681807e227 [formerly e17a311de5c08292ece4f9c8f0ed3adc52531127] [formerly 1f34342948 [formerly 2be72739b5]]]
Former-commit-id: f291416d03f1e26ab38fb85358829bf52da399a0 [formerly 5f02ff107456e1919928842ef0b933df4109d5d0] [formerly f81c6dd1b9 [formerly d05d31fa34]]
Former-commit-id: f81c6dd1b9
Former-commit-id: 0f46b1035c
2014-02-03 14:07:07 -06:00
Brian Clements
46646ec7ac Issue #2699 added handle config to prefs
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)


Former-commit-id: 96cc745bcf [formerly 83d6ca0855] [formerly 21c75d1d01] [formerly 21c75d1d01 [formerly 1ff4ed1ae9]] [formerly 96cc745bcf [formerly 83d6ca0855] [formerly 21c75d1d01] [formerly 21c75d1d01 [formerly 1ff4ed1ae9]] [formerly 16c1aaed3e [formerly 21c75d1d01 [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: a651167eda [formerly c6287ecffc] [formerly 2f60d1b579] [formerly 581a8126de5401acc5bcabeebce5bdb728b5eb63 [formerly a84830a2b6c074a8c5eb328da49682053240a4cd] [formerly 2f60d1b579 [formerly 7c867338c8]]]
Former-commit-id: ea5b5ca27ffc555e397c16beb4b8d82ee3538e9c [formerly bc8262effd654ec4296479d2b0c4396a2891766e] [formerly 592cf33f35 [formerly 671bfaa75c]]
Former-commit-id: f3e79d115bdd5f2f46cbdb32d3411b7616eef655 [formerly 592cf33f35]
Former-commit-id: 65afd1e4d2
2014-02-03 12:59:57 -06:00
Greg Armendariz
3a3f37fb23 Merge "Issue #2754 - Remove commons logging calls" into development
Former-commit-id: 9a39661331 [formerly 2455535b2d] [formerly 4248cf6e93] [formerly 4248cf6e93 [formerly 4926d89aec]] [formerly 9a39661331 [formerly 2455535b2d] [formerly 4248cf6e93] [formerly 4248cf6e93 [formerly 4926d89aec]] [formerly 0b8031caa8 [formerly 4248cf6e93 [formerly 4926d89aec] [formerly 0b8031caa8 [formerly 118bc77a245bd1392aefbf2aae4ada5ed4e8ad32]]]]]
Former-commit-id: 0b8031caa8
Former-commit-id: 105164ef8a [formerly 6470de3904] [formerly 9906121d18] [formerly 6a56baeebcb9bc9b5c5d05f0ece1f1dc72e5fb44 [formerly 631bd265f7c9fc500edd39a7c6f13f82caa6d3fe] [formerly 9906121d18 [formerly 1f41ea93a4]]]
Former-commit-id: 65b1af9fc8d409e47cb02aae2bb08ed219640bc3 [formerly 311288eb598ba810a132b5601bc68cea13826326] [formerly b1739c53cc [formerly b06cf0eb70]]
Former-commit-id: b1739c53cc
Former-commit-id: 4157e2d58a
2014-02-03 12:24:20 -06:00
Greg Armendariz
35631b6d03 Issue #2754 - Remove commons logging calls
Former-commit-id: 5fd21d524e [formerly 689ca84b3f] [formerly efe8011970] [formerly efe8011970 [formerly fa27142ec2]] [formerly 5fd21d524e [formerly 689ca84b3f] [formerly efe8011970] [formerly efe8011970 [formerly fa27142ec2]] [formerly 6ae002cf46 [formerly efe8011970 [formerly fa27142ec2] [formerly 6ae002cf46 [formerly 7458fc7a7d3276fb14d963c92f55c89ced838837]]]]]
Former-commit-id: 6ae002cf46
Former-commit-id: 38eead2cba [formerly 05e48bb7f4] [formerly 9f09293f2e] [formerly f23aed09dce97fad90de1cb961cd9c54de484ab9 [formerly 5cf42a9b3e606e1eccdf9c5c70d6bb76b2ced605] [formerly 9f09293f2e [formerly accf0505a5]]]
Former-commit-id: 4e238414a53938033cd3b3d56776d82746023813 [formerly 9cccab557a978db071ec2a16d72dccc77908920c] [formerly 4600cda583 [formerly e568b3792d]]
Former-commit-id: 4600cda583
Former-commit-id: 5e2df6a0b4
2014-02-03 12:17:30 -06:00
Steve Harris
af1aabb56b Merge branch 'omaha_14.2.1' into development
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: 55fbf9a28f [formerly f1a9ec2d1e] [formerly ae2b849157] [formerly ae2b849157 [formerly 7a156e297a]] [formerly 55fbf9a28f [formerly f1a9ec2d1e] [formerly ae2b849157] [formerly ae2b849157 [formerly 7a156e297a]] [formerly 7b59bd41eb [formerly ae2b849157 [formerly 7a156e297a] [formerly 7b59bd41eb [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 489f3112f7 [formerly 116d836ab3] [formerly 4a379aa6e5] [formerly dff7e898a68f0389dbb73f3b62db3d0bc7541bfa [formerly 675dc12528eb749e423c405fa15dbe8b66201362] [formerly 4a379aa6e5 [formerly aa9b488963]]]
Former-commit-id: 8171be7972336d28fe2b9dab3bdddf78db7b189f [formerly 0dd75fee1d6fbdae1f20d879a1069b131d9cd16f] [formerly e6cab2a902 [formerly b9af02c0b3]]
Former-commit-id: e6cab2a902
Former-commit-id: 95a936e9dc
2014-02-03 10:29:16 -06:00
Steve Harris
3285ade69a Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 5a5d804b03 [formerly ab0609007c] [formerly 131af8538e] [formerly 131af8538e [formerly b2032880ac]] [formerly 5a5d804b03 [formerly ab0609007c] [formerly 131af8538e] [formerly 131af8538e [formerly b2032880ac]] [formerly eb9d4319dc [formerly 131af8538e [formerly b2032880ac] [formerly eb9d4319dc [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 530bb6e32b [formerly ae4332665e] [formerly 6883c64744] [formerly b833df97be0dc6efc8645650a52e9e3c3eab9225 [formerly 66f652cd9d2fbc7c64872d432745217d602f2015] [formerly 6883c64744 [formerly 33aea09906]]]
Former-commit-id: b55cd5a339cebaa82986d1e015dced4c61ff9820 [formerly 538ff84c8a7daabd62a35c1ea90e3f4c3651fc70] [formerly 08700a77b1 [formerly d8989145ac]]
Former-commit-id: 08700a77b1
Former-commit-id: b016112b8f
2014-02-03 10:26:11 -06:00
Nate Jensen
df3ed2992e Merge "Issue #2725 deriv param to common stage 1" into development
Former-commit-id: acea613fcf [formerly 02b4e16810] [formerly 4784c24db0] [formerly 4784c24db0 [formerly c3b7ae533e]] [formerly acea613fcf [formerly 02b4e16810] [formerly 4784c24db0] [formerly 4784c24db0 [formerly c3b7ae533e]] [formerly 12892db76a [formerly 4784c24db0 [formerly c3b7ae533e] [formerly 12892db76a [formerly 128141724c41850d4ced50efc1edf2c3019604cb]]]]]
Former-commit-id: 12892db76a
Former-commit-id: d1c9b6d199 [formerly fd89fb819d] [formerly 2da30ce9cc] [formerly 04d83b1b9ef706778cc412cc6579f2d28b541d73 [formerly 50951ba3b4e3e1980a914ea8f034fbffea68bd08] [formerly 2da30ce9cc [formerly fccefc9bb1]]]
Former-commit-id: 23807c8ac44a46434860d103ba0976a82221b95a [formerly 372ba72674ca06621547dab71d90efe18d25428f] [formerly f67735769e [formerly 617a429fa1]]
Former-commit-id: f67735769e
Former-commit-id: 5b3caebb44
2014-02-03 10:17:43 -06:00
Greg Armendariz
b33532ae84 Issue #2754 - Remove logging calls
Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05

Former-commit-id: 7b823dcf20 [formerly 09c7b0827a] [formerly 47347f42ca] [formerly 47347f42ca [formerly e0394c649c]] [formerly 7b823dcf20 [formerly 09c7b0827a] [formerly 47347f42ca] [formerly 47347f42ca [formerly e0394c649c]] [formerly 2ec1248fcc [formerly 47347f42ca [formerly e0394c649c] [formerly 2ec1248fcc [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]]]]
Former-commit-id: 2ec1248fcc
Former-commit-id: 719e764e0b [formerly d78463d7c0] [formerly 2e03bcff4b] [formerly 5620e9506b3e3f1d6069e20237363f19fa5a2d7e [formerly ed894f91fabab3ccbfd771bbeb3fe7a4650f8144] [formerly 2e03bcff4b [formerly e02caca466]]]
Former-commit-id: 7359ff7ac70ff8179e4023b1ecefa59b7a3e9a37 [formerly 248c754464869a119f9931cb70528b695817d09a] [formerly cad35882f8 [formerly 47d3f2e498]]
Former-commit-id: cad35882f8
Former-commit-id: eaeee421e5
2014-02-03 09:29:47 -06:00
Everett Kladstrup
558da967ec Issue #2725 deriv param to common stage 1
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
   to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
   we can use IServerRequest objects in both CAVE
   and EDEX

The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.


Former-commit-id: 73de46a47d [formerly aac0fd726e] [formerly 90df04614d] [formerly 90df04614d [formerly bd50a38d87]] [formerly 73de46a47d [formerly aac0fd726e] [formerly 90df04614d] [formerly 90df04614d [formerly bd50a38d87]] [formerly 80ad25754b [formerly 90df04614d [formerly bd50a38d87] [formerly 80ad25754b [formerly 604ae156f8b235e2e1736863b419547289403240]]]]]
Former-commit-id: 80ad25754b
Former-commit-id: 14f8444f09 [formerly 2c8d0df351] [formerly 40b796f59b] [formerly d4df14ea1100c2b96512d35dad7f44b45b52753a [formerly 9e9dc4b990dced62032e88e880c8fd835938b081] [formerly 40b796f59b [formerly 415ccd78fb]]]
Former-commit-id: 20bfe2e0f2869a83cc5986c1868474f1681b3a32 [formerly 3e1f282c293b3f64570ac5a8f1deac12c2014e33] [formerly 3c30f65980 [formerly 57f9230654]]
Former-commit-id: 3c30f65980
Former-commit-id: ae802a042f
2014-02-03 09:02:58 -06:00
Slav Korolev
d8cec43983 Issue #2757. Fixed issues in Area Configuration Dialogs.
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf

Former-commit-id: b0ce18a8bf [formerly 7b3702c186] [formerly 6013121a99] [formerly 6013121a99 [formerly ea573d2c30]] [formerly b0ce18a8bf [formerly 7b3702c186] [formerly 6013121a99] [formerly 6013121a99 [formerly ea573d2c30]] [formerly a768f540f0 [formerly 6013121a99 [formerly ea573d2c30] [formerly a768f540f0 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]]]]
Former-commit-id: a768f540f0
Former-commit-id: e45691b6d5 [formerly f6ea436e80] [formerly d2d4672a46] [formerly 6483fb5be1915744c3badb428f9abfd2df744293 [formerly a981a42007f76a4e25e017ce265ad6fb22a436d4] [formerly d2d4672a46 [formerly 6d9a066c36]]]
Former-commit-id: 7a12d00f677dc5fe1d905be4535fe373eef75e1f [formerly 4f37da138bfd1a624cb5c2b39655d2127c907a2a] [formerly 559d0f9499 [formerly baf598a6ff]]
Former-commit-id: 559d0f9499
Former-commit-id: 4cac912be3
2014-02-03 09:50:01 -05:00
Brian Clements
96191ed97a Issue #2700 fixed subscribe back after contact request accept
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one


Former-commit-id: d88907c687 [formerly dc59e8fa2d] [formerly 7176bf59b8] [formerly 7176bf59b8 [formerly b88eaeb73e]] [formerly d88907c687 [formerly dc59e8fa2d] [formerly 7176bf59b8] [formerly 7176bf59b8 [formerly b88eaeb73e]] [formerly b0402be1d3 [formerly 7176bf59b8 [formerly b88eaeb73e] [formerly b0402be1d3 [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]]]
Former-commit-id: b0402be1d3
Former-commit-id: 05806b864a [formerly 7678703ae0] [formerly 9210aae10a] [formerly b47fba27839f133d84df2ffbbab8fa0a17a72421 [formerly 49b91dbbac727f3af22f35a351ce544d8ce31b75] [formerly 9210aae10a [formerly b651ada4b3]]]
Former-commit-id: b07ad25d5deca5cc1ca37df091b241a5601cd61d [formerly e467e72241d8923b566978180702bf8b00148966] [formerly f2a97eb00e [formerly 7e1425c419]]
Former-commit-id: f2a97eb00e
Former-commit-id: fb03f7b570
2014-01-31 13:10:35 -06:00
Nate Jensen
7c5cf271ad Merge "Issue #2312 Java 6 compatibility, fix legend menus." into development
Former-commit-id: 26896e9fe3 [formerly 1b845abe22] [formerly 6112fd394c] [formerly 6112fd394c [formerly 62f86b0a02]] [formerly 26896e9fe3 [formerly 1b845abe22] [formerly 6112fd394c] [formerly 6112fd394c [formerly 62f86b0a02]] [formerly 0f1f50650c [formerly 6112fd394c [formerly 62f86b0a02] [formerly 0f1f50650c [formerly 4bd377297daea932f4907f7119208461f7f79281]]]]]
Former-commit-id: 0f1f50650c
Former-commit-id: 709954e037 [formerly 3b3a81cd6c] [formerly 38eb172fce] [formerly 5fb2d05e1c7d1299aac459306ff2b7b419fef7a9 [formerly a28fee8e461c42c0c9bc7679d076645e9c166a04] [formerly 38eb172fce [formerly 22190c55f0]]]
Former-commit-id: aefe856abb6476577717705fb954a642603cb9cf [formerly 0703b65dd96596094c3b38be47104b7a4ae81005] [formerly 21dcf31757 [formerly 7dedc1ad8d]]
Former-commit-id: 05f8202aa1d63d594fa6105510d016b252f9c6a0 [formerly 21dcf31757]
Former-commit-id: b9a7590177
2014-01-31 12:00:00 -06:00
Nate Jensen
2221bdb1d9 Merge "Issue #2698 added handles to venues" into development
Former-commit-id: 7ab7f0f350 [formerly d83c0b2e99] [formerly 003e6bf0d2] [formerly 003e6bf0d2 [formerly 4a3c89c722]] [formerly 7ab7f0f350 [formerly d83c0b2e99] [formerly 003e6bf0d2] [formerly 003e6bf0d2 [formerly 4a3c89c722]] [formerly 50da1236dd [formerly 003e6bf0d2 [formerly 4a3c89c722] [formerly 50da1236dd [formerly 0e6750826ed7f36e92a6cd451138bc3562149aad]]]]]
Former-commit-id: 50da1236dd
Former-commit-id: 91d31d3d5d [formerly d88b53e706] [formerly 49410a7e53] [formerly e51c0413bf4a693504d8d31075308ef02fe19ccb [formerly a5eb54ad3b3116ec0f71ceca98c9089c2ece8ef2] [formerly 49410a7e53 [formerly 87d49a2b1c]]]
Former-commit-id: 8ac8b3632a3d6106ef6eefe1600e909b4643af33 [formerly af68a946f88e0d1b3e9687ddd4339b004e9d14ff] [formerly 19bc148a55 [formerly b9130e5e22]]
Former-commit-id: 19bc148a55
Former-commit-id: 7b7a056a6b
2014-01-31 11:59:34 -06:00
Brian Clements
057a274d86 Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: d0e2bfb894 [formerly bd410b2529] [formerly 4e2cb3f7ae] [formerly 4e2cb3f7ae [formerly 3e585945d6]] [formerly d0e2bfb894 [formerly bd410b2529] [formerly 4e2cb3f7ae] [formerly 4e2cb3f7ae [formerly 3e585945d6]] [formerly 3250eb34f5 [formerly 4e2cb3f7ae [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 702b04f16f [formerly 35b53a61cd] [formerly 4190b13ae2] [formerly 5ac2faecdcb11cb65a9f77b603ef9ce3b1510517 [formerly 15ea8433323667869df6df396f6377d11f2a7079] [formerly 4190b13ae2 [formerly 4f4d5c5d69]]]
Former-commit-id: 7c8728bb3981780f91d28570377137dbe5daca3f [formerly bfcea1a4566d36807b6744b7f53ddc0082dc12da] [formerly cf8b85f3d2 [formerly e04cb11154]]
Former-commit-id: cf8b85f3d2
Former-commit-id: 3c70c9ff9c
2014-01-31 09:44:31 -06:00
Brian.Dyke
22927aafdc Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: be43187358 [formerly 8b06bfd2f9] [formerly 89b824b846] [formerly 89b824b846 [formerly 4e7b1b207f]] [formerly be43187358 [formerly 8b06bfd2f9] [formerly 89b824b846] [formerly 89b824b846 [formerly 4e7b1b207f]] [formerly 40ce5ccc2a [formerly 89b824b846 [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 42a827f73f [formerly 1f222c489d] [formerly 3fd2ef82ab] [formerly 0d38658451f966694cb2109bd0357282834405f0 [formerly f0782f5fb1a9ed0a419e5942875e692fbf816d81] [formerly 3fd2ef82ab [formerly dd183bc0e9]]]
Former-commit-id: 73447de99493299d3ca7c3d046c258a0f1b0b24e [formerly 7e826c4c3fd87de1a5c5fc4057ef18e6c2819ffe] [formerly a540be3064 [formerly df55ab5503]]
Former-commit-id: a540be3064
Former-commit-id: 4deb06cc50
2014-01-31 08:28:09 -05:00
Bryan Kowal
739536ea77 Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)
Former-commit-id: 7ccb3c028c [formerly 0e89136215] [formerly 6e19ac4acf] [formerly 6e19ac4acf [formerly 6fd129379f]] [formerly 7ccb3c028c [formerly 0e89136215] [formerly 6e19ac4acf] [formerly 6e19ac4acf [formerly 6fd129379f]] [formerly 678fb83ded [formerly 6e19ac4acf [formerly 6fd129379f] [formerly 678fb83ded [formerly e027cf42b3b395a834f91512e269e41377f673ef]]]]]
Former-commit-id: 678fb83ded
Former-commit-id: dbd8bd13ea [formerly 6c7b44fc8a] [formerly 9ef27edf5f] [formerly 21153a2165263cd547f5b3eceee0956e25a418cc [formerly 2b74f17b03d7ffc9219150c073ed97847f0ecc59] [formerly 9ef27edf5f [formerly 77370b4e68]]]
Former-commit-id: bb3e275dd85b291ad046de235502ce6919463081 [formerly 1e3af9b64d512f695c923395197aae37cccdf84f] [formerly 3dda41af98 [formerly cf6c6feccc]]
Former-commit-id: d56ce1bafa196808cd8d30b4ba759f5c8c384a1a [formerly 3dda41af98]
Former-commit-id: c966d2b01d
2014-01-30 18:11:48 -06:00
Ben Steffensmeier
55382bd3d8 Issue #2312 Java 6 compatibility, fix legend menus.
Former-commit-id: 43f56c542a [formerly 17e58bb339] [formerly 27fbb0f870] [formerly 27fbb0f870 [formerly 7ab61aaa23]] [formerly 43f56c542a [formerly 17e58bb339] [formerly 27fbb0f870] [formerly 27fbb0f870 [formerly 7ab61aaa23]] [formerly fe5f0118da [formerly 27fbb0f870 [formerly 7ab61aaa23] [formerly fe5f0118da [formerly 2853536477d39459de3cbb4eef7670734cfad5f8]]]]]
Former-commit-id: fe5f0118da
Former-commit-id: b7be28264b [formerly e8493ada37] [formerly 1f23bb4cf7] [formerly f481b56cad5a0be8dbdd4dfbe777e7c485b0db5d [formerly 7002ef6a0a422a4b9670a1e79551716f01ec90da] [formerly 1f23bb4cf7 [formerly e4232ce9a7]]]
Former-commit-id: 2dcf7cb0ae2c93e12d4596fbec60368d253a3204 [formerly 55b8a243f09ea246fcfd53b8a6521c4cac3719ed] [formerly f4a89f93b4 [formerly 7acd053aa2]]
Former-commit-id: f4a89f93b4
Former-commit-id: 2187bffc08
2014-01-30 16:12:10 -06:00
Greg Armendariz
96c217b79f Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1
Former-commit-id: cd44a6d170 [formerly 37a226378d] [formerly 7fbfe85478] [formerly 7fbfe85478 [formerly ed0c724860]] [formerly cd44a6d170 [formerly 37a226378d] [formerly 7fbfe85478] [formerly 7fbfe85478 [formerly ed0c724860]] [formerly 5ad9cca7a3 [formerly 7fbfe85478 [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: 36d7c6a018 [formerly 022ed11f9a] [formerly b4d9ec0e46] [formerly cf3372b76b67b4115dc1eb44808a552ca5e9b536 [formerly f18871c65719e369747a6d8b7e2bd4891f8916f2] [formerly b4d9ec0e46 [formerly 66e79f459e]]]
Former-commit-id: 3ed15129edf8507af3f09fb3b3b37756d3b6ea00 [formerly bf798c587cc569efb1973356eed83d50492151bc] [formerly af0af0920b [formerly 677e6ac584]]
Former-commit-id: af0af0920b
Former-commit-id: 24740cdf4c
2014-01-30 13:04:40 -06:00
Nate Jensen
b50bee7975 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: 55d50c7fd7 [formerly 9ff86044a2] [formerly c18e66cc45] [formerly c18e66cc45 [formerly 327c588c9e]] [formerly 55d50c7fd7 [formerly 9ff86044a2] [formerly c18e66cc45] [formerly c18e66cc45 [formerly 327c588c9e]] [formerly 906c679b4e [formerly c18e66cc45 [formerly 327c588c9e] [formerly 906c679b4e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]]]
Former-commit-id: 906c679b4e
Former-commit-id: 186223f1b4 [formerly 53afb531fa] [formerly af0ac40f47] [formerly 7729fbe1be0494af7324f98a33814fac53f57043 [formerly a60314b3783b7851cffad12a2adc0d68ac6ecdb3] [formerly af0ac40f47 [formerly 7bd1d802be]]]
Former-commit-id: 380d41c9da9f52d36bdbe5f8ce2414b781495364 [formerly 21c2189b9de73879ebb7e4c047f7d7c980d4918a] [formerly cfb4bdbb21 [formerly ed91c1d6f5]]
Former-commit-id: cfb4bdbb21
Former-commit-id: ab58b2f973
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
eccd4d21b8 Issue #2537 Fix modelsounding registration.
Former-commit-id: fd0396f0aa [formerly e5a72cf008] [formerly 12b989a34b] [formerly 12b989a34b [formerly 819369747e]] [formerly fd0396f0aa [formerly e5a72cf008] [formerly 12b989a34b] [formerly 12b989a34b [formerly 819369747e]] [formerly 1db0291792 [formerly 12b989a34b [formerly 819369747e] [formerly 1db0291792 [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]]]
Former-commit-id: 1db0291792
Former-commit-id: 6aa140fc90 [formerly 72b05d3cf9] [formerly 17ed6c9664] [formerly 86dfbab77bc2fbd7735c3040ca33b819ecfa8720 [formerly bc119a3cae474746e0debcdb5e25680e4dc2f3f3] [formerly 17ed6c9664 [formerly 501aec2537]]]
Former-commit-id: 3e8c89cd5d02d2ccd176ac5336f48f0a6a7b130d [formerly b88be879742e212d21b088fc3ba1967b730d6073] [formerly a00d385f2e [formerly d06eb22524]]
Former-commit-id: 73d07ed8d8c3a231ce19bcb5d1fd75cb9d09580b [formerly a00d385f2e]
Former-commit-id: 9f58441a68
2014-01-29 15:36:05 -06:00
Bryan Kowal
08dc963c3d Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
Former-commit-id: 202c4f9fd9 [formerly 54d0d4fd55] [formerly 635548dae3] [formerly 635548dae3 [formerly d88019d902]] [formerly 202c4f9fd9 [formerly 54d0d4fd55] [formerly 635548dae3] [formerly 635548dae3 [formerly d88019d902]] [formerly ee95e4de7e [formerly 635548dae3 [formerly d88019d902] [formerly ee95e4de7e [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]]]]
Former-commit-id: ee95e4de7e
Former-commit-id: 3b552cade1 [formerly 116f872261] [formerly 89e0e847c9] [formerly 5dc8abdcccf7827bdb7f24f8ebdcde9cde78e261 [formerly 1e726cd962bdd3d3452656fcf23cec9c7816c5da] [formerly 89e0e847c9 [formerly bd88b563fe]]]
Former-commit-id: 265fd17773bf76409b13a1d4a8b8cba62f01ca33 [formerly beb68bc7496a250f5deff315c9eebb221958285c] [formerly 25d38dd699 [formerly 1ae4a1d919]]
Former-commit-id: 25d38dd699
Former-commit-id: d469290095
2014-01-29 14:25:38 -06:00
Ron Anderson
d0fd7364f7 Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development
Former-commit-id: 4825c50c47 [formerly a0e9e35891] [formerly d0e821e5d1] [formerly d0e821e5d1 [formerly 61f35e86ec]] [formerly 4825c50c47 [formerly a0e9e35891] [formerly d0e821e5d1] [formerly d0e821e5d1 [formerly 61f35e86ec]] [formerly f4f89c79a2 [formerly d0e821e5d1 [formerly 61f35e86ec] [formerly f4f89c79a2 [formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]]]]
Former-commit-id: f4f89c79a2
Former-commit-id: 1e6a2160e9 [formerly da9d8b55d6] [formerly ff65b54555] [formerly a88130dbaf5f85fa0f7596d54ca97e1996d33dce [formerly c22c542a86577176c89c23cb7f84b62f159a84e7] [formerly ff65b54555 [formerly 2e9389293a]]]
Former-commit-id: 5debfbc0967249e4a6c241d054d55556220d29e5 [formerly 987ebba1a7fbc7ce30ac874b9dff60e47e4b3faf] [formerly 9dd3dbe791 [formerly a4daed8dd2]]
Former-commit-id: 2b5c4e7a0815909fcd1ddd89ac6dd8a542d1c7b2 [formerly 9dd3dbe791]
Former-commit-id: 23846fb7d4
2014-01-29 14:24:26 -06:00
Ron Anderson
fe1ac3dab1 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 31ccb8e032 [formerly c717b6d805] [formerly 81f9709ae7] [formerly 81f9709ae7 [formerly fb262fdad2]] [formerly 31ccb8e032 [formerly c717b6d805] [formerly 81f9709ae7] [formerly 81f9709ae7 [formerly fb262fdad2]] [formerly 7c06f0b011 [formerly 81f9709ae7 [formerly fb262fdad2] [formerly 7c06f0b011 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 7171c5a933 [formerly 70e1a066d4] [formerly 25123bdeb0] [formerly adeee8a4fdadee139145f9bcbb58792026e39d92 [formerly a3818c2ef69b516c0e2514d6b82f2afc46368905] [formerly 25123bdeb0 [formerly 64f55c6b02]]]
Former-commit-id: b89be8f33d7c7bc48f030751dc6754628096c638 [formerly e95cf485b4181e0315e0ab7317375623e930e02c] [formerly 7e541f2f77 [formerly d2d7920575]]
Former-commit-id: 71e5fa8bd0e3d14d694c34600c38dd507d690b5b [formerly 7e541f2f77]
Former-commit-id: a967ebbe67
2014-01-29 14:16:31 -06:00
Ron Anderson
a4565eb4fd Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: d3bafd9e9a [formerly 9215ca8f82] [formerly ea12cecc04] [formerly ea12cecc04 [formerly ce28c6c47f]] [formerly d3bafd9e9a [formerly 9215ca8f82] [formerly ea12cecc04] [formerly ea12cecc04 [formerly ce28c6c47f]] [formerly 0f6e082769 [formerly ea12cecc04 [formerly ce28c6c47f] [formerly 0f6e082769 [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]]]]
Former-commit-id: 0f6e082769
Former-commit-id: d380efdf47 [formerly ba249df313] [formerly 09335f5372] [formerly 8be9633bf2e677bcd269c54ee41d10d640037d0a [formerly ee24887886668d70e0e574bfe841a1f6d4aa3cec] [formerly 09335f5372 [formerly 5427d15150]]]
Former-commit-id: 4aebb52b0ca6bb32873af8c2fe712e613da74c46 [formerly 3e899872dc8686e49208b77ba9de94a800567a7c] [formerly 2086f03c28 [formerly 280434a03f]]
Former-commit-id: 2086f03c28
Former-commit-id: 6c7d4c2b4a
2014-01-29 13:55:54 -06:00
David Gillingham
e987ac8ade Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: 83c56e8d7c [formerly 304eaa9f29] [formerly fc25bbe1e9] [formerly fc25bbe1e9 [formerly 5edfbaa4a5]] [formerly 83c56e8d7c [formerly 304eaa9f29] [formerly fc25bbe1e9] [formerly fc25bbe1e9 [formerly 5edfbaa4a5]] [formerly c802315ddc [formerly fc25bbe1e9 [formerly 5edfbaa4a5] [formerly c802315ddc [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]]]]
Former-commit-id: c802315ddc
Former-commit-id: 99104eca3b [formerly 009e8c553d] [formerly 04d6bc5a42] [formerly e56b61f965ee827ad55292a754018e8baed35bbe [formerly 6efd1e8e262f0905b42ba0a2df62a1b5c000be88] [formerly 04d6bc5a42 [formerly 17d38b4974]]]
Former-commit-id: 8d5da32dd9ab104483b606ea385dc11d556da9bb [formerly e9128c3f59d7240b2b0d840be6a80f40df8effd2] [formerly 14326b8c8d [formerly 38333b45a7]]
Former-commit-id: 14326b8c8d
Former-commit-id: ea868da200
2014-01-29 11:56:05 -06:00
Nate Jensen
a82d612c4f Merge "Issue #2698 made sessions private and invite only" into development
Former-commit-id: 7220a62d2f [formerly ab82a7fdb2] [formerly 1977b026ee] [formerly 1977b026ee [formerly 52c3b71049]] [formerly 7220a62d2f [formerly ab82a7fdb2] [formerly 1977b026ee] [formerly 1977b026ee [formerly 52c3b71049]] [formerly 004999bbec [formerly 1977b026ee [formerly 52c3b71049] [formerly 004999bbec [formerly db4447bf109981ded541bff929687040cc28953a]]]]]
Former-commit-id: 004999bbec
Former-commit-id: 72bd9ef520 [formerly 075b8776da] [formerly bcf82eb692] [formerly 4f7fc42c08d7309f6cc9cbaebe777dde1e0db7e4 [formerly bdc44ee479d463d8e50545c6697f7891ded78ee9] [formerly bcf82eb692 [formerly 0a7961457e]]]
Former-commit-id: 915e5c353c2a073dabbedf230648511bec4bce7a [formerly 8f30eb15ed7f31e621138f9cf1afa9bb0b95a304] [formerly 8d6097fd9a [formerly 3b6488cdb5]]
Former-commit-id: 8d6097fd9a
Former-commit-id: d31d96eb0f
2014-01-29 11:01:45 -06:00
Brian Clements
afa0ffeefc Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 2ba620fc70 [formerly 190400fc34] [formerly 1f1be20d41] [formerly 1f1be20d41 [formerly c498307b30]] [formerly 2ba620fc70 [formerly 190400fc34] [formerly 1f1be20d41] [formerly 1f1be20d41 [formerly c498307b30]] [formerly 5b9f694930 [formerly 1f1be20d41 [formerly c498307b30] [formerly 5b9f694930 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]]]
Former-commit-id: 5b9f694930
Former-commit-id: ba031d5ad5 [formerly a225d12692] [formerly 07452b7778] [formerly 00cc14c9e1aa200e1a1549420f644cc9a02fd09f [formerly ceb8a89c7f4c8cc41774e50c75969cbdacc6d919] [formerly 07452b7778 [formerly 4a0682a9e8]]]
Former-commit-id: a072295df2a0a155571542086458b9fb583cc31c [formerly 3c20002e1f0607d8975953734b488dccf3a7b829] [formerly 96e89d9f83 [formerly 76ec4d56c8]]
Former-commit-id: 90cf90abea83958780fe7cd067ec4a51ae68038a [formerly 96e89d9f83]
Former-commit-id: 32e12b3094
2014-01-29 10:16:15 -06:00
Max Schenkelberg
ddea8e6941 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly da402e6c81 [formerly 037cd48c62] [formerly 5d488d27b9] [formerly 5d488d27b9 [formerly 83c600ada9]] [formerly da402e6c81 [formerly 037cd48c62] [formerly 5d488d27b9] [formerly 5d488d27b9 [formerly 83c600ada9]] [formerly f4765d1577 [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]]]])

Former-commit-id: 255e27a1f9 [formerly b63edcc8a7] [formerly 122c3442f8] [formerly 122c3442f8 [formerly 0c840cf724]] [formerly 255e27a1f9 [formerly b63edcc8a7] [formerly 122c3442f8] [formerly 122c3442f8 [formerly 0c840cf724]] [formerly d566ed9927 [formerly 122c3442f8 [formerly 0c840cf724] [formerly d566ed9927 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]]]
Former-commit-id: d566ed9927
Former-commit-id: a90e24ddbb [formerly b495451e3f] [formerly e1717b2729] [formerly ef2345594a57c6316fe1110309a1334e7f48facf [formerly 5c9afda4f5c9656fe346333485798a21a785033b] [formerly e1717b2729 [formerly f5ff746126]]]
Former-commit-id: c01d10d401f1821141b2e4b65965ab8156351baf [formerly 59db9c4c77b351f78f275bd48b818837b3a50530] [formerly 6953e81887 [formerly 1cdbdfceba]]
Former-commit-id: 6953e81887
Former-commit-id: de4a452a07
2014-01-29 10:15:38 -06:00
Steve Harris
60bd5fa1e1 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: 021d90e2ee [formerly f562540e7c] [formerly 14ba3b29f4] [formerly 14ba3b29f4 [formerly 1738185503]] [formerly 021d90e2ee [formerly f562540e7c] [formerly 14ba3b29f4] [formerly 14ba3b29f4 [formerly 1738185503]] [formerly 1aea63a1f6 [formerly 14ba3b29f4 [formerly 1738185503] [formerly 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: fb32d16493 [formerly cdb99cc3e0] [formerly d9cd003a5a] [formerly 628228e90b0e79d03cf47b1788bf99b102454778 [formerly 5d9047e5063900e85cef179c5be76057b8ca6cd1] [formerly d9cd003a5a [formerly 1fd5b2255f]]]
Former-commit-id: d8f439a54c3d47d35454752a05c1a836953aa53a [formerly 50ad78f33f6b09f52d5450f88139cd7ee524d3fd] [formerly e3d1abe909 [formerly ec69a2c4f7]]
Former-commit-id: e3d1abe909
Former-commit-id: fb3a30b3b3
2014-01-29 09:41:57 -06:00
Stephen Gilbert
d3b99a1540 VLab Issue #2867 - Remove dependency on Mcidas dataplugin
Removed the dependency for mcidas dataplugin.  The ncep feature
dependencies don't allow for that causing an error in the build scripts.

Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09

Former-commit-id: 68d1be45c0 [formerly 17598bc377] [formerly beaee1eaf0] [formerly beaee1eaf0 [formerly c9af367a72]] [formerly 68d1be45c0 [formerly 17598bc377] [formerly beaee1eaf0] [formerly beaee1eaf0 [formerly c9af367a72]] [formerly 0e96169b6f [formerly beaee1eaf0 [formerly c9af367a72] [formerly 0e96169b6f [formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]]]]
Former-commit-id: 0e96169b6f
Former-commit-id: 732a00e074 [formerly bad69bc7e1] [formerly e0e74ad5fd] [formerly d425da98e845a403398e4e598022221e1ddeca63 [formerly b1f331f4a7e0b7dacbc9abc9350a207b7d9b3eac] [formerly e0e74ad5fd [formerly 71e8735fdf]]]
Former-commit-id: f479fdc390901243becb6fd6dbdd1a6a0c347f73 [formerly df5950ccef02530cec5110e181a176e1490ff078] [formerly e60e1873c0 [formerly f5327455c3]]
Former-commit-id: 99a1f1a799eebefa1a09e62ed6d37c32cd23dcc8 [formerly e60e1873c0]
Former-commit-id: 8e70fc371e
2014-01-29 09:58:10 -05:00
Greg Armendariz
3ae4a13e65 Issue #2754 - Remove extra character
Former-commit-id: 3dd1f0668f [formerly ddf3e9785f] [formerly 6ff868a167] [formerly 6ff868a167 [formerly 9cc089b369]] [formerly 3dd1f0668f [formerly ddf3e9785f] [formerly 6ff868a167] [formerly 6ff868a167 [formerly 9cc089b369]] [formerly 1017abdc78 [formerly 6ff868a167 [formerly 9cc089b369] [formerly 1017abdc78 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]]]]
Former-commit-id: 1017abdc78
Former-commit-id: ae7abd7a0b [formerly fc4ce60ce6] [formerly 4e092b5810] [formerly d6a50f9d96fee1bff96cc06b6972c9debf39124f [formerly 36e64f6fb42a953ef4b064e4d83069bf3fb501c5] [formerly 4e092b5810 [formerly a8c75ce81e]]]
Former-commit-id: e3fa97169716410025718100aae39a569c67762d [formerly d3680183f6f2eff66c7a3c57056faca6d68e32be] [formerly 91d14d6f32 [formerly b37096a395]]
Former-commit-id: 91d14d6f32
Former-commit-id: 39205171d5
2014-01-29 08:43:09 -06:00
Ron Anderson
faa4328588 Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1
Former-commit-id: 3e190db2e6 [formerly 93e675a762] [formerly 6d33a83771] [formerly 6d33a83771 [formerly b7c10ddebf]] [formerly 3e190db2e6 [formerly 93e675a762] [formerly 6d33a83771] [formerly 6d33a83771 [formerly b7c10ddebf]] [formerly 20259f3554 [formerly 6d33a83771 [formerly b7c10ddebf] [formerly 20259f3554 [formerly 8040e4cad015d5725ed3b08bc9ae5e4d97b21749]]]]]
Former-commit-id: 20259f3554
Former-commit-id: 4703c3f660 [formerly 9a8f062482] [formerly 5f9706019e] [formerly 02b0e4e4462715d4d9d2946911365ffd9b16ce7d [formerly 15c64ac0d7a728903f5782d4d2fa0ee40e05ad41] [formerly 5f9706019e [formerly 604a4363a3]]]
Former-commit-id: 77388df14a1c3b86e42d48271bffdc67cf5dad9b [formerly 1674f8b9dc875bc13ac06dd6bafad1b5eaf84e41] [formerly 4512aadb1c [formerly 3a55c53d5b]]
Former-commit-id: 90e7a4c3ec86bced5d6be6cedd669fab2c8a1f5a [formerly 4512aadb1c]
Former-commit-id: 913b0eea31
2014-01-29 08:39:41 -06:00
Greg Armendariz
d87d447834 Issue #2754 - Return commons logging to build for qpid
Former-commit-id: 151f6381e9 [formerly 7481545364] [formerly c70e69147d] [formerly c70e69147d [formerly 6d3e40d648]] [formerly 151f6381e9 [formerly 7481545364] [formerly c70e69147d] [formerly c70e69147d [formerly 6d3e40d648]] [formerly 976edd2545 [formerly c70e69147d [formerly 6d3e40d648] [formerly 976edd2545 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]]]]
Former-commit-id: 976edd2545
Former-commit-id: e07f89f036 [formerly df7ce23942] [formerly b81825a668] [formerly 25cdb0ed08bbbd80d76b93c2f1ad32b386b5683a [formerly f7ccb68536836e65517ff864bd975eed46384b48] [formerly b81825a668 [formerly 346d535a6c]]]
Former-commit-id: 842d6e54222b744d0b3256f1248ca39839008f0a [formerly 2b233ed3f7e318d1c45ca1ab06d01582b86001a7] [formerly 30e5a6e2f9 [formerly 851b9180ec]]
Former-commit-id: 30e5a6e2f9
Former-commit-id: 9e9a0044d1
2014-01-28 15:06:11 -06:00
Stephen Gilbert
78e079d3bd VLab Issue #2867 - Add dependency for Mcidas dataplugin
Don't like it, but added a dependency for mcidas dataplugin to the
gov.noaa.nws.ncep.vix.common plugin.

Change-Id: Ie8aff1c3ae1733191cb74b7dc0c4593bb37ca28b

Former-commit-id: 5c76094049 [formerly d19279fbab] [formerly e60635f47d] [formerly e60635f47d [formerly ac68b01bbc]] [formerly 5c76094049 [formerly d19279fbab] [formerly e60635f47d] [formerly e60635f47d [formerly ac68b01bbc]] [formerly f21b0f5d82 [formerly e60635f47d [formerly ac68b01bbc] [formerly f21b0f5d82 [formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]]]]
Former-commit-id: f21b0f5d82
Former-commit-id: 268db285a5 [formerly cbf5fd5372] [formerly 29ca14c4b7] [formerly 72ec71c4628668528f332d5ecfc3df7ea60b9a07 [formerly e88492cf6e3b7e15e084b09596f70de340b6008e] [formerly 29ca14c4b7 [formerly 486096ada2]]]
Former-commit-id: 1c39b6ce38d83860557efadf26b0c2244fcc1620 [formerly 6a2f8151cb7e1256817c6b8baaf36f96dd1e7fa8] [formerly 39c149a747 [formerly fb46c34d1c]]
Former-commit-id: 39c149a747
Former-commit-id: ec4d735498
2014-01-28 14:52:46 -05:00
Mike Duff
b17099779b Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 22f021c814 [formerly 6be7c7f19d] [formerly 4440c27ff6] [formerly 4440c27ff6 [formerly 6e01cdb78e]] [formerly 22f021c814 [formerly 6be7c7f19d] [formerly 4440c27ff6] [formerly 4440c27ff6 [formerly 6e01cdb78e]] [formerly 1caacacfe3 [formerly 4440c27ff6 [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]]]
Former-commit-id: 1caacacfe3
Former-commit-id: bb80dae449 [formerly 72add752c4] [formerly a76507e04f] [formerly 5167876268e2ab04f01aafdd88dcb74bdbbc4ffc [formerly 90eb5dfcc392c5bf771336615dc907357a6e0670] [formerly a76507e04f [formerly f4da152d87]]]
Former-commit-id: 8968e44ffcacac483698792e0b8734c3595e6543 [formerly 9da424eeb82f536b9d2ca78ee2c3cd261b97de50] [formerly 3495a67c27 [formerly 1f4cc8681d]]
Former-commit-id: 3495a67c27
Former-commit-id: 80bc52c4e7
2014-01-28 11:09:33 -06:00
Brian Clements
7e42b03dd9 Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: 64be811aa0 [formerly aa642d5577] [formerly b4d930bcb9] [formerly b4d930bcb9 [formerly 6b1843f19a]] [formerly 64be811aa0 [formerly aa642d5577] [formerly b4d930bcb9] [formerly b4d930bcb9 [formerly 6b1843f19a]] [formerly bd19366ada [formerly b4d930bcb9 [formerly 6b1843f19a] [formerly bd19366ada [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]]]
Former-commit-id: bd19366ada
Former-commit-id: 4f58393687 [formerly a2cc9001ae] [formerly bffa4d84fe] [formerly cab5ef33e54ab7236075115828ac7fc7f975c8c4 [formerly aa6da3ca1e9307689f8365bc7178e584cb7032e6] [formerly bffa4d84fe [formerly f22052321b]]]
Former-commit-id: 2f0dca407a6db65b8f6e31e8037807a9b3f0d6c3 [formerly dc9a3ca142d4d8e444939f5ee6edf0e87d0ec277] [formerly ad3939140c [formerly 737745ade7]]
Former-commit-id: ad3939140c
Former-commit-id: 644f0267a0
2014-01-28 10:07:11 -06:00
Ron Anderson
b887795a47 Issue #2504 Fix ingestAT
Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8

Former-commit-id: 7e83dba8e4 [formerly e2360f4e7b] [formerly a78d1fcd6b] [formerly a78d1fcd6b [formerly bb2ef86d14]] [formerly 7e83dba8e4 [formerly e2360f4e7b] [formerly a78d1fcd6b] [formerly a78d1fcd6b [formerly bb2ef86d14]] [formerly 045ebfe967 [formerly a78d1fcd6b [formerly bb2ef86d14] [formerly 045ebfe967 [formerly ccf63372764f767af99d93b4d0299f9b8d066ee6]]]]]
Former-commit-id: 045ebfe967
Former-commit-id: 72c71fb2d9 [formerly 90ea66d216] [formerly cca9be6e65] [formerly bee59aee2b79942ad7b18ca3d072829c9959a384 [formerly 5b1684cd73f5480be745189f6df94efef116b12f] [formerly cca9be6e65 [formerly 89246e17c5]]]
Former-commit-id: 30b86819330817a6c076aa13aad7dbf56b49e27e [formerly e34aa2aea55bad2b25a09b7ed6d9e6a2de191510] [formerly b6624cf7ca [formerly 9dfa819625]]
Former-commit-id: b6624cf7ca
Former-commit-id: a49428f868
2014-01-27 18:16:46 -06:00
Stephen Gilbert
7f4f596a16 Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: b90c486391 [formerly 90917307fb] [formerly 312a09983a] [formerly 312a09983a [formerly 64c2460028]] [formerly b90c486391 [formerly 90917307fb] [formerly 312a09983a] [formerly 312a09983a [formerly 64c2460028]] [formerly 1af8bfa176 [formerly 312a09983a [formerly 64c2460028] [formerly 1af8bfa176 [formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]]]]
Former-commit-id: 1af8bfa176
Former-commit-id: 51147fbe22 [formerly 7607cd015b] [formerly 7f3e8b5c21] [formerly 27f4cb4ce038caab6e4ecbf1ab1a87fb581bb870 [formerly 4713e121a372bd9e590289df0e094c3f4646818c] [formerly 7f3e8b5c21 [formerly d62a9f3b08]]]
Former-commit-id: 2183a253907c9c249573c7646b09c423edd84474 [formerly e37e62740f5ac23fd6116df99c13fa498b772dd0] [formerly 202f929a5f [formerly 05655af06b]]
Former-commit-id: 202f929a5f
Former-commit-id: d55a30413e
2014-01-27 14:23:02 -05:00
Stephen Gilbert
14644e08b5 Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 5aa9b21b6d [formerly ef9b4279bc] [formerly a7ce764b19] [formerly a7ce764b19 [formerly a70450b064]] [formerly 5aa9b21b6d [formerly ef9b4279bc] [formerly a7ce764b19] [formerly a7ce764b19 [formerly a70450b064]] [formerly bf7fcc1952 [formerly a7ce764b19 [formerly a70450b064] [formerly bf7fcc1952 [formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]]]]
Former-commit-id: bf7fcc1952
Former-commit-id: 0b7e87ec0e [formerly 7ae8c668c6] [formerly 48aeec0c17] [formerly 905d54b1a9950abcaf3e1cdc9ce3b8e3f3f10742 [formerly beb85c45aff9872eb3c656babb7195987348c330] [formerly 48aeec0c17 [formerly 3a3f8a7be0]]]
Former-commit-id: ec0ca67a34f8a509d2b056788c2db2f4a6a7bddf [formerly 1ddc083427fcb030b06255db392d49e39e56b254] [formerly 21dea78fde [formerly f39c9fdaa4]]
Former-commit-id: 21dea78fde
Former-commit-id: 2b65be7c31
2014-01-27 14:22:17 -05:00
Stephen Gilbert
3afcfd9754 Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 8edc78849f [formerly 7383aa8502] [formerly 53fa8822e0] [formerly 53fa8822e0 [formerly 6785474b17]] [formerly 8edc78849f [formerly 7383aa8502] [formerly 53fa8822e0] [formerly 53fa8822e0 [formerly 6785474b17]] [formerly b64adbed81 [formerly 53fa8822e0 [formerly 6785474b17] [formerly b64adbed81 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]]]
Former-commit-id: b64adbed81
Former-commit-id: f20d3f0023 [formerly 023ac1960f] [formerly 511123b38c] [formerly ab0482ab426f387df897f63483c45112168fc7a5 [formerly 9726e54239f843bd384b3ad71761a58541ba9389] [formerly 511123b38c [formerly d947a0e7c1]]]
Former-commit-id: 37d71b0bad0fc8dd8c6e42fafee24faae0f4ba1a [formerly cfa23f5e70f04398b69beec17e564d605fac6509] [formerly f7c1bee352 [formerly 4cd6847849]]
Former-commit-id: f7c1bee352
Former-commit-id: ea7563f109
2014-01-27 14:20:47 -05:00
Richard Peter
2aa268bece Merge "Issue #2711 Get All levels from the database for derived parameters." into development
Former-commit-id: a00cfaa742 [formerly ec60bff55c] [formerly 766af8b281] [formerly 766af8b281 [formerly 90dd7474b3]] [formerly a00cfaa742 [formerly ec60bff55c] [formerly 766af8b281] [formerly 766af8b281 [formerly 90dd7474b3]] [formerly 5c1de78c24 [formerly 766af8b281 [formerly 90dd7474b3] [formerly 5c1de78c24 [formerly b238a853283cc1b71ce290b233db5f174e486c9f]]]]]
Former-commit-id: 5c1de78c24
Former-commit-id: c96d01f062 [formerly 6f92dc558e] [formerly 953925d24b] [formerly db0960a632a2a1f808039c8024d7a49d032244e6 [formerly 7f369638f9405f8d6174043e99a8d04a40fd4196] [formerly 953925d24b [formerly e9bc96c37e]]]
Former-commit-id: 3972090ceb417f2219d3f1317329d93ccb0e0b96 [formerly 0017578ec59f34f4d8290ac73de929229b41b192] [formerly b9f6b88091 [formerly bc9789fee5]]
Former-commit-id: b9f6b88091
Former-commit-id: d8edf2075c
2014-01-27 11:36:55 -06:00
Ben Steffensmeier
e61118b5a3 Issue #2711 Get All levels from the database for derived parameters.
Former-commit-id: 609b0c1d15 [formerly bd5bb4eca1] [formerly fdb67f9979] [formerly fdb67f9979 [formerly 08d277fe62]] [formerly 609b0c1d15 [formerly bd5bb4eca1] [formerly fdb67f9979] [formerly fdb67f9979 [formerly 08d277fe62]] [formerly 3ca92176ac [formerly fdb67f9979 [formerly 08d277fe62] [formerly 3ca92176ac [formerly 0b36f91188c458532eb26d8b4a01e7f8954eba5a]]]]]
Former-commit-id: 3ca92176ac
Former-commit-id: 09f9bd89df [formerly cdcd7dbe93] [formerly c42af67f51] [formerly 773840342f395d65beea46fb50e1242ae422daa6 [formerly 0fdc05342c87ce2c1bf8e4756cf8cd0f8acd2da5] [formerly c42af67f51 [formerly bedec49852]]]
Former-commit-id: cf6b1076d6f266541cd1456c551b5654c1c9a35d [formerly b461e075bb344d0765d652736c24ac003e89a136] [formerly 88f17f6f92 [formerly 4e0013ae24]]
Former-commit-id: 88f17f6f92
Former-commit-id: c691b216f3
2014-01-27 11:12:08 -06:00
Brian Clements
12ba997015 Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: 2b8a4520ed [formerly fffb6aaf9a] [formerly b86ad8ca6f] [formerly b86ad8ca6f [formerly f615f2226f]] [formerly 2b8a4520ed [formerly fffb6aaf9a] [formerly b86ad8ca6f] [formerly b86ad8ca6f [formerly f615f2226f]] [formerly 26ac549096 [formerly b86ad8ca6f [formerly f615f2226f] [formerly 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]]]
Former-commit-id: 26ac549096
Former-commit-id: cd86a93ddc [formerly e2ca671173] [formerly cfe945d76b] [formerly 2c056ea10d766848853102bb88dc146ee6a8faef [formerly beabd84fb816fcf8a5201927f1389915efb941f7] [formerly cfe945d76b [formerly 8944860cbb]]]
Former-commit-id: 6a69157720b5cf69409931694abc682701acafbc [formerly 72e40ed0e3344ea4433f6ff8a72c7dd93e6418a3] [formerly ff1882e80a [formerly dd9b3ca640]]
Former-commit-id: ff1882e80a
Former-commit-id: b200f4b644
2014-01-27 10:14:10 -06:00
Brad Gonzales
39f16fc69e Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.

Change-Id: I1986de99319fdecd21a94579c499266b048d382a

Former-commit-id: 869c67af39 [formerly 208d18e28e] [formerly afbaf72617] [formerly afbaf72617 [formerly e94023097e]] [formerly 869c67af39 [formerly 208d18e28e] [formerly afbaf72617] [formerly afbaf72617 [formerly e94023097e]] [formerly 02f9fd20dc [formerly afbaf72617 [formerly e94023097e] [formerly 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 22e6f77bfa [formerly 07eac8a84d] [formerly 71a32928d9] [formerly 4e2dbe9a0b721f28b40d49ba016e1a9fc7f528e3 [formerly 44dcb29c662d33832c30a88262faccc81d37a10a] [formerly 71a32928d9 [formerly a40afbe8ac]]]
Former-commit-id: 3f82aeacfa993cda4ec1aa5babf8e2898005e149 [formerly e98e41995555ae6eff555a6489dfa8be21dda1aa] [formerly 7707be3dcd [formerly f7c3c8c83d]]
Former-commit-id: 7707be3dcd
Former-commit-id: 7e84f1a451
2014-01-26 20:31:38 -06:00
Lee Venable
86c3a4b841 Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
Former-commit-id: 83e0894a85 [formerly a2d5ac6a20] [formerly e3e3c4feef] [formerly e3e3c4feef [formerly a49cfc6a74]] [formerly 83e0894a85 [formerly a2d5ac6a20] [formerly e3e3c4feef] [formerly e3e3c4feef [formerly a49cfc6a74]] [formerly d9d985eee4 [formerly e3e3c4feef [formerly a49cfc6a74] [formerly d9d985eee4 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]]]]]
Former-commit-id: d9d985eee4
Former-commit-id: 63c197b75d [formerly dd2dfceab2] [formerly f7dff455d2] [formerly 8b42ea2e75e49b7380fa7f1866a1762d1dcf4b02 [formerly 5f366aedf7b2ddda435296df7d5daca4ff12d14c] [formerly f7dff455d2 [formerly f387778dce]]]
Former-commit-id: 44b4fadae8dbd040085cbe8b55039320412ecf4a [formerly b5a2dec0314faf47df86fa1cc2f241044a7433fb] [formerly 4cbf1f4ff4 [formerly f64efd9712]]
Former-commit-id: 08e8f4ea203abfd4d24abfddafe0ae950d86e79a [formerly 4cbf1f4ff4]
Former-commit-id: effcad7487
2014-01-26 19:17:04 -06:00
Lee Venable
70fb714b4f Merge "Issue #2459 - Last change from unscheduled to deactivated." into omaha_14.2.1
Former-commit-id: effd128b05 [formerly b75fa0d487] [formerly 5c9897edbd] [formerly 5c9897edbd [formerly 7515cbcc6c]] [formerly effd128b05 [formerly b75fa0d487] [formerly 5c9897edbd] [formerly 5c9897edbd [formerly 7515cbcc6c]] [formerly fefceb7c8f [formerly 5c9897edbd [formerly 7515cbcc6c] [formerly fefceb7c8f [formerly 2f969c1e6ef6dfa1e6ee83a0fd32d9983f8dfa88]]]]]
Former-commit-id: fefceb7c8f
Former-commit-id: bcf23323bd [formerly 9c39800b66] [formerly a955b006c8] [formerly ecd79da0925ecea9ba7216a635ae9d057ba0bcbf [formerly b0cdbf17e34899fe78a7685841ad139be1187b0c] [formerly a955b006c8 [formerly 63cc1ed3f5]]]
Former-commit-id: be177a18444e3cb49d2bf7dbd887bc655cbbd03a [formerly 6d846af495a17a61f813f02cefd71708b8daa9db] [formerly 5480b898cf [formerly 2ea4cb1823]]
Former-commit-id: 5480b898cf
Former-commit-id: e71383b412
2014-01-26 19:16:46 -06:00