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

5824 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Clements
9a8c3231c6 Issue #3021 increased width of create session dialog to fit error msg 
Former-commit-id: ef791fe481 [formerly 1112ca621e] [formerly ef791fe481 [formerly 1112ca621e] [formerly bb915796ad [formerly f0bcc20987d814a716994f712c6132bb79963457]]]
Former-commit-id: bb915796ad
Former-commit-id: 549941882e [formerly 5c46c768d2]
Former-commit-id: f674aa07d7
 2014-04-16 14:33:02 -05:00
Brian Clements
0b7e067d96 Issue #3020 fixed error message when attempting to create already accessible room 
Former-commit-id: 57d2f28d54 [formerly bfafb0d055] [formerly 57d2f28d54 [formerly bfafb0d055] [formerly 4a8ee65cca [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 4829ef25bc [formerly 8861489810]
Former-commit-id: 63b9349843
 2014-04-16 14:26:17 -05:00
Lee Venable
9b085066c0 Issue #3034 - added widget dispose checks in runAsync methods. 
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: f4fb7b24f6 [formerly 7f068f164c] [formerly f4fb7b24f6 [formerly 7f068f164c] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]
Former-commit-id: ff3b42468f
Former-commit-id: 885e17788d [formerly 4cdbf301f3]
Former-commit-id: 31c8e61cb6
 2014-04-16 13:15:31 -05:00
Brian Clements
4979fe13df Issue #2981 fixed NPE when cached shared group deleted on server 
Former-commit-id: 8a4f212fdb [formerly 7afb1e66f5] [formerly 8a4f212fdb [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]
Former-commit-id: 7fd7817af4
Former-commit-id: 1daf03844c [formerly 007ba2ae4d]
Former-commit-id: 14084ee128
 2014-04-16 09:23:26 -05:00
Nate Jensen
7031f73fe2 Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1 
Former-commit-id: 9ebedf0b98 [formerly d121f07e76] [formerly 9ebedf0b98 [formerly d121f07e76] [formerly e0ae9e5f8f [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: 736c2cc764 [formerly e0ffa7b6b4]
Former-commit-id: 700080e879
 2014-04-16 08:41:54 -05:00
Nate Jensen
0e6fdab306 Merge "Issue #2956 safety checks for GLShadedShapeBase" into development 
Former-commit-id: 2fba1f36ef [formerly 80434db98d] [formerly 2fba1f36ef [formerly 80434db98d] [formerly 120d8429a7 [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]
Former-commit-id: 120d8429a7
Former-commit-id: 2e23ae75f4 [formerly 62613ab33d]
Former-commit-id: 2f2d965833
 2014-04-16 08:41:43 -05:00
Nate Jensen
baafe7f7da Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development 
Former-commit-id: c723ec0bda [formerly 771885f9a5] [formerly c723ec0bda [formerly 771885f9a5] [formerly c16bbb52e4 [formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]
Former-commit-id: c16bbb52e4
Former-commit-id: 79c3f5f3a8 [formerly 550577806f]
Former-commit-id: 267258647e
 2014-04-15 17:55:21 -05:00
Nate Jensen
c9a79bc2d5 Issue #2956 safety checks for GLShadedShapeBase 
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451

Former-commit-id: 66f4ce250a [formerly 726c122dc7] [formerly 66f4ce250a [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: 2cf5941fe1 [formerly 56f645bbc7]
Former-commit-id: 77cf2d682f
 2014-04-15 17:38:17 -05:00
Lee Venable
4d0bead6bd Merge "Issue #3031 - Added dispose check in the runAsync calls." into development 
Former-commit-id: 14f0dc298e [formerly cde3cdeed1] [formerly 14f0dc298e [formerly cde3cdeed1] [formerly 2a93e03117 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]
Former-commit-id: 2a93e03117
Former-commit-id: a34e169792 [formerly c9c845d5f2]
Former-commit-id: 195a4dacfa
 2014-04-15 17:37:13 -05:00
Ron Anderson
072102dff0 Issue #3016 Fix ColormappedImage and ColorMapper. 
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
 2014-04-15 17:22:12 -05:00
Everett Kladstrup
2470d81179 Issue #2725 Move viirs derivparam python package to common_static 
Former-commit-id: 08dfcd9bd9 [formerly 5dbedee47a] [formerly 08dfcd9bd9 [formerly 5dbedee47a] [formerly 200f8f461d [formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]
Former-commit-id: 200f8f461d
Former-commit-id: 158e1fd086 [formerly fd2ddd24a7]
Former-commit-id: 6a2a88f75f
 2014-04-15 16:53:07 -05:00
Lee Venable
f51d2bf46d Issue #3031 - Added dispose check in the runAsync calls. 
Change-Id: I7996f58995aa261a1a66acc755768c3489130d43

Former-commit-id: 39b9d94dc1 [formerly d4aafc69d9] [formerly 39b9d94dc1 [formerly d4aafc69d9] [formerly 2122b79416 [formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]
Former-commit-id: 2122b79416
Former-commit-id: e30c910657 [formerly c3f4bccbf9]
Former-commit-id: ee78554540
 2014-04-15 16:49:42 -05:00
Nate Jensen
3df8557fc4 Merge "Issue #2726: Update endpoint pattern and remove System.out.printlns" into development 
Former-commit-id: 2e58bacdcc [formerly b5d832a35a] [formerly 2e58bacdcc [formerly b5d832a35a] [formerly ec96b9a261 [formerly 7c6bf2a9dd197896a1117c29928e6626a09826e3]]]
Former-commit-id: ec96b9a261
Former-commit-id: f6a99c5ec0 [formerly d3714dd4e0]
Former-commit-id: eb5f56d312
 2014-04-15 16:08:26 -05:00
Everett Kladstrup
241387ba19 Issue #2725 Fix localization type for DerivParamLocalizationAdapter 
Former-commit-id: 4f1c7281d3 [formerly 27885c8296] [formerly 4f1c7281d3 [formerly 27885c8296] [formerly 54db6ad9af [formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]
Former-commit-id: 54db6ad9af
Former-commit-id: c2dfdf8cae [formerly ca7b672b52]
Former-commit-id: 6b1d0e6aa2
 2014-04-15 15:18:09 -05:00
Brian Clements
8945b26e9b Issue #2822 only allow transfer leader if participant is using shared display 
Former-commit-id: db67c03382 [formerly 5250f7a442] [formerly db67c03382 [formerly 5250f7a442] [formerly 6ccedc1182 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 6f9ef9a515 [formerly e8907aa729]
Former-commit-id: 9acb5a4a5b
 2014-04-15 15:15:11 -05:00
Brian Clements
86081dda91 Issue #2903 made xmpp reconnect an explicit action by user 
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 6f7851d8c4 [formerly 8ab1bab974] [formerly 6f7851d8c4 [formerly 8ab1bab974] [formerly 6b22374046 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: ca5909e222 [formerly 7cf5f06f2a]
Former-commit-id: 054b47951d
 2014-04-15 15:12:33 -05:00
Richard Peter
84896dd87f Issue #2726: Update endpoint pattern and remove System.out.printlns 
Change-Id: I6d54cf695b8e339f9ac84b0a901cd47118e1872d

Former-commit-id: 294b02e2e5 [formerly ba1f83db17] [formerly 294b02e2e5 [formerly ba1f83db17] [formerly 7e3d710367 [formerly a724d7a0ed98f8f2860325a8578cf38e71e3ffcf]]]
Former-commit-id: 7e3d710367
Former-commit-id: e8db16d08b [formerly 4736c51a10]
Former-commit-id: 9aa3af4227
 2014-04-15 14:28:21 -05:00
Ben Steffensmeier
7dc8709a5b Issue #3017 Update SatSpatialFactory to have more specific methods. 
Former-commit-id: 49ca556b33 [formerly ecbe6fd2d7] [formerly 49ca556b33 [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 2f51d63032 [formerly 3eebc7a864]
Former-commit-id: af826302a1
 2014-04-15 13:29:05 -05:00
Nate Jensen
9621b9f8bf Merge "Issue #2984 another attempt to fix build" into development 
Former-commit-id: 7f56e20c03 [formerly 5424ffb850] [formerly 7f56e20c03 [formerly 5424ffb850] [formerly 26b20a770a [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]]
Former-commit-id: 26b20a770a
Former-commit-id: 0c82511428 [formerly cf3e9e9020]
Former-commit-id: 146d8259db
 2014-04-15 13:27:29 -05:00
Richard Peter
6b67e16af7 Merge "Issue #2726: Fix context mappings for topics" into development 
Former-commit-id: 794c329968 [formerly 632258a438] [formerly 794c329968 [formerly 632258a438] [formerly 75b70b1b9c [formerly c2dd85043309b04203166adb2390c404db97c5c3]]]
Former-commit-id: 75b70b1b9c
Former-commit-id: 7ea59ed1fc [formerly eff13cc71f]
Former-commit-id: 8947939e42
 2014-04-15 13:22:06 -05:00
Nate Jensen
eb9fba0305 Issue #2984 another attempt to fix build 
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb

Former-commit-id: cb406ef865 [formerly a2354a1d2a] [formerly cb406ef865 [formerly a2354a1d2a] [formerly 09305d263e [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]]
Former-commit-id: 09305d263e
Former-commit-id: 3186527f18 [formerly 60b8b6e4ad]
Former-commit-id: 529939f3d3
 2014-04-15 13:16:17 -05:00
Richard Peter
c4edd6fd84 Issue #2726: Fix context mappings for topics 
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f

Former-commit-id: f533275291 [formerly ecbd0d5720] [formerly f533275291 [formerly ecbd0d5720] [formerly 4ac996336e [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]]
Former-commit-id: 4ac996336e
Former-commit-id: d40449dae9 [formerly 35b8b8bc15]
Former-commit-id: 100a0d3bbd
 2014-04-15 12:49:15 -05:00
Nate Jensen
60d1c964bc Merge "Issue #2907 - Change directory name to match project name." into development 
Former-commit-id: 8dd1f37b81 [formerly 84cd761026] [formerly 8dd1f37b81 [formerly 84cd761026] [formerly 632d21b7db [formerly 7ab6cfb256e113023b73963b1b1ea1e9980655d1]]]
Former-commit-id: 632d21b7db
Former-commit-id: 7e6010a865 [formerly e1b9ec9c6a]
Former-commit-id: 71150a8cdb
 2014-04-15 12:38:39 -05:00
Mike Duff
c2779cf796 Issue #2907 - Change directory name to match project name. 
Change-Id: I9f3cd8bc28047b1da295dcc6da5d91a2d3583848

Former-commit-id: 903d10096c [formerly b8b3b9eb8e] [formerly 903d10096c [formerly b8b3b9eb8e] [formerly 309bb97356 [formerly db7f966c43292a321793655fe283cc3feacfd9f1]]]
Former-commit-id: 309bb97356
Former-commit-id: ce5363105b [formerly e03d319eaf]
Former-commit-id: 7561832a2a
 2014-04-15 12:14:58 -05:00
Richard Peter
64c9dbb764 Issue #2726: Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files. 
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d

Former-commit-id: 45e6301b91 [formerly 4709e66b34] [formerly 45e6301b91 [formerly 4709e66b34] [formerly fa25d55384 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]]
Former-commit-id: fa25d55384
Former-commit-id: 7e3e0fb984 [formerly fa5c0f71ad]
Former-commit-id: 4ed2eb3b03
 2014-04-15 11:50:28 -05:00
Nate Jensen
6a47b92f5a Issue #2984 remove dead ncep purge util plugin and web page 
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829

Former-commit-id: c81c44d15f [formerly e081847225] [formerly c81c44d15f [formerly e081847225] [formerly 7726f144ed [formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]]]
Former-commit-id: 7726f144ed
Former-commit-id: 5ca97d5798 [formerly 56e7b21e35]
Former-commit-id: f2a1345c0b
 2014-04-15 11:16:24 -05:00
Nate Jensen
2eccbcf3fe Issue #2907 fix datauri doc utility 
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 8a4e3b8088 [formerly 0845eef927] [formerly 8a4e3b8088 [formerly 0845eef927] [formerly 7e19d70363 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]]
Former-commit-id: 7e19d70363
Former-commit-id: cdf8aeef79 [formerly 27cfffb1ea]
Former-commit-id: 4b8bda3abf
 2014-04-15 10:54:39 -05:00
Nate Jensen
620fcebb18 Merge "Issue #2785 - Fix loading of groups in sub request dialog" into development 
Former-commit-id: 03f60e7989 [formerly b574103f0f] [formerly 03f60e7989 [formerly b574103f0f] [formerly 70f35c6a31 [formerly 7643dcd902ee2ab068d30ff88774114636d545c9]]]
Former-commit-id: 70f35c6a31
Former-commit-id: 78f6cc513c [formerly 4c7b2c7f16]
Former-commit-id: dbf1afd01d
 2014-04-15 10:44:28 -05:00
Mike Duff
78a0ad33ef Issue #2785 - Fix loading of groups in sub request dialog 
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: 3a6e718ff0 [formerly 81e4c9b05d] [formerly 3a6e718ff0 [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]
Former-commit-id: d2a80ca966
Former-commit-id: 0bf14203ff [formerly 4773c3722c]
Former-commit-id: ddeb7fe4d2
 2014-04-15 10:10:18 -05:00
Nate Jensen
6ccac4bbf8 Merge "Issue #2984 attempt to fix build" into development 
Former-commit-id: 37028f77b3 [formerly 9399b1a69f] [formerly 37028f77b3 [formerly 9399b1a69f] [formerly 41e565f368 [formerly 41626c3c65aea888213bdf10e434e87dde793d97]]]
Former-commit-id: 41e565f368
Former-commit-id: 23c3186365 [formerly 0a8abf9808]
Former-commit-id: 6caa1986e8
 2014-04-15 10:09:57 -05:00
Nate Jensen
24e970b87a Issue #2984 attempt to fix build 
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d

Former-commit-id: ce585ca9e4 [formerly 4aaa7c7096] [formerly ce585ca9e4 [formerly 4aaa7c7096] [formerly 456359ab1a [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]]
Former-commit-id: 456359ab1a
Former-commit-id: 0177329d67 [formerly f6b3c3c05f]
Former-commit-id: c5ad3ae2a2
 2014-04-15 09:57:11 -05:00
Steve Harris
ac077b24a1 Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1 
Former-commit-id: 9132d9004e [formerly eb2f2865fe] [formerly 9132d9004e [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly f4c8ce899d312b389aff32d052564559e79904be]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 6ed279d306 [formerly c361ccd531]
Former-commit-id: 9be8c87f87
 2014-04-15 09:39:33 -05:00
Mike Duff
0a77645dc2 Issue #2907 - Rename com.raytheon.edex.dataplugin.redbook to com.raytheon.uf.edex.dataplugin.redbook 
Change-Id: I375877b285671ef7a4d993b4c16ee3437fd0a32a

Former-commit-id: 9c690f8ecc [formerly 8d5486d1ff] [formerly 9c690f8ecc [formerly 8d5486d1ff] [formerly a072ce72bb [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]]
Former-commit-id: a072ce72bb
Former-commit-id: f749f9b8d6 [formerly 25eff8dcf5]
Former-commit-id: 62d94d740b
 2014-04-15 09:34:05 -05:00
Benjamin Phillippe
f026a17b07 Issue #3011 Fixed replication slowdown 
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 490413551b [formerly 3db751fc5b] [formerly 490413551b [formerly 3db751fc5b] [formerly 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]
Former-commit-id: 62062bf288
Former-commit-id: 0b149f92d9 [formerly 035272360b]
Former-commit-id: f6f51d3575
 2014-04-15 09:15:12 -05:00
Richard Peter
a0e14eda77 Merge "Issue #2984 remove unnecessary plugins from features remove unnecessary uengine dependencies from manifests" into development 
Former-commit-id: 93d624d4d5 [formerly 4edf560b06] [formerly 93d624d4d5 [formerly 4edf560b06] [formerly 909c44182b [formerly faa4e88621db7dd9cbc13048bfdf98cdb3ec26d2]]]
Former-commit-id: 909c44182b
Former-commit-id: 1a3df8b3a4 [formerly e6112f7aeb]
Former-commit-id: 80e4650796
 2014-04-14 17:13:57 -05:00
Nate Jensen
8c6d8e97f6 Merge "Issue #3019 modify JUtil to support sets and frozensets" into development 
Former-commit-id: f677b2123e [formerly f11c71e083] [formerly f677b2123e [formerly f11c71e083] [formerly 5308cb61cc [formerly 6a8cbb3713741df343daf3d128d7d3b4e29238ec]]]
Former-commit-id: 5308cb61cc
Former-commit-id: 46a070288b [formerly 0192d15ffb]
Former-commit-id: 23c5b7a985
 2014-04-14 16:53:28 -05:00
Nate Jensen
697a7f5b9b Issue #2984 remove unnecessary plugins from features 
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: e24940ead6 [formerly 6e2d68e102] [formerly e24940ead6 [formerly 6e2d68e102] [formerly 57f2357f10 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]
Former-commit-id: 57f2357f10
Former-commit-id: 97f09968b3 [formerly d435258fce]
Former-commit-id: 9ad8236b8d
 2014-04-14 16:50:54 -05:00
Matt Nash
cc940a91c7 Issue #3019 modify JUtil to support sets and frozensets 
Change-Id: Ia72d8c1670c0adb1529937b1943fa9e2d1195692

Former-commit-id: 1e3afba948 [formerly 02e801b359] [formerly 1e3afba948 [formerly 02e801b359] [formerly ef3879c4a3 [formerly 795cba334038d920beab93f5c872b02acf29c7f9]]]
Former-commit-id: ef3879c4a3
Former-commit-id: de47d76f3c [formerly 7c6fe31032]
Former-commit-id: 00a0a317c3
 2014-04-14 16:26:38 -05:00
Nate Jensen
9972baa000 Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development 
Former-commit-id: d741f996c6 [formerly c71205eb89] [formerly d741f996c6 [formerly c71205eb89] [formerly 111b7f4283 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]
Former-commit-id: 111b7f4283
Former-commit-id: 9593960e9f [formerly 9917a8ef62]
Former-commit-id: 37a6c292f7
 2014-04-14 15:46:14 -05:00
Nate Jensen
dc7630131a Merge "Issue #2937 Moved presence/site determination from feed log to feed listener. Use MUCRoom to get presence and role because UserManager is not able to understand nicnames." into development 
Former-commit-id: c8da0cad7a [formerly 8410d02508] [formerly c8da0cad7a [formerly 8410d02508] [formerly 23fc6b53db [formerly 2ae8617d26a4d9d77ef439333d886883812e86ce]]]
Former-commit-id: 23fc6b53db
Former-commit-id: efc88926bc [formerly 985325091f]
Former-commit-id: cc9ad1496a
 2014-04-14 15:35:43 -05:00
Nate Jensen
6c20b25f21 Merge "Issue #2937 Fixed from user in xmpp message." into development 
Former-commit-id: 5ded9b0bae [formerly 9aa730cfd8] [formerly 5ded9b0bae [formerly 9aa730cfd8] [formerly 85c5f8f64f [formerly 9fc178c2b8cfcbafbe9848076998d29af0f55912]]]
Former-commit-id: 85c5f8f64f
Former-commit-id: 0e4305296c [formerly 4c6151f4cb]
Former-commit-id: 390482aeba
 2014-04-14 15:33:04 -05:00
Ron Anderson
07e6998fc6 Merge changes Ic5c0dcaa,Iae10909e into development 
* changes:
  Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
  Issue #2947 Make GridCoverage implement IGridGeometryProvider.


Former-commit-id: d5ebb5a800 [formerly 46d5349940] [formerly d5ebb5a800 [formerly 46d5349940] [formerly fd79bd354b [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]
Former-commit-id: fd79bd354b
Former-commit-id: d2346699bb [formerly 5ab1b1b95c]
Former-commit-id: c7e1797dd4
 2014-04-14 14:45:03 -05:00
Brad Gonzales
7876b83c15 Issue #2937 Moved presence/site determination from feed log to feed listener. 
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 45264a2cde [formerly 189282166d] [formerly 45264a2cde [formerly 189282166d] [formerly 535611f556 [formerly e975a825046c8d0505223093e5765d5283425b2f]]]
Former-commit-id: 535611f556
Former-commit-id: b18cefb6bd [formerly 7384a458eb]
Former-commit-id: a347010ad4
 2014-04-14 14:30:18 -05:00
Brad Gonzales
7f09051250 Issue #2937 Fixed from user in xmpp message. 
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 98476d4813 [formerly 023622a2c5] [formerly 98476d4813 [formerly 023622a2c5] [formerly f76e4e8fea [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]]
Former-commit-id: f76e4e8fea
Former-commit-id: 2812984f88 [formerly 1f1806de88]
Former-commit-id: 5f5ac23d05
 2014-04-14 14:30:18 -05:00
brian.dyke
6a5c7d7684 Merge branch 'master_14.2.1' into asm_14.2.1 
Former-commit-id: 5fc07cafc8 [formerly fb1c399d4d] [formerly 5fc07cafc8 [formerly fb1c399d4d] [formerly a6708cc174 [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]
Former-commit-id: a6708cc174
Former-commit-id: e8dffad9cb [formerly 5b27f2987f]
Former-commit-id: d148fbe645
 2014-04-14 15:29:23 -04:00
Nate Jensen
c8c25d9224 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe 
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 40d1fda798 [formerly f086bb0c9b] [formerly 40d1fda798 [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: dfe50ee038 [formerly 715932091e]
Former-commit-id: 1e5433c9c3
 2014-04-14 14:28:11 -05:00
Lee Venable
4978a231eb Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development 
Former-commit-id: 1a3738c8fd [formerly f6601d6bcc] [formerly 1a3738c8fd [formerly f6601d6bcc] [formerly d4a6ce546d [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]
Former-commit-id: d4a6ce546d
Former-commit-id: bf4f3c75ef [formerly caf31402d7]
Former-commit-id: de242e3e91
 2014-04-14 14:09:03 -05:00
Nate Jensen
70c02c5163 Merge "Issue #2726: Add BoundedMap" into development 
Former-commit-id: c53d411da1 [formerly 2ed5535235] [formerly c53d411da1 [formerly 2ed5535235] [formerly 797eb5e8cf [formerly bf775eff602039caa654ab2f810befd3a89e3808]]]
Former-commit-id: 797eb5e8cf
Former-commit-id: b31de05482 [formerly 450ceb3149]
Former-commit-id: b1d98aeec0
 2014-04-14 14:07:49 -05:00
Richard Peter
6ef84cf3c4 Merge "Issue #2862 Implements locks on case creation." into development 
Former-commit-id: 22a01edbb7 [formerly 19755418f8] [formerly 22a01edbb7 [formerly 19755418f8] [formerly 181ffee3db [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: c4853e7982 [formerly 0abb97820b]
Former-commit-id: 48c8415382
 2014-04-14 13:28:26 -05:00
Richard Peter
839f3d4161 Issue #2726: Add BoundedMap 
Former-commit-id: 33707d4c7d [formerly 7c618f20d7] [formerly 33707d4c7d [formerly 7c618f20d7] [formerly 9f91e47338 [formerly bf56d51e161d00b3f5156b957203d616e971c23e]]]
Former-commit-id: 9f91e47338
Former-commit-id: 0956165881 [formerly 6b57e9339f]
Former-commit-id: 28e26ff1b1
 2014-04-14 13:25:53 -05:00