4903 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brian Clements	cd1b7dec1b	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: bebd62c6b6 [formerly cfa3c9e0e8] [formerly bebd62c6b6 [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]] Former-commit-id: 6ea009a2e1 Former-commit-id: bc75d43bc3 [formerly aff354a3d7] Former-commit-id: 9370df47fe	2014-02-03 15:34:58 -06:00
Greg Armendariz	e47453df3b	Issue #2754 - Fix import ... Former-commit-id: 5490e216be [formerly e611dbe912] [formerly 5490e216be [formerly e611dbe912] [formerly 2e79658417 [formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]]] Former-commit-id: 2e79658417 Former-commit-id: 744c6fd9b1 [formerly 23f17b3f63] Former-commit-id: ac169b4f24	2014-02-03 14:45:47 -06:00
Lee Venable	c483877308	Merge "Issue #2757. Fixed issues in Area Configuration Dialogs." into development ... Former-commit-id: 72a4a12e89 [formerly 19b883a407] [formerly 72a4a12e89 [formerly 19b883a407] [formerly c44b120176 [formerly ecb833d823cf072f4e02b312fe320c2ade5162a2]]] Former-commit-id: c44b120176 Former-commit-id: 3e3805e1a7 [formerly 15f94a61b5] Former-commit-id: e65a289e97	2014-02-03 14:31:28 -06:00
Nate Jensen	20ed92e4e8	Merge "Issue #2699 added handle config to prefs" into development ... Former-commit-id: 611faedbeb [formerly 0c569ed407] [formerly 611faedbeb [formerly 0c569ed407] [formerly f796e81400 [formerly a58ae34cf5b40b7d6732b0de5cce2dd94709ba1e]]] Former-commit-id: f796e81400 Former-commit-id: 09813c5943 [formerly 486702d99e] Former-commit-id: 5c4a0f61be	2014-02-03 14:23:23 -06:00
Ben Steffensmeier	f81c6dd1b9	Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers. ... Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834 Former-commit-id: 921401ffe9 [formerly 8865177c6b] [formerly 921401ffe9 [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]] Former-commit-id: 97a64f89f1 Former-commit-id: 1f34342948 [formerly 2be72739b5] Former-commit-id: d05d31fa34	2014-02-03 14:07:07 -06:00
Brian Clements	592cf33f35	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: 21c75d1d01 [formerly 1ff4ed1ae9] [formerly 21c75d1d01 [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]] Former-commit-id: 16c1aaed3e Former-commit-id: 2f60d1b579 [formerly 7c867338c8] Former-commit-id: 671bfaa75c	2014-02-03 12:59:57 -06:00
Greg Armendariz	b1739c53cc	Merge "Issue #2754 - Remove commons logging calls" into development ... Former-commit-id: 4248cf6e93 [formerly 4926d89aec] [formerly 4248cf6e93 [formerly 4926d89aec] [formerly 0b8031caa8 [formerly 118bc77a245bd1392aefbf2aae4ada5ed4e8ad32]]] Former-commit-id: 0b8031caa8 Former-commit-id: 9906121d18 [formerly 1f41ea93a4] Former-commit-id: b06cf0eb70	2014-02-03 12:24:20 -06:00
Greg Armendariz	4600cda583	Issue #2754 - Remove commons logging calls ... Former-commit-id: efe8011970 [formerly fa27142ec2] [formerly efe8011970 [formerly fa27142ec2] [formerly 6ae002cf46 [formerly 7458fc7a7d3276fb14d963c92f55c89ced838837]]] Former-commit-id: 6ae002cf46 Former-commit-id: 9f09293f2e [formerly accf0505a5] Former-commit-id: e568b3792d	2014-02-03 12:17:30 -06:00
Steve Harris	e6cab2a902	Merge branch 'omaha_14.2.1' into development ... Conflicts: ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml Former-commit-id: ae2b849157 [formerly 7a156e297a] [formerly ae2b849157 [formerly 7a156e297a] [formerly 7b59bd41eb [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]] Former-commit-id: 7b59bd41eb Former-commit-id: 4a379aa6e5 [formerly aa9b488963] Former-commit-id: b9af02c0b3	2014-02-03 10:29:16 -06:00
Steve Harris	08700a77b1	Merge branch 'master_14.2.1' into omaha_14.2.1 ... Former-commit-id: 131af8538e [formerly b2032880ac] [formerly 131af8538e [formerly b2032880ac] [formerly eb9d4319dc [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]] Former-commit-id: eb9d4319dc Former-commit-id: 6883c64744 [formerly 33aea09906] Former-commit-id: d8989145ac	2014-02-03 10:26:11 -06:00
Nate Jensen	f67735769e	Merge "Issue #2725 deriv param to common stage 1" into development ... Former-commit-id: 4784c24db0 [formerly c3b7ae533e] [formerly 4784c24db0 [formerly c3b7ae533e] [formerly 12892db76a [formerly 128141724c41850d4ced50efc1edf2c3019604cb]]] Former-commit-id: 12892db76a Former-commit-id: 2da30ce9cc [formerly fccefc9bb1] Former-commit-id: 617a429fa1	2014-02-03 10:17:43 -06:00
Greg Armendariz	cad35882f8	Issue #2754 - Remove logging calls ... Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05 Former-commit-id: 47347f42ca [formerly e0394c649c] [formerly 47347f42ca [formerly e0394c649c] [formerly 2ec1248fcc [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]] Former-commit-id: 2ec1248fcc Former-commit-id: 2e03bcff4b [formerly e02caca466] Former-commit-id: 47d3f2e498	2014-02-03 09:29:47 -06:00
Everett Kladstrup	3c30f65980	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: 90df04614d [formerly bd50a38d87] [formerly 90df04614d [formerly bd50a38d87] [formerly 80ad25754b [formerly 604ae156f8b235e2e1736863b419547289403240]]] Former-commit-id: 80ad25754b Former-commit-id: 40b796f59b [formerly 415ccd78fb] Former-commit-id: 57f9230654	2014-02-03 09:02:58 -06:00
Slav Korolev	559d0f9499	Issue #2757. Fixed issues in Area Configuration Dialogs. ... Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf Former-commit-id: 6013121a99 [formerly ea573d2c30] [formerly 6013121a99 [formerly ea573d2c30] [formerly a768f540f0 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]] Former-commit-id: a768f540f0 Former-commit-id: d2d4672a46 [formerly 6d9a066c36] Former-commit-id: baf598a6ff	2014-02-03 09:50:01 -05:00
Brian Clements	f2a97eb00e	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: 7176bf59b8 [formerly b88eaeb73e] [formerly 7176bf59b8 [formerly b88eaeb73e] [formerly b0402be1d3 [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]] Former-commit-id: b0402be1d3 Former-commit-id: 9210aae10a [formerly b651ada4b3] Former-commit-id: 7e1425c419	2014-01-31 13:10:35 -06:00
Nate Jensen	21dcf31757	Merge "Issue #2312 Java 6 compatibility, fix legend menus." into development ... Former-commit-id: 6112fd394c [formerly 62f86b0a02] [formerly 6112fd394c [formerly 62f86b0a02] [formerly 0f1f50650c [formerly 4bd377297daea932f4907f7119208461f7f79281]]] Former-commit-id: 0f1f50650c Former-commit-id: 38eb172fce [formerly 22190c55f0] Former-commit-id: 7dedc1ad8d	2014-01-31 12:00:00 -06:00
Nate Jensen	19bc148a55	Merge "Issue #2698 added handles to venues" into development ... Former-commit-id: 003e6bf0d2 [formerly 4a3c89c722] [formerly 003e6bf0d2 [formerly 4a3c89c722] [formerly 50da1236dd [formerly 0e6750826ed7f36e92a6cd451138bc3562149aad]]] Former-commit-id: 50da1236dd Former-commit-id: 49410a7e53 [formerly 87d49a2b1c] Former-commit-id: b9130e5e22	2014-01-31 11:59:34 -06:00
Brian Clements	cf8b85f3d2	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: 4e2cb3f7ae [formerly 3e585945d6] [formerly 4e2cb3f7ae [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]] Former-commit-id: 3250eb34f5 Former-commit-id: 4190b13ae2 [formerly 4f4d5c5d69] Former-commit-id: e04cb11154	2014-01-31 09:44:31 -06:00
Brian.Dyke	a540be3064	Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 ... Former-commit-id: 89b824b846 [formerly 4e7b1b207f] [formerly 89b824b846 [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]] Former-commit-id: 40ce5ccc2a Former-commit-id: 3fd2ef82ab [formerly dd183bc0e9] Former-commit-id: df55ab5503	2014-01-31 08:28:09 -05:00
Bryan Kowal	3dda41af98	Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change) ... Former-commit-id: 6e19ac4acf [formerly 6fd129379f] [formerly 6e19ac4acf [formerly 6fd129379f] [formerly 678fb83ded [formerly e027cf42b3b395a834f91512e269e41377f673ef]]] Former-commit-id: 678fb83ded Former-commit-id: 9ef27edf5f [formerly 77370b4e68] Former-commit-id: cf6c6feccc	2014-01-30 18:11:48 -06:00
Ben Steffensmeier	f4a89f93b4	Issue #2312 Java 6 compatibility, fix legend menus. ... Former-commit-id: 27fbb0f870 [formerly 7ab61aaa23] [formerly 27fbb0f870 [formerly 7ab61aaa23] [formerly fe5f0118da [formerly 2853536477d39459de3cbb4eef7670734cfad5f8]]] Former-commit-id: fe5f0118da Former-commit-id: 1f23bb4cf7 [formerly e4232ce9a7] Former-commit-id: 7acd053aa2	2014-01-30 16:12:10 -06:00
Greg Armendariz	af0af0920b	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: 7fbfe85478 [formerly ed0c724860] [formerly 7fbfe85478 [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]] Former-commit-id: 5ad9cca7a3 Former-commit-id: b4d9ec0e46 [formerly 66e79f459e] Former-commit-id: 677e6ac584	2014-01-30 13:04:40 -06:00
Nate Jensen	cfb4bdbb21	Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN ... events while in there Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619 Former-commit-id: c18e66cc45 [formerly 327c588c9e] [formerly c18e66cc45 [formerly 327c588c9e] [formerly 906c679b4e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]] Former-commit-id: 906c679b4e Former-commit-id: af0ac40f47 [formerly 7bd1d802be] Former-commit-id: ed91c1d6f5	2014-01-30 12:02:42 -06:00
Ben Steffensmeier	a00d385f2e	Issue #2537 Fix modelsounding registration. ... Former-commit-id: 12b989a34b [formerly 819369747e] [formerly 12b989a34b [formerly 819369747e] [formerly 1db0291792 [formerly e4e476afc2063211523840eaa6f845a4c2264774]]] Former-commit-id: 1db0291792 Former-commit-id: 17ed6c9664 [formerly 501aec2537] Former-commit-id: d06eb22524	2014-01-29 15:36:05 -06:00
Bryan Kowal	25d38dd699	Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency ... Former-commit-id: 635548dae3 [formerly d88019d902] [formerly 635548dae3 [formerly d88019d902] [formerly ee95e4de7e [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]] Former-commit-id: ee95e4de7e Former-commit-id: 89e0e847c9 [formerly bd88b563fe] Former-commit-id: 1ae4a1d919	2014-01-29 14:25:38 -06:00
Ron Anderson	9dd3dbe791	Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development ... Former-commit-id: d0e821e5d1 [formerly 61f35e86ec] [formerly d0e821e5d1 [formerly 61f35e86ec] [formerly f4f89c79a2 [formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]] Former-commit-id: f4f89c79a2 Former-commit-id: ff65b54555 [formerly 2e9389293a] Former-commit-id: a4daed8dd2	2014-01-29 14:24:26 -06:00
Ron Anderson	7e541f2f77	Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1 ... Former-commit-id: 81f9709ae7 [formerly fb262fdad2] [formerly 81f9709ae7 [formerly fb262fdad2] [formerly 7c06f0b011 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]] Former-commit-id: 7c06f0b011 Former-commit-id: 25123bdeb0 [formerly 64f55c6b02] Former-commit-id: d2d7920575	2014-01-29 14:16:31 -06:00
Ron Anderson	2086f03c28	Issue #2719 Add NHA domain to serverConfig.py ... Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044 Former-commit-id: ea12cecc04 [formerly ce28c6c47f] [formerly ea12cecc04 [formerly ce28c6c47f] [formerly 0f6e082769 [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]] Former-commit-id: 0f6e082769 Former-commit-id: 09335f5372 [formerly 5427d15150] Former-commit-id: 280434a03f	2014-01-29 13:55:54 -06:00
David Gillingham	14326b8c8d	Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route. ... Former-commit-id: fc25bbe1e9 [formerly 5edfbaa4a5] [formerly fc25bbe1e9 [formerly 5edfbaa4a5] [formerly c802315ddc [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]] Former-commit-id: c802315ddc Former-commit-id: 04d6bc5a42 [formerly 17d38b4974] Former-commit-id: 38333b45a7	2014-01-29 11:56:05 -06:00
Nate Jensen	8d6097fd9a	Merge "Issue #2698 made sessions private and invite only" into development ... Former-commit-id: 1977b026ee [formerly 52c3b71049] [formerly 1977b026ee [formerly 52c3b71049] [formerly 004999bbec [formerly db4447bf109981ded541bff929687040cc28953a]]] Former-commit-id: 004999bbec Former-commit-id: bcf82eb692 [formerly 0a7961457e] Former-commit-id: 3b6488cdb5	2014-01-29 11:01:45 -06:00
Brian Clements	96e89d9f83	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: 1f1be20d41 [formerly c498307b30] [formerly 1f1be20d41 [formerly c498307b30] [formerly 5b9f694930 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]] Former-commit-id: 5b9f694930 Former-commit-id: 07452b7778 [formerly 4a0682a9e8] Former-commit-id: 76ec4d56c8	2014-01-29 10:16:15 -06:00
Max Schenkelberg	6953e81887	Issue #2680 Fixed various OpenGL errors ... Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b (cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]]) Former-commit-id: 122c3442f8 [formerly 0c840cf724] [formerly 122c3442f8 [formerly 0c840cf724] [formerly d566ed9927 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]] Former-commit-id: d566ed9927 Former-commit-id: e1717b2729 [formerly f5ff746126] Former-commit-id: 1cdbdfceba	2014-01-29 10:15:38 -06:00
Steve Harris	e3d1abe909	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: 14ba3b29f4 [formerly 1738185503] [formerly 14ba3b29f4 [formerly 1738185503] [formerly 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]] Former-commit-id: 1aea63a1f6 Former-commit-id: d9cd003a5a [formerly 1fd5b2255f] Former-commit-id: ec69a2c4f7	2014-01-29 09:41:57 -06:00
Stephen Gilbert	e60e1873c0	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: beaee1eaf0 [formerly c9af367a72] [formerly beaee1eaf0 [formerly c9af367a72] [formerly 0e96169b6f [formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]] Former-commit-id: 0e96169b6f Former-commit-id: e0e74ad5fd [formerly 71e8735fdf] Former-commit-id: f5327455c3	2014-01-29 09:58:10 -05:00
Greg Armendariz	91d14d6f32	Issue #2754 - Remove extra character ... Former-commit-id: 6ff868a167 [formerly 9cc089b369] [formerly 6ff868a167 [formerly 9cc089b369] [formerly 1017abdc78 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]] Former-commit-id: 1017abdc78 Former-commit-id: 4e092b5810 [formerly a8c75ce81e] Former-commit-id: b37096a395	2014-01-29 08:43:09 -06:00
Ron Anderson	4512aadb1c	Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1 ... Former-commit-id: 6d33a83771 [formerly b7c10ddebf] [formerly 6d33a83771 [formerly b7c10ddebf] [formerly 20259f3554 [formerly 8040e4cad015d5725ed3b08bc9ae5e4d97b21749]]] Former-commit-id: 20259f3554 Former-commit-id: 5f9706019e [formerly 604a4363a3] Former-commit-id: 3a55c53d5b	2014-01-29 08:39:41 -06:00
Greg Armendariz	30e5a6e2f9	Issue #2754 - Return commons logging to build for qpid ... Former-commit-id: c70e69147d [formerly 6d3e40d648] [formerly c70e69147d [formerly 6d3e40d648] [formerly 976edd2545 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]] Former-commit-id: 976edd2545 Former-commit-id: b81825a668 [formerly 346d535a6c] Former-commit-id: 851b9180ec	2014-01-28 15:06:11 -06:00
Stephen Gilbert	39c149a747	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: e60635f47d [formerly ac68b01bbc] [formerly e60635f47d [formerly ac68b01bbc] [formerly f21b0f5d82 [formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]] Former-commit-id: f21b0f5d82 Former-commit-id: 29ca14c4b7 [formerly 486096ada2] Former-commit-id: fb46c34d1c	2014-01-28 14:52:46 -05:00
Mike Duff	3495a67c27	Issue #2636 - Changed subscription code to use gmt calendar. ... Former-commit-id: 4440c27ff6 [formerly 6e01cdb78e] [formerly 4440c27ff6 [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]] Former-commit-id: 1caacacfe3 Former-commit-id: a76507e04f [formerly f4da152d87] Former-commit-id: 1f4cc8681d	2014-01-28 11:09:33 -06:00
Brian Clements	ad3939140c	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: b4d930bcb9 [formerly 6b1843f19a] [formerly b4d930bcb9 [formerly 6b1843f19a] [formerly bd19366ada [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]] Former-commit-id: bd19366ada Former-commit-id: bffa4d84fe [formerly f22052321b] Former-commit-id: 737745ade7	2014-01-28 10:07:11 -06:00
Ron Anderson	b6624cf7ca	Issue #2504 Fix ingestAT ... Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8 Former-commit-id: a78d1fcd6b [formerly bb2ef86d14] [formerly a78d1fcd6b [formerly bb2ef86d14] [formerly 045ebfe967 [formerly ccf63372764f767af99d93b4d0299f9b8d066ee6]]] Former-commit-id: 045ebfe967 Former-commit-id: cca9be6e65 [formerly 89246e17c5] Former-commit-id: 9dfa819625	2014-01-27 18:16:46 -06:00
Stephen Gilbert	202f929a5f	Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1 ... Former-commit-id: 312a09983a [formerly 64c2460028] [formerly 312a09983a [formerly 64c2460028] [formerly 1af8bfa176 [formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]] Former-commit-id: 1af8bfa176 Former-commit-id: 7f3e8b5c21 [formerly d62a9f3b08] Former-commit-id: 05655af06b	2014-01-27 14:23:02 -05:00
Stephen Gilbert	21dea78fde	Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1 ... Former-commit-id: a7ce764b19 [formerly a70450b064] [formerly a7ce764b19 [formerly a70450b064] [formerly bf7fcc1952 [formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]] Former-commit-id: bf7fcc1952 Former-commit-id: 48aeec0c17 [formerly 3a3f8a7be0] Former-commit-id: f39c9fdaa4	2014-01-27 14:22:17 -05:00
Stephen Gilbert	f7c1bee352	Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1 ... Former-commit-id: 53fa8822e0 [formerly 6785474b17] [formerly 53fa8822e0 [formerly 6785474b17] [formerly b64adbed81 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]] Former-commit-id: b64adbed81 Former-commit-id: 511123b38c [formerly d947a0e7c1] Former-commit-id: 4cd6847849	2014-01-27 14:20:47 -05:00
Richard Peter	b9f6b88091	Merge "Issue #2711 Get All levels from the database for derived parameters." into development ... Former-commit-id: 766af8b281 [formerly 90dd7474b3] [formerly 766af8b281 [formerly 90dd7474b3] [formerly 5c1de78c24 [formerly b238a853283cc1b71ce290b233db5f174e486c9f]]] Former-commit-id: 5c1de78c24 Former-commit-id: 953925d24b [formerly e9bc96c37e] Former-commit-id: bc9789fee5	2014-01-27 11:36:55 -06:00
Ben Steffensmeier	88f17f6f92	Issue #2711 Get All levels from the database for derived parameters. ... Former-commit-id: fdb67f9979 [formerly 08d277fe62] [formerly fdb67f9979 [formerly 08d277fe62] [formerly 3ca92176ac [formerly 0b36f91188c458532eb26d8b4a01e7f8954eba5a]]] Former-commit-id: 3ca92176ac Former-commit-id: c42af67f51 [formerly bedec49852] Former-commit-id: 4e0013ae24	2014-01-27 11:12:08 -06:00
Brian Clements	ff1882e80a	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: b86ad8ca6f [formerly f615f2226f] [formerly b86ad8ca6f [formerly f615f2226f] [formerly 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]] Former-commit-id: 26ac549096 Former-commit-id: cfe945d76b [formerly 8944860cbb] Former-commit-id: dd9b3ca640	2014-01-27 10:14:10 -06:00
Brad Gonzales	7707be3dcd	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: afbaf72617 [formerly e94023097e] [formerly afbaf72617 [formerly e94023097e] [formerly 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]] Former-commit-id: 02f9fd20dc Former-commit-id: 71a32928d9 [formerly a40afbe8ac] Former-commit-id: f7c3c8c83d	2014-01-26 20:31:38 -06:00
Lee Venable	4cbf1f4ff4	Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1 ... Former-commit-id: e3e3c4feef [formerly a49cfc6a74] [formerly e3e3c4feef [formerly a49cfc6a74] [formerly d9d985eee4 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]]] Former-commit-id: d9d985eee4 Former-commit-id: f7dff455d2 [formerly f387778dce] Former-commit-id: f64efd9712	2014-01-26 19:17:04 -06:00
Lee Venable	5480b898cf	Merge "Issue #2459 - Last change from unscheduled to deactivated." into omaha_14.2.1 ... Former-commit-id: 5c9897edbd [formerly 7515cbcc6c] [formerly 5c9897edbd [formerly 7515cbcc6c] [formerly fefceb7c8f [formerly 2f969c1e6ef6dfa1e6ee83a0fd32d9983f8dfa88]]] Former-commit-id: fefceb7c8f Former-commit-id: a955b006c8 [formerly 63cc1ed3f5] Former-commit-id: 2ea4cb1823	2014-01-26 19:16:46 -06:00