Commit graph

2881 commits

Author SHA1 Message Date
Brian Clements
cbef95a1bb Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]]
Former-commit-id: ab72938246
Former-commit-id: 08a0e5baf2 [formerly 9d00fe2bab] [formerly d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]]
Former-commit-id: e46a572ae9fd237caee1e14f1bd4825f8f3b942b [formerly d218686d1f]
Former-commit-id: 9b0fd74f5b
2014-02-20 11:10:14 -06:00
Nate Jensen
e2baae15ac Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 6973755f4e [formerly 6ef26a636c] [formerly 32bd9fd635] [formerly 6973755f4e [formerly 6ef26a636c] [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]]
Former-commit-id: 0f81b80467
Former-commit-id: 5d5518e29f [formerly 6e2150ccd7] [formerly bd38074eb147c551318fc588a5101194eae5605b [formerly 9f33e97c1b]]
Former-commit-id: 23fb965df8973134f0458b6ea88536419a073d36 [formerly 1f5f895dcf]
Former-commit-id: 3955f66213
2014-02-20 10:53:21 -06:00
Nate Jensen
714a282a4f Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: adb51300d8 [formerly 4563e38db2] [formerly 3078b69273] [formerly adb51300d8 [formerly 4563e38db2] [formerly 3078b69273] [formerly 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]]
Former-commit-id: 5856957c57
Former-commit-id: 08ede8e9f3 [formerly c936a659a5] [formerly 1a60933c3ce5c3f2514129d9f7ef73e507bb6d7c [formerly 5412b72c57]]
Former-commit-id: 3423ea500fae2ba7c5b5f5039edab1f4d969c5e3 [formerly 9e261c9c22]
Former-commit-id: 4628b0c67c
2014-02-19 17:22:00 -06:00
Nate Jensen
9cfc792b03 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: f939d93d7f [formerly 3782880dac] [formerly 9011e1b31e] [formerly f939d93d7f [formerly 3782880dac] [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 8a564e9987 [formerly 9394879520] [formerly 9bf4479e05cb345ab571f6736d903c87cbcab9f4 [formerly b1e2788958]]
Former-commit-id: 45ded3c22eb341b860a5a8b1046988c3fb69c275 [formerly 8f73511086]
Former-commit-id: 1db1ae5a38
2014-02-19 17:18:24 -06:00
Nate Jensen
8ee4ae7565 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]]
Former-commit-id: f99cf7df47
Former-commit-id: eeac24c773 [formerly d3ec0da1bb] [formerly 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027]]
Former-commit-id: bcd8e67559fb255fbb3d3d11663bad0ea365591b [formerly dafb323edb]
Former-commit-id: dbdcfa8e41
2014-02-19 16:19:27 -06:00
Ron Anderson
60569c9c0d Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: dab0ebc99e [formerly 8703c43937] [formerly 98d2417f94] [formerly dab0ebc99e [formerly 8703c43937] [formerly 98d2417f94] [formerly b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]]
Former-commit-id: b8c00d8ead
Former-commit-id: efbe57d909 [formerly b9904edc3a] [formerly 5a4e4666cbcd00018ef121b89b85a78808d680db [formerly 7e7f0abfdc]]
Former-commit-id: 1e59da19780cb626d96172f2b0f32ab6257e2bba [formerly db9cc1e6b5]
Former-commit-id: 331803d94a
2014-02-19 15:39:56 -06:00
Mike Duff
352b114250 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

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

Former-commit-id: 8a29af4894 [formerly 48a0b34b5f] [formerly 682c6af456] [formerly 8a29af4894 [formerly 48a0b34b5f] [formerly 682c6af456] [formerly 183657fb33 [formerly 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]]
Former-commit-id: 183657fb33
Former-commit-id: 10765884a3 [formerly 8be2622f85] [formerly 4622ac20555cc93d1c3532eaaaec9b3ab36c4650 [formerly 86fce9d547]]
Former-commit-id: 04df26620b97a49afd1fe7a8d0a138f12e8cbebc [formerly 06b243a7fd]
Former-commit-id: 0494f646ab
2014-02-19 15:20:29 -06:00
Nate Jensen
7c8349973f Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: 72acab26c3 [formerly b4ac186728] [formerly 4b4cca776f] [formerly 72acab26c3 [formerly b4ac186728] [formerly 4b4cca776f] [formerly c72e2be969 [formerly 4b4cca776f [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]]
Former-commit-id: c72e2be969
Former-commit-id: 7f1665f2eb [formerly 5ef747c703] [formerly b5160733f88b5b22d9395a61e0d9f2dc75ca22a9 [formerly 7099b45023]]
Former-commit-id: 401b13c7b7de12de88ba2b1fdf48ae863ba3981e [formerly 696937bfcc]
Former-commit-id: 659bc630be
2014-02-19 14:52:24 -06:00
Ron Anderson
41a6f52eff Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 84bea14340 [formerly 908e43039e] [formerly ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]]
Former-commit-id: a122ae5f46b63941580c026c45106c52001929d6 [formerly b0a4b63689]
Former-commit-id: e91fd1d683
2014-02-19 11:55:11 -06:00
Mike Duff
02fa72b0d0 Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: c7e22b7b3b [formerly bc180503b1] [formerly 19033601bf] [formerly c7e22b7b3b [formerly bc180503b1] [formerly 19033601bf] [formerly 0b316f7bd9 [formerly 19033601bf [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: bac3c86658 [formerly 06ed3db690] [formerly 0bf0f051070755b17c7ecbd3f200deb688e5152a [formerly 7710724c5a]]
Former-commit-id: de95bb7f4552356a8f38055610f319fc4ca4ae8e [formerly e6fb8413b9]
Former-commit-id: 304a9dc507
2014-02-19 10:23:48 -06:00
Matt Nash
fbe80195e5 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 1d6e1d443c [formerly 3f67324d7c] [formerly 2d20e84f6a] [formerly 1835019567 [formerly 2d20e84f6a [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]]
Former-commit-id: 1835019567
Former-commit-id: 9cb0b6d530 [formerly ae1d36b6d0] [formerly 82cdf604370def6ebacc4f1cbb2ebeaa41b75898 [formerly bb10484bd0]]
Former-commit-id: 936c1375ad966bfb52b19b40f76a2bb6fa4628d3 [formerly 3b39e1d2bc]
Former-commit-id: 1814b1448e
2014-02-19 10:01:25 -06:00
Brian Clements
c420979556 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 dc074a9650] [formerly abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 30027665ac [formerly 77bb396c9a] [formerly 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]]
Former-commit-id: 2bd4a38066d755ff2faaae6125ca4744d0e08564 [formerly ddc0945e40]
Former-commit-id: b47b194564
2014-02-19 08:32:26 -06:00
Mike Duff
3034d493af Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: a370e81065 [formerly 283b0c670c] [formerly a6509aad8c] [formerly a370e81065 [formerly 283b0c670c] [formerly a6509aad8c] [formerly 9754f0d8dd [formerly a6509aad8c [formerly 11f3705080210161e6915309a4aec423b307cce8]]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: 5b1250208e [formerly 40b0540830] [formerly e476bd640b2d122cdc7d40b221ae5ec48126a502 [formerly ecb0d45b24]]
Former-commit-id: a6885defcec5abdff81a4c6c28a63f15bb094b7d [formerly 7ba61e6b53]
Former-commit-id: a4ab323833
2014-02-18 17:32:32 -06:00
Nate Jensen
776486ec44 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 2f1c0109b1 [formerly 4bb0997749] [formerly cc96c8c42118f1e42ca1fd6d9fbb3290f8d9ee88 [formerly a6bb05f2e3]]
Former-commit-id: 84feaf6d94e20d2227dfe57960856e8fbe245c47 [formerly 3c9ebe52d3]
Former-commit-id: 337aa2f312
2014-02-18 14:51:13 -06:00
Nate Jensen
c70fc017b8 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: d4cc8b1827 [formerly 1738248fac] [formerly c63289fa14] [formerly d4cc8b1827 [formerly 1738248fac] [formerly c63289fa14] [formerly b3c45b303c [formerly c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]]
Former-commit-id: b3c45b303c
Former-commit-id: 61ec0df1c9 [formerly 2e468e9ec1] [formerly fc277ab5e1f9070756173bf025bcb61f2b809b18 [formerly 173c646576]]
Former-commit-id: ed2b64cc655ba8b0cf51a4bb0e0c9bed28e112f0 [formerly b1dc1e8849]
Former-commit-id: 1e6b1343b0
2014-02-18 11:22:19 -06:00
Brian Clements
db121a4efb Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 1c8f5dd579 [formerly 9095a1584f] [formerly a28fcf0dc5] [formerly 1c8f5dd579 [formerly 9095a1584f] [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 0d7ae9a2ff [formerly 9d9c4c7c27] [formerly e913208b8ecd6b9c2ea3cdbd0d843cace61bfdfe [formerly 510c39713f]]
Former-commit-id: 579bbaa900c71d117ad2479ec769dcf6440b16cf [formerly 3bf2a08c57]
Former-commit-id: c38397e00b
2014-02-18 11:11:33 -06:00
Brad Gonzales
e906d71ac4 Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6 [formerly 1b76488111] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e]
Former-commit-id: b0421675ff
2014-02-18 11:10:44 -06:00
Ron Anderson
c3b687b9a5 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
2014-02-18 10:45:20 -06:00
Brian Clements
c0da4f94d4 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 74d08f1d19 [formerly 02319f36e4] [formerly 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]]
Former-commit-id: 30b1054d786354e5944fa7b6968a4b2cddf1c07a [formerly 5889341612]
Former-commit-id: f866ac4365
2014-02-18 10:03:12 -06:00
Nate Jensen
39c0ec7c2c Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: 35b4de0640 [formerly 0228d24f1d] [formerly e70f0d21ab] [formerly 35b4de0640 [formerly 0228d24f1d] [formerly e70f0d21ab] [formerly aa7413fd4c [formerly e70f0d21ab [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]]
Former-commit-id: aa7413fd4c
Former-commit-id: f348686037 [formerly c3756326a6] [formerly 5d71389eedc005620646fd52ef65be20efafb64e [formerly f1b7bf1c2a]]
Former-commit-id: 8e4c99a20c5adae37d57191553a32c7be955c059 [formerly a08dea4b08]
Former-commit-id: 72a40614fb
2014-02-18 08:48:00 -06:00
Brian Clements
393036071a Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly 3307f5ea5e [formerly a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: f5a25c9030 [formerly 02d3a9ae7e] [formerly 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e [formerly 476d0c3257]]
Former-commit-id: 6d18992103101e38f58bfbe34e30a1e17a53251b [formerly 6574733eba]
Former-commit-id: df4c4af7e9
2014-02-17 17:11:36 -06:00
Nate Jensen
8e8e9141e7 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 742217ded0 [formerly 0160ab0464] [formerly 0c4de50218] [formerly 742217ded0 [formerly 0160ab0464] [formerly 0c4de50218] [formerly 4d68994525 [formerly 0c4de50218 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]]
Former-commit-id: 4d68994525
Former-commit-id: 60fd298721 [formerly 121bcd184a] [formerly 4ab3a27b137394410a2b8da012bfe21a237dd4b6 [formerly 228ab8dd60]]
Former-commit-id: 38e7719aa70d69e4f2268ba3d82ba8df10a7cace [formerly 944df080f4]
Former-commit-id: 0dd9cd1094
2014-02-17 17:10:07 -06:00
Brian Clements
bc8a458ec1 Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: ca8869b8ef [formerly 6d71686332] [formerly 3b5648c055] [formerly ca8869b8ef [formerly 6d71686332] [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 3b5648c055 [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 430832e3e5 [formerly 0d07e417fc] [formerly 1370e6bd4a52b34c5890edb1080fbc043e98ad05 [formerly 9dc2967e3f]]
Former-commit-id: 3ebb5f33f5ce9ac8c549c18cb180ee4d4ec6493e [formerly cd7abc37fc]
Former-commit-id: fab5759a01
2014-02-17 16:39:43 -06:00
Nate Jensen
f1bcc326a2 Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: a416577b25 [formerly 2367c79c1c] [formerly 5675869906] [formerly a416577b25 [formerly 2367c79c1c] [formerly 5675869906] [formerly f4260a617e [formerly 5675869906 [formerly ef860082c4cd6159233323b89e0b73e272224f38]]]]
Former-commit-id: f4260a617e
Former-commit-id: 7ad4c20f9c [formerly 1639f43f50] [formerly a1e31a6cfa24652c733363259ac1b8f622ca78e3 [formerly 96014c806d]]
Former-commit-id: 787c9ceff358b8246697af5f50e1b69a64f19733 [formerly e4fb5e0067]
Former-commit-id: 083a66dc4e
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
52842bed96 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: 386b6a2499 [formerly 2cf496ca84] [formerly 937b3071d4] [formerly 386b6a2499 [formerly 2cf496ca84] [formerly 937b3071d4] [formerly ca90137801 [formerly 937b3071d4 [formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]]]
Former-commit-id: ca90137801
Former-commit-id: 028bfc35f6 [formerly fb5b367ecc] [formerly a03c7a16df951c26dd80622d531ce31fa0468d4d [formerly 0f6f60a132]]
Former-commit-id: a78a80a74c0fd4582b22dd78f96fea8968d00e02 [formerly 47c3c6845b]
Former-commit-id: e0c97ad986
2014-02-17 14:02:57 -06:00
Nate Jensen
9c67149bf9 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: 34c7c3cba1 [formerly c8e70cd6b1] [formerly 15ff4ab5d7] [formerly 34c7c3cba1 [formerly c8e70cd6b1] [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 15ff4ab5d7 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]]
Former-commit-id: 2486e39192
Former-commit-id: 62739b7936 [formerly b801b36ca7] [formerly 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0 [formerly 0314d61773]]
Former-commit-id: 991546c580399668225c99bbb7a4506b93bf17d6 [formerly e6dae7a23c]
Former-commit-id: 695d03b815
2014-02-17 11:58:04 -06:00
Nate Jensen
8dcf5a38de Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
Former-commit-id: ed76393cd8 [formerly 0fe9842582] [formerly 30632fbd84] [formerly ed76393cd8 [formerly 0fe9842582] [formerly 30632fbd84] [formerly 063d85ee22 [formerly 30632fbd84 [formerly 4778976c7175121841fc9ca69a814daf9d466c6c]]]]
Former-commit-id: 063d85ee22
Former-commit-id: 0f317fd808 [formerly 1169f85a3b] [formerly 093db405d1aefe30cccccface11ebc8d6dd8a73e [formerly 996663ccee]]
Former-commit-id: 150ccb5428947127467df703c7b7c02b85c6ddf7 [formerly a5bf31934f]
Former-commit-id: 2680629a5b
2014-02-17 11:22:53 -06:00
Max Schenkelberg
f0bb17a9ad Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc

Former-commit-id: 554e0caec5 [formerly 1de140a526] [formerly acad670229] [formerly 554e0caec5 [formerly 1de140a526] [formerly acad670229] [formerly 6a2a33abe1 [formerly acad670229 [formerly e0a5ec0a713f06eab93d86671a43334110b60b0c]]]]
Former-commit-id: 6a2a33abe1
Former-commit-id: 748a81d884 [formerly ff9fdc63b0] [formerly 7dc8449a5e82576a7bd9606d850f4cf935b98369 [formerly 91f707537b]]
Former-commit-id: 47d033372feb3f59c0ac7d3bd8fc996c8ff8caa6 [formerly d06e5fc107]
Former-commit-id: 7c8a15b609
2014-02-17 11:07:45 -06:00
Steve Harris
a5d78a7f44 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
2014-02-17 08:54:34 -06:00
Nate Jensen
0b4b1850e6 Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
Former-commit-id: fa87ba3138 [formerly 56aa06888f] [formerly 723ff23ee9] [formerly fa87ba3138 [formerly 56aa06888f] [formerly 723ff23ee9] [formerly f3d107580f [formerly 723ff23ee9 [formerly 4b48313cb3509bebcfdd79e1df3d746a2d12c6af]]]]
Former-commit-id: f3d107580f
Former-commit-id: d3c66cb748 [formerly b1c976ac17] [formerly 3c542c9dc0344fdd95a9ebb261104f938b7b0aa3 [formerly dbc420e917]]
Former-commit-id: 7a4b435c4d5fe4925d9005abfe4973b2630fb3f6 [formerly 4963b3cc23]
Former-commit-id: 256a44e1ca
2014-02-14 10:50:38 -06:00
Max Schenkelberg
c6b69c6e58 Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: 38aae37f01 [formerly 4d656b5d06] [formerly 6309f9b34b] [formerly 38aae37f01 [formerly 4d656b5d06] [formerly 6309f9b34b] [formerly c8e93190f2 [formerly 6309f9b34b [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]]]
Former-commit-id: c8e93190f2
Former-commit-id: db72c9efca [formerly b311aba5d5] [formerly 1c98b48279c1d2eb2dd2a33cad63c8a665916563 [formerly 3571135645]]
Former-commit-id: e29d9ec91d5916874942ed927bab31b9f20f3c65 [formerly d374fc9f5d]
Former-commit-id: 316e7ca511
2014-02-14 10:47:42 -06:00
Mike Duff
8f8300320c Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
Former-commit-id: b34c9eedd0 [formerly 43ea3b0918] [formerly ac62d322ed] [formerly b34c9eedd0 [formerly 43ea3b0918] [formerly ac62d322ed] [formerly 346dc4afff [formerly ac62d322ed [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]]
Former-commit-id: 346dc4afff
Former-commit-id: fad65749a8 [formerly 6601dff483] [formerly 2be8bfeadfd1af814a97057e7cfe23152263de88 [formerly 5b3a55d11f]]
Former-commit-id: 3add04f6f2835f888f0452d213544d97cca8f1c0 [formerly c5f33b0ed0]
Former-commit-id: fe38928d33
2014-02-14 08:53:40 -06:00
Nate Jensen
4c3bdc0dfb Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]]
Former-commit-id: a85575a763
Former-commit-id: 740e71adba [formerly 139479b4e1] [formerly 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]]
Former-commit-id: fe5669f9eeae8061972d1a92d1593cd4aea98162 [formerly 70285796ac]
Former-commit-id: 65068869e1
2014-02-13 15:35:53 -06:00
Nate Jensen
484e8d1625 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly d8e2d2837e [formerly 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 2772ad3c9c [formerly 1f3c4090a0] [formerly e7dc3b65fcb3fa03216ea4dfccc11e35d47a79ef [formerly b31470f7e3]]
Former-commit-id: f21f0c2edda75779b51cb9b768a1562125025411 [formerly 3fb847a74c]
Former-commit-id: 1aeeeffb0d
2014-02-13 14:02:55 -06:00
Brian Clements
85c67054ae Issue #2751 user identity refactor
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types


Former-commit-id: 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 21b1a6844a [formerly e6de3a118d] [formerly 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b [formerly 3ec3ad0543]]
Former-commit-id: f2dc7cf04af4442851840305e26a4b79ceb9be1d [formerly 1cc21dc160]
Former-commit-id: aa06f65038
2014-02-13 13:51:39 -06:00
Ron Anderson
52aac6e855 Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
Former-commit-id: ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 51c9d27a39 [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: c2e56111c1 [formerly ca11555427] [formerly c5382d8fbd02ce98c80e76cb3bcd2d718cfc584a [formerly b84a83eb6f]]
Former-commit-id: 038e150875b793ce7a2afd8a7cfae08a2e921c3f [formerly 828738b81f]
Former-commit-id: 3598139635
2014-02-13 10:46:27 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
2014-02-13 10:10:34 -06:00
Brian Clements
36881a8077 Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: a0eb8342bf [formerly 2d72c0f475] [formerly 579f7c826d] [formerly a0eb8342bf [formerly 2d72c0f475] [formerly 579f7c826d] [formerly caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]]
Former-commit-id: caa8360ac7
Former-commit-id: d4afb01ecc [formerly 46ea69990d] [formerly 68affea48bc5b76e4b2afb6e939f8ab5903347db [formerly bafe2972a4]]
Former-commit-id: d73388f45bd1a17bac824f589802ad0559ac404f [formerly 8b618ea95b]
Former-commit-id: a3157035bc
2014-02-13 09:47:02 -06:00
Nate Jensen
6b059bb502 Merge "Issue #2799 fixed double click chat not working for roster entries" into development
Former-commit-id: 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 94b8b7eb04 [formerly 6093312861 [formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]]]
Former-commit-id: 94b8b7eb04
Former-commit-id: 906e7f679a [formerly f53e9523f3] [formerly 5a33efafe8dc13c6044be153e57d9a79150c60c2 [formerly b9e027059f]]
Former-commit-id: f1c22bbd6a9a841cc0f1e2161f7c123c3ecff932 [formerly 78f8a9fbe3]
Former-commit-id: 5771b557ef
2014-02-12 17:34:27 -06:00
Brian Clements
098bb233b9 Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 9d7490a158 [formerly 1bf3a09056 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]]
Former-commit-id: 9d7490a158
Former-commit-id: 0145571fe4 [formerly 667a1450cf] [formerly 4759fd1ad623c2d68120a23d29513e3f9b15ecd5 [formerly f22268295e]]
Former-commit-id: 3e3d4092ea498f9a8728a7a6f8ff214aa8d5fdf2 [formerly 5b95f2a058]
Former-commit-id: 2b421aadcb
2014-02-12 17:06:44 -06:00
Brian Clements
a6393ddba3 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: b8a1c8f56d [formerly 22031aa87d] [formerly 81ddf87b04] [formerly b8a1c8f56d [formerly 22031aa87d] [formerly 81ddf87b04] [formerly 23e2039028 [formerly 81ddf87b04 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]]]
Former-commit-id: 23e2039028
Former-commit-id: c322557870 [formerly a1ba9c6b9d] [formerly 545e96ec3fe21915f537c29fda28717077dc6a48 [formerly 09859bdee9]]
Former-commit-id: d0b782f566176fb91db12835b9d220a8a8ff0340 [formerly 57dd054176]
Former-commit-id: e286a68dc1
2014-02-12 16:54:46 -06:00
Nate Jensen
7a01901abf Merge "Issue #2793 improved error handling for packet extension" into development
Former-commit-id: 1bf941fc58 [formerly fa42c40bc7] [formerly eec72c5956] [formerly 1bf941fc58 [formerly fa42c40bc7] [formerly eec72c5956] [formerly 5e6656581b [formerly eec72c5956 [formerly 3ccf0beb3b0cf77c168b529d69f291b8c295cbb1]]]]
Former-commit-id: 5e6656581b
Former-commit-id: fc4670578b [formerly bac84c698f] [formerly 9b1e3e2f48824cf85d17412f8baa7fdfe44e00c1 [formerly 7247d69202]]
Former-commit-id: e0c49c9df2f0002196949e1e020251f3b52a4797 [formerly 6e33812072]
Former-commit-id: 0f89907aaf
2014-02-12 15:06:43 -06:00
Brian Clements
1ed8ef5307 Issue #2793 improved error handling for packet extension
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic


Former-commit-id: 87a7bf82e5 [formerly 3034ac5994] [formerly e381edcd60] [formerly 87a7bf82e5 [formerly 3034ac5994] [formerly e381edcd60] [formerly b0714ba659 [formerly e381edcd60 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]]]
Former-commit-id: b0714ba659
Former-commit-id: 85e92777e3 [formerly b94bc84429] [formerly 58c131b889ec791b70c5c89334b864ea89665943 [formerly 4406477877]]
Former-commit-id: c748ae3d428d8d4c271e1ef6e7267575a72a1e27 [formerly 73241ebeb7]
Former-commit-id: f23e9fcea0
2014-02-12 14:22:33 -06:00
Lee Venable
06eb20431a Issue #2773 - added code to help prevent eclipse bug from occurring.
Former-commit-id: 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly ce08022db7 [formerly 7099472204 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]]
Former-commit-id: ce08022db7
Former-commit-id: c17a417cbe [formerly a7302a3232] [formerly 1b4a9c2bf36e763585bfbc84e3a5a6ce5dbd03e0 [formerly c74ae6b83d]]
Former-commit-id: cd29c83d449fdcaba1122415142340d3b6f1881f [formerly 5ae2a544ca]
Former-commit-id: 3a195bd22e
2014-02-12 13:47:20 -06:00
Brian Clements
73452f84c6 Issue #2699 require non blank handle
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle


Former-commit-id: 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly ddf5b2a3ef [formerly 0765451a9d [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: 8b275e94b2 [formerly 9c67bcbbcf] [formerly f1871690aa5457b126ba46efaeed7a47b128ed69 [formerly fab4fea177]]
Former-commit-id: e5c43d72b21488421468d6cf473bc494a320eb33 [formerly 8e9f1136ae]
Former-commit-id: 2fc99f92ee
2014-02-12 09:13:48 -06:00
Brian.Dyke
fc21d2dee4 14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
2014-02-11 15:52:50 -05:00
Lee Venable
bd92b85084 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
Former-commit-id: 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly f078971b5d [formerly 5c256dc19c [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]]
Former-commit-id: f078971b5d
Former-commit-id: f8ae04bce2 [formerly ab6fab4199] [formerly fb3d041cae5b972726c8f92403f7ef7c6570c7bf [formerly 42fdfa4964]]
Former-commit-id: fbc5baf5f9b34b3a8ed1c177ca437f4840d40632 [formerly 22aab74e8d]
Former-commit-id: c1543acd86
2014-02-11 09:15:44 -06:00
Nate Jensen
aba5c50bfe Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 1dcb3a77c3 [formerly c0256ac19e] [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497]]
Former-commit-id: 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5 [formerly 9e09da8bb6]
Former-commit-id: 93a740106d
2014-02-10 16:48:29 -06:00
Max Schenkelberg
75cde90e40 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly a8a67634f9 [formerly 7822511754 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]]
Former-commit-id: a8a67634f9
Former-commit-id: 8ddc6b95e4 [formerly dd872433c7] [formerly a6667b70df86f17d8dea3939535e720a8767c67d [formerly e2e9eaaf35]]
Former-commit-id: 724e3e430da7d1dade1094fde0ea1cb4e6b99344 [formerly 9d6d418d48]
Former-commit-id: 560bc77a16
2014-02-10 13:43:16 -06:00