Commit graph

4898 commits

Author SHA1 Message Date
Ben Steffensmeier
4d1276def2 Issue #2711 Use level factory more.
Former-commit-id: 3d9b435262 [formerly 1069ef8d67] [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 81be956862611f9499f1e2716026d69eacf91f27 [formerly f45646ae91]
Former-commit-id: 29f9a87085
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
88fd930b77 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: ee8f345cb2 [formerly 2fd8351874] [formerly e1dc75f97a] [formerly 6d0a78e233 [formerly e1dc75f97a [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 33d269bf45b5c7555173d073fc5eeb1dc2b0f237 [formerly 2d11421854]
Former-commit-id: 058652febe
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
66b052cd5a Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6]
Former-commit-id: 0fde78c595
2014-02-26 14:45:19 -06:00
Lee Venable
de2bff4d95 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: d74b2c0118 [formerly bb4b034375] [formerly 94cede8153] [formerly e0ee93bab3 [formerly 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 08d8e41d0aefbc0220f2fd973374918a413db9bb [formerly e0fbc02307]
Former-commit-id: 91d419662c
2014-02-26 13:21:58 -06:00
Lee Venable
715c69bd2a Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: 7bdf0b7396 [formerly f58481dc6a] [formerly 72f71bc000] [formerly 34191dc3dc [formerly 72f71bc000 [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]]
Former-commit-id: 34191dc3dc
Former-commit-id: 256d29e07a25ae3241087bae47151c23f8e56c06 [formerly b4b6cb655e]
Former-commit-id: f2db331c8e
2014-02-25 15:53:14 -06:00
Brad Gonzales
7c0db7ac7a Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz.  Updated the component.spec to the new version number.

Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3

Former-commit-id: e31b98bb85 [formerly 40a653867a] [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]
Former-commit-id: cf9c22ac99
Former-commit-id: ba481e4a842a84fed85e94eea66cb8cabf458c52 [formerly a24cbaf683]
Former-commit-id: 1df77529c3
2014-02-25 14:42:59 -06:00
Slav Korolev
b8e48e1740 Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 6d4cf7476f [formerly a34b1196b7] [formerly 5087a0154d] [formerly bfa84e65ec [formerly 5087a0154d [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]
Former-commit-id: bfa84e65ec
Former-commit-id: fa4d07cf875d177a851b8a0990f11bc8ec215736 [formerly 40b4bf6e8e]
Former-commit-id: 0566c86a6c
2014-02-25 15:23:22 -05:00
Richard Peter
85a16601ed Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: d78cc4dd432220d2d29a4c19ab555ecd83067517 [formerly 66b271a550]
Former-commit-id: f803d557c2
2014-02-25 12:34:38 -06:00
Brad Gonzales
c364269fae Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01]
Former-commit-id: f57f472f6a
2014-02-25 09:22:08 -06:00
Brian Clements
408b834fc6 Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: 9597ce5cd9 [formerly 3f0e9d7a77] [formerly eef242194a] [formerly 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: afda13c403f6099ee52fb2149ecc71798cd4f1b6 [formerly 473fcda0cf]
Former-commit-id: 1f5d296314
2014-02-25 09:17:36 -06:00
Nate Jensen
308a560602 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 055caba2bf [formerly 8ef957d2f0] [formerly 279f05a1d5] [formerly 060eafc272 [formerly 279f05a1d5 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 558be9d98a06c71a0e559cdc2b834c684467687f [formerly a5477ea272]
Former-commit-id: 2f58408036
2014-02-24 16:17:20 -06:00
Nate Jensen
4d460d3a26 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: a201d43d63 [formerly 230b8bf117] [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 8a00a419a1 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: 67f46ed66aeefd71f35b8ac193010ae9e960ed0b [formerly 74329bcb89]
Former-commit-id: a97f5b5ff7
2014-02-24 15:35:13 -06:00
Brian.Dyke
6b1b6d38e3 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]
Former-commit-id: 73a1c238f4
2014-02-24 14:51:00 -05:00
Ron Anderson
5831f8d79e Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]
Former-commit-id: 7d3af157f8
2014-02-24 13:46:48 -06:00
Nate Jensen
1837a83743 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: 9d8fe1a0158253d440a5c43e42535da472859450 [formerly bf8bb95f51]
Former-commit-id: d6e9cb73f5
2014-02-24 13:25:35 -06:00
Brian Clements
743c6cd74b Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: a173972437 [formerly 9217ba24c5] [formerly 3f362519aa] [formerly 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 83e8dc39015b780c38746e7cdc688605acdb3a6e [formerly b9c9be4c4f]
Former-commit-id: 73cb7b7313
2014-02-24 13:19:07 -06:00
Dave Hladky
05c81677d2 Issue #2469 Fixed default rules implementation
Former-commit-id: d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76 [formerly ff5a5961db]
Former-commit-id: dc97eb7890
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
59c34458ff Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 8c6b48d405e8efd0e175f4ea9f8f0320fd5743ea [formerly a510abdb22]
Former-commit-id: 3c7e578000
2014-02-24 10:27:30 -06:00
Ben Steffensmeier
d27c21b9f6 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593]
Former-commit-id: 7aca322faa
2014-02-21 17:37:19 -06:00
Dave Hladky
e15d2f50f9 Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: cd7934e12f [formerly 542ba7e504] [formerly c4bed432da] [formerly 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: de3f95e5f61e7ea15849603d3138b155fe401280 [formerly 445b55f796]
Former-commit-id: 3b9f80d03e
2014-02-21 16:01:20 -06:00
Richard Peter
c410157f33 Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
Former-commit-id: c06007eb9b [formerly 66d3fce57d] [formerly e923639fb1] [formerly 58a3aac09d [formerly e923639fb1 [formerly d76c2325618af08be1f20ebec0b2463a49a9b03f]]]
Former-commit-id: 58a3aac09d
Former-commit-id: 55bbab3b33338f9d3e07dce6210db0572c73d106 [formerly 5937649085]
Former-commit-id: 9ba35d60bd
2014-02-21 11:26:26 -06:00
Nate Jensen
7e1f0c83f0 Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
Former-commit-id: f4b3acbac0 [formerly c1f4fbfbd4] [formerly eeee76da47a877268f8133ba28cf9891770ffa8a [formerly 9a3f60a216]] [formerly dd00fd1445 [formerly 9a3f60a216 [formerly 4399b11d3958de1cf8cce2bc66085aa43efb6519]]]
Former-commit-id: dd00fd1445
Former-commit-id: c42919a9792330f82dd0366f0bf2df51b0bd4270 [formerly 7b1cf570f4]
Former-commit-id: 62596de046
2014-02-20 17:55:35 -06:00
Brad Gonzales
1b59fc4647 Issue #2828 Added purge cron to Central SBN Simulator.
Amend: Removed comment accidentally merged from other branch.
       Moved logging to outer loop and log count of purged files for each dir.

Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6

Former-commit-id: 3052b2d9c7 [formerly 290a381715] [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 12e22752c2 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: e919fb24b5e5ab419e4dfb1442bf1fa5d1ee68d4 [formerly 08c4d1afea]
Former-commit-id: bef4e8ee53
2014-02-20 16:31:16 -06:00
Mike Duff
5754117aad Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: 9eafacaac2 [formerly a96a833f51] [formerly ed5cb91406] [formerly a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: 054cdc944f74842daa02964eb9d5d80d21f23654 [formerly d90f4495c2]
Former-commit-id: f98eec12b9
2014-02-20 15:09:10 -06:00
Brian.Dyke
1fc3b18abb ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 45cf129ad7 [formerly 5f3ca0a3f4] [formerly 2f79cc486e] [formerly 916f657e04 [formerly 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]
Former-commit-id: 916f657e04
Former-commit-id: b55df208e18a858dd848c1f37a3594d57d916867 [formerly e36ae1dd7f]
Former-commit-id: 9ce06f52c4
2014-02-20 15:50:50 -05:00
Ron Anderson
e2bd1327b4 Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: bb3577ef37 [formerly e4aeaa79f1] [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly 6a7e4a147d [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: 5022d5c01f2275eac9682199580e2e9a6b2b93e7 [formerly d63ad1b1de]
Former-commit-id: 1dcaf2b790
2014-02-20 12:32:31 -06:00
Brian Clements
e7584f3a49 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 8bbf2bb6bd [formerly a2bdfa25cc] [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681 [formerly 4b7ba54dc3]
Former-commit-id: 04697836b8
2014-02-20 11:50:54 -06:00
Brian Clements
08a0e5baf2 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]
Former-commit-id: 9d00fe2bab
2014-02-20 11:10:14 -06:00
Nate Jensen
5d5518e29f Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 6973755f4e [formerly 6ef26a636c] [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: bd38074eb147c551318fc588a5101194eae5605b [formerly 9f33e97c1b]
Former-commit-id: 6e2150ccd7
2014-02-20 10:53:21 -06:00
Ron Anderson
81b8bf2374 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: e1585c58e1 [formerly 810ad594a1] [formerly c13942140a] [formerly 6f4a63000d [formerly c13942140a [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]
Former-commit-id: 6f4a63000d
Former-commit-id: 3eb2456c26e36a840ecec7dab9cc4390d60c3a47 [formerly c07544b904]
Former-commit-id: ee5658f9d9
2014-02-20 09:55:56 -06:00
Ron Anderson
e1a346790e Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 6645688ff4 [formerly 2bfa521e7d] [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 6b6aa14e59 [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]
Former-commit-id: 08a1be844d
Former-commit-id: ccd2b797cfa81d3394ddffbff2fae12e18e85480 [formerly 1571b9a8eb]
Former-commit-id: 0ee3625c50
2014-02-20 09:34:18 -06:00
Nate Jensen
08ede8e9f3 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: adb51300d8 [formerly 4563e38db2] [formerly 3078b69273] [formerly 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: 1a60933c3ce5c3f2514129d9f7ef73e507bb6d7c [formerly 5412b72c57]
Former-commit-id: c936a659a5
2014-02-19 17:22:00 -06:00
Nate Jensen
8a564e9987 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: f939d93d7f [formerly 3782880dac] [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9bf4479e05cb345ab571f6736d903c87cbcab9f4 [formerly b1e2788958]
Former-commit-id: 9394879520
2014-02-19 17:18:24 -06:00
Nate Jensen
eeac24c773 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027]
Former-commit-id: d3ec0da1bb
2014-02-19 16:19:27 -06:00
Ron Anderson
efbe57d909 Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: dab0ebc99e [formerly 8703c43937] [formerly d87e0842ed68e4ba44c266df39b6308f7366e5ee [formerly 98d2417f94]] [formerly b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: 5a4e4666cbcd00018ef121b89b85a78808d680db [formerly 7e7f0abfdc]
Former-commit-id: b9904edc3a
2014-02-19 15:39:56 -06:00
Mike Duff
a723f69ad9 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 280611ef49d0a886c12f13b5471242ae42c55bac [formerly 3100a71f34]
Former-commit-id: 89c4a3e04b
2014-02-19 15:26:14 -06:00
Mike Duff
10765884a3 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 8a29af4894 [formerly 48a0b34b5f] [formerly 682c6af456] [formerly 183657fb33 [formerly 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 4622ac20555cc93d1c3532eaaaec9b3ab36c4650 [formerly 86fce9d547]
Former-commit-id: 8be2622f85
2014-02-19 15:20:29 -06:00
Nate Jensen
7f1665f2eb Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: 72acab26c3 [formerly b4ac186728] [formerly 4b4cca776f] [formerly c72e2be969 [formerly 4b4cca776f [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]
Former-commit-id: c72e2be969
Former-commit-id: b5160733f88b5b22d9395a61e0d9f2dc75ca22a9 [formerly 7099b45023]
Former-commit-id: 5ef747c703
2014-02-19 14:52:24 -06:00
Lee Venable
a0d9fe6f20 Merge "Issue #2734 - default time range to 24 hours." into development
Former-commit-id: 5582282777 [formerly de102f4e94] [formerly 23e9cf65d9125bf30a194ec43b0a43ca7e06e7bd [formerly 8e967e8e59]] [formerly e204b350ee [formerly 8e967e8e59 [formerly 4604b591b1f15621fcf4cd0e93143435cccfe43b]]]
Former-commit-id: e204b350ee
Former-commit-id: 12a7b36c051b01f74e46b576dd6b8390be7ddea1 [formerly 9cb8925e51]
Former-commit-id: 404a4c3149
2014-02-19 12:33:46 -06:00
Ron Anderson
84bea14340 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]
Former-commit-id: 908e43039e
2014-02-19 11:55:11 -06:00
Slav Korolev
164665bbac Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b

Former-commit-id: 39e49448ba [formerly f7a6a6c613] [formerly a597ac0989] [formerly 3b1ea13cb1 [formerly a597ac0989 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]]
Former-commit-id: 3b1ea13cb1
Former-commit-id: eb29cf1af1a77f7e96c773b8304d91c618f49609 [formerly 8ec2d02f52]
Former-commit-id: 06d55c28f4
2014-02-19 12:01:06 -05:00
Mike Duff
bac3c86658 Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: c7e22b7b3b [formerly bc180503b1] [formerly 19033601bf] [formerly 0b316f7bd9 [formerly 19033601bf [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: 0bf0f051070755b17c7ecbd3f200deb688e5152a [formerly 7710724c5a]
Former-commit-id: 06ed3db690
2014-02-19 10:23:48 -06:00
Matt Nash
9cb0b6d530 Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization

Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2

Former-commit-id: 1d6e1d443c [formerly 3f67324d7c] [formerly 2d20e84f6a] [formerly 1835019567 [formerly 2d20e84f6a [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: 82cdf604370def6ebacc4f1cbb2ebeaa41b75898 [formerly bb10484bd0]
Former-commit-id: ae1d36b6d0
2014-02-19 10:01:25 -06:00
Brian Clements
30027665ac Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: abc01f5475 [formerly 06c16118e1] [formerly 73ae2145ee1dd7c24b67f28a479521c8624012a8 [formerly dc074a9650]] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]
Former-commit-id: 77bb396c9a
2014-02-19 08:32:26 -06:00
Lee Venable
32141b0655 Merge "Issue #2596 - Add check for null coordinates." into development
Former-commit-id: 0db46dd5fb [formerly 1620d0fb22] [formerly 6e60748b41] [formerly c871e4c872 [formerly 6e60748b41 [formerly e3517f5144c386038c4d535d79e62ec02d504f9f]]]
Former-commit-id: c871e4c872
Former-commit-id: 11bc06e458f731c1f368a4935187371bf65560e2 [formerly d62b4e7621]
Former-commit-id: 110557f42c
2014-02-18 18:08:10 -06:00
Nate Jensen
ce2568b36b Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: dd821703b6 [formerly 82fde2011c] [formerly 698a4f827d] [formerly 713ec598c3 [formerly 698a4f827d [formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]]]
Former-commit-id: 713ec598c3
Former-commit-id: c65265d8b3848ad6c99e526ec9bdee82f0097eb3 [formerly 79cbb8d79a]
Former-commit-id: 05edfb90d5
2014-02-18 17:35:39 -06:00
Mike Duff
5b1250208e Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: a370e81065 [formerly 283b0c670c] [formerly a6509aad8c] [formerly 9754f0d8dd [formerly a6509aad8c [formerly 11f3705080210161e6915309a4aec423b307cce8]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: e476bd640b2d122cdc7d40b221ae5ec48126a502 [formerly ecb0d45b24]
Former-commit-id: 40b0540830
2014-02-18 17:32:32 -06:00
Nate Jensen
2f1c0109b1 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: cc96c8c42118f1e42ca1fd6d9fbb3290f8d9ee88 [formerly a6bb05f2e3]
Former-commit-id: 4bb0997749
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
3b183b18f0 Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: 804bf6a8ed [formerly add98f22b1] [formerly 3e0cba04c0] [formerly e19b4518ef [formerly 3e0cba04c0 [formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]]]
Former-commit-id: e19b4518ef
Former-commit-id: eab364eba85832224dcbd55f2f0ec613bcd2e297 [formerly 399e3d3f07]
Former-commit-id: 2be385e6b8
2014-02-18 13:57:28 -06:00
David Gillingham
b373d71852 Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: d751bcbb04dc8d77626c940f99e5f7ad3f73874d [formerly 1520317c24]
Former-commit-id: a83191356d
2014-02-18 13:24:37 -06:00