Matt Nash
1814b1448e
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: 3f67324d7c
[formerly 2d20e84f6a
] [formerly 3f67324d7c
[formerly 2d20e84f6a
] [formerly 1835019567
[formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: ae1d36b6d0
[formerly bb10484bd0
]
Former-commit-id: 3b39e1d2bc
2014-02-19 10:01:25 -06:00
Brian Clements
b47b194564
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: 06c16118e1
[formerly dc074a9650
] [formerly 06c16118e1
[formerly dc074a9650
] [formerly 3a135b8eac
[formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 77bb396c9a
[formerly bee7cdb71a
]
Former-commit-id: ddc0945e40
2014-02-19 08:32:26 -06:00
Lee Venable
7dca9cdace
Merge "Issue #2596 - Add check for null coordinates." into development
...
Former-commit-id: 1620d0fb22
[formerly 6e60748b41
] [formerly 1620d0fb22
[formerly 6e60748b41
] [formerly c871e4c872
[formerly e3517f5144c386038c4d535d79e62ec02d504f9f]]]
Former-commit-id: c871e4c872
Former-commit-id: 110557f42c
[formerly d62b4e7621
]
Former-commit-id: 875ebbd2e1
2014-02-18 18:08:10 -06:00
Nate Jensen
51e9dec1c0
Merge "Issue #2672 Fix radar dataaccess from pure python." into development
...
Former-commit-id: 82fde2011c
[formerly 698a4f827d
] [formerly 82fde2011c
[formerly 698a4f827d
] [formerly 713ec598c3
[formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]]]
Former-commit-id: 713ec598c3
Former-commit-id: 05edfb90d5
[formerly 79cbb8d79a
]
Former-commit-id: 93458ab911
2014-02-18 17:35:39 -06:00
Mike Duff
a4ab323833
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: 283b0c670c
[formerly a6509aad8c
] [formerly 283b0c670c
[formerly a6509aad8c
] [formerly 9754f0d8dd
[formerly 11f3705080210161e6915309a4aec423b307cce8]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: 40b0540830
[formerly ecb0d45b24
]
Former-commit-id: 7ba61e6b53
2014-02-18 17:32:32 -06:00
Nate Jensen
337aa2f312
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: ac0a10678b
[formerly 020d54c48a
] [formerly ac0a10678b
[formerly 020d54c48a
] [formerly b08d96b1e8
[formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749
[formerly a6bb05f2e3
]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
4a4ff1e02d
Issue #2672 Fix radar dataaccess from pure python.
...
Former-commit-id: add98f22b1
[formerly 3e0cba04c0
] [formerly add98f22b1
[formerly 3e0cba04c0
] [formerly e19b4518ef
[formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]]]
Former-commit-id: e19b4518ef
Former-commit-id: 2be385e6b8
[formerly 399e3d3f07
]
Former-commit-id: 4e57fcf1f2
2014-02-18 13:57:28 -06:00
David Gillingham
5911f4b2d4
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 607ce13c19
[formerly 32719432ff
] [formerly 607ce13c19
[formerly 32719432ff
] [formerly de12904c7a
[formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: a83191356d
[formerly 1520317c24
]
Former-commit-id: 474dda75de
2014-02-18 13:24:37 -06:00
Richard Peter
bbce2567a7
Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
...
Former-commit-id: c666adb530
[formerly 3ed6ad64ce
] [formerly c666adb530
[formerly 3ed6ad64ce
] [formerly d19e464a1a
[formerly 5bf461753675af961c484d022cec4006fabfeba8]]]
Former-commit-id: d19e464a1a
Former-commit-id: f7e43bdabd
[formerly 3c4e188037
]
Former-commit-id: ccd90f2d86
2014-02-18 12:44:57 -06:00
Lee Venable
e4869a93ad
Merge "Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now." into development
...
Former-commit-id: 7f3b6413e6
[formerly adec7acc7c
] [formerly 7f3b6413e6
[formerly adec7acc7c
] [formerly d9bccda151
[formerly 81d300630a64d9077e5b3a801e722fd10de4119e]]]
Former-commit-id: d9bccda151
Former-commit-id: e74e805bb6
[formerly 8b8c5d2258
]
Former-commit-id: 3d2cbdcd21
2014-02-18 12:21:30 -06:00
Lee Venable
0bd01db3cc
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: e9226e7140
[formerly 0cf2dba731
] [formerly e9226e7140
[formerly 0cf2dba731
] [formerly 4e7c3c0cbe
[formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: 46dbd967a5
[formerly 6fc9dcb3b1
]
Former-commit-id: 28b0809a1c
2014-02-18 12:19:41 -06:00
Ron Anderson
f82e2401da
Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
...
Former-commit-id: fc5aa71b86
[formerly a860ff3e6e
] [formerly fc5aa71b86
[formerly a860ff3e6e
] [formerly 7ab79d8b3a
[formerly ecece1009e1508451569b3d065e30820819a0502]]]
Former-commit-id: 7ab79d8b3a
Former-commit-id: 5c08871d87
[formerly 33adfffab9
]
Former-commit-id: 97e125cbd2
2014-02-18 12:12:25 -06:00
Brad Gonzales
d50a8cd7a5
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
...
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: 49ddffc99b
[formerly 36a24c1cb5
] [formerly 49ddffc99b
[formerly 36a24c1cb5
] [formerly 794bbc3c9b
[formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 3bb9975728
[formerly 90d34f7386
]
Former-commit-id: b99b5d9373
2014-02-18 12:11:02 -06:00
Mike Duff
2467a11a7e
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 33f81d8822
[formerly 89bd047283
] [formerly 33f81d8822
[formerly 89bd047283
] [formerly 911789b910
[formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]
Former-commit-id: 911789b910
Former-commit-id: 42e6591bc8
[formerly 5f9d913c6d
]
Former-commit-id: d277c1caf1
2014-02-18 12:05:26 -06:00
Nate Jensen
1e6b1343b0
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: 1738248fac
[formerly c63289fa14
] [formerly 1738248fac
[formerly c63289fa14
] [formerly b3c45b303c
[formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: 2e468e9ec1
[formerly 173c646576
]
Former-commit-id: b1dc1e8849
2014-02-18 11:22:19 -06:00
Brian Clements
c38397e00b
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: 9095a1584f
[formerly a28fcf0dc5
] [formerly 9095a1584f
[formerly a28fcf0dc5
] [formerly 7028f7fd4d
[formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 9d9c4c7c27
[formerly 510c39713f
]
Former-commit-id: 3bf2a08c57
2014-02-18 11:11:33 -06:00
Brad Gonzales
b0421675ff
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: 379c0fb46c
[formerly 19460ed0d7
] [formerly 379c0fb46c
[formerly 19460ed0d7
] [formerly ba4e308328
[formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111
[formerly 3be3380944
]
Former-commit-id: 9aa1cb299e
2014-02-18 11:10:44 -06:00
Ron Anderson
8a7af092f2
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: e7f2b6883d
[formerly 32bcf9d0d0
] [formerly e7f2b6883d
[formerly 32bcf9d0d0
] [formerly 14a082a4e9
[formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec
[formerly d4ba9eba94
]
Former-commit-id: 68e03bf02f
2014-02-18 10:45:20 -06:00
Brian Clements
f866ac4365
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: f0c89ef6c6
[formerly f6b2827434
] [formerly f0c89ef6c6
[formerly f6b2827434
] [formerly 5b4f1e8288
[formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4
[formerly a1d9e40bd4
]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Dave Hladky
51b644bf0c
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: 24a4fab603
[formerly 5c11dd09bb
] [formerly 24a4fab603
[formerly 5c11dd09bb
] [formerly 7ee101d7c7
[formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: 012619f05f
[formerly 78d41d01bb
]
Former-commit-id: 9ccf06c4f4
2014-02-18 09:14:38 -06:00
Brian Clements
fa98f1c415
Issue #2755 removed subscription plugin jar from rpms
...
Former-commit-id: 944a874c5b
[formerly d4f3fe7629
] [formerly 944a874c5b
[formerly d4f3fe7629
] [formerly 248db98ddf
[formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]]
Former-commit-id: 248db98ddf
Former-commit-id: 08bffb26ca
[formerly 5faad2ccca
]
Former-commit-id: a8dfacc21b
2014-02-18 09:00:21 -06:00
Nate Jensen
72a40614fb
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: 0228d24f1d
[formerly e70f0d21ab
] [formerly 0228d24f1d
[formerly e70f0d21ab
] [formerly aa7413fd4c
[formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]
Former-commit-id: aa7413fd4c
Former-commit-id: c3756326a6
[formerly f1b7bf1c2a
]
Former-commit-id: a08dea4b08
2014-02-18 08:48:00 -06:00
Brian Clements
df4c4af7e9
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: e894019715
[formerly a94b366e26
] [formerly e894019715
[formerly a94b366e26
] [formerly 3307f5ea5e
[formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: 02d3a9ae7e
[formerly 476d0c3257
]
Former-commit-id: 6574733eba
2014-02-17 17:11:36 -06:00
Nate Jensen
0dd9cd1094
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 0160ab0464
[formerly 0c4de50218
] [formerly 0160ab0464
[formerly 0c4de50218
] [formerly 4d68994525
[formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 121bcd184a
[formerly 228ab8dd60
]
Former-commit-id: 944df080f4
2014-02-17 17:10:07 -06:00
Brian Clements
fab5759a01
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: 6d71686332
[formerly 3b5648c055
] [formerly 6d71686332
[formerly 3b5648c055
] [formerly 3dfd8fbafb
[formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 0d07e417fc
[formerly 9dc2967e3f
]
Former-commit-id: cd7abc37fc
2014-02-17 16:39:43 -06:00
Bryan Kowal
14488904e5
Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
...
Amend: add a default value for localization site in the pure overrider.
Change-Id: I6056c274a10def96ba69786b58ba284146e49160
Former-commit-id: bb3a067f93
[formerly f5afe830a7
] [formerly bb3a067f93
[formerly f5afe830a7
] [formerly e0b0d88e46
[formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]]
Former-commit-id: e0b0d88e46
Former-commit-id: b5d4574294
[formerly d4ce52459e
]
Former-commit-id: f5e65b5e56
2014-02-17 14:41:10 -06:00
Nate Jensen
083a66dc4e
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: 2367c79c1c
[formerly 5675869906
] [formerly 2367c79c1c
[formerly 5675869906
] [formerly f4260a617e
[formerly ef860082c4cd6159233323b89e0b73e272224f38]]]
Former-commit-id: f4260a617e
Former-commit-id: 1639f43f50
[formerly 96014c806d
]
Former-commit-id: e4fb5e0067
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
e0c97ad986
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 2cf496ca84
[formerly 937b3071d4
] [formerly 2cf496ca84
[formerly 937b3071d4
] [formerly ca90137801
[formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]]
Former-commit-id: ca90137801
Former-commit-id: fb5b367ecc
[formerly 0f6f60a132
]
Former-commit-id: 47c3c6845b
2014-02-17 14:02:57 -06:00
Nate Jensen
695d03b815
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: c8e70cd6b1
[formerly 15ff4ab5d7
] [formerly c8e70cd6b1
[formerly 15ff4ab5d7
] [formerly 2486e39192
[formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]
Former-commit-id: 2486e39192
Former-commit-id: b801b36ca7
[formerly 0314d61773
]
Former-commit-id: e6dae7a23c
2014-02-17 11:58:04 -06:00
Nate Jensen
c6b270f084
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: 4583814741
[formerly be75cc3731
] [formerly 4583814741
[formerly be75cc3731
] [formerly 83e9226419
[formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]
Former-commit-id: 83e9226419
Former-commit-id: e9bbdfdf89
[formerly 30bbc788ce
]
Former-commit-id: 39b3824ae3
2014-02-17 11:37:48 -06:00
Nate Jensen
2680629a5b
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: 0fe9842582
[formerly 30632fbd84
] [formerly 0fe9842582
[formerly 30632fbd84
] [formerly 063d85ee22
[formerly 4778976c7175121841fc9ca69a814daf9d466c6c]]]
Former-commit-id: 063d85ee22
Former-commit-id: 1169f85a3b
[formerly 996663ccee
]
Former-commit-id: a5bf31934f
2014-02-17 11:22:53 -06:00
Max Schenkelberg
7c8a15b609
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: 1de140a526
[formerly acad670229
] [formerly 1de140a526
[formerly acad670229
] [formerly 6a2a33abe1
[formerly e0a5ec0a713f06eab93d86671a43334110b60b0c]]]
Former-commit-id: 6a2a33abe1
Former-commit-id: ff9fdc63b0
[formerly 91f707537b
]
Former-commit-id: d06e5fc107
2014-02-17 11:07:45 -06:00
Steve Harris
7805eac857
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: d0352c69d4
[formerly 267cc881a4
] [formerly d0352c69d4
[formerly 267cc881a4
] [formerly 9fcc5ad930
[formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 146412a8bd
[formerly e115197bb7
]
Former-commit-id: 28aa3dd195
2014-02-17 08:54:34 -06:00
Ron Anderson
7972a652b0
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: ce8d59e075
[formerly fae824482b
] [formerly ce8d59e075
[formerly fae824482b
] [formerly 769c56bf08
[formerly ddb195c3032b80221e63f21eb113eaab5d50b124]]]
Former-commit-id: 769c56bf08
Former-commit-id: 8434f5cc65
[formerly 29e24081a6
]
Former-commit-id: f4d0632cb2
2014-02-17 08:56:48 -06:00
Nate Jensen
256a44e1ca
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: 56aa06888f
[formerly 723ff23ee9
] [formerly 56aa06888f
[formerly 723ff23ee9
] [formerly f3d107580f
[formerly 4b48313cb3509bebcfdd79e1df3d746a2d12c6af]]]
Former-commit-id: f3d107580f
Former-commit-id: b1c976ac17
[formerly dbc420e917
]
Former-commit-id: 4963b3cc23
2014-02-14 10:50:38 -06:00
Max Schenkelberg
316e7ca511
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 4d656b5d06
[formerly 6309f9b34b
] [formerly 4d656b5d06
[formerly 6309f9b34b
] [formerly c8e93190f2
[formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]]
Former-commit-id: c8e93190f2
Former-commit-id: b311aba5d5
[formerly 3571135645
]
Former-commit-id: d374fc9f5d
2014-02-14 10:47:42 -06:00
Mike Duff
fe38928d33
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: 43ea3b0918
[formerly ac62d322ed
] [formerly 43ea3b0918
[formerly ac62d322ed
] [formerly 346dc4afff
[formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]
Former-commit-id: 346dc4afff
Former-commit-id: 6601dff483
[formerly 5b3a55d11f
]
Former-commit-id: c5f33b0ed0
2014-02-14 08:53:40 -06:00
Ron Anderson
3566e55f33
Issue #2758 Fix MHSEmulator to pass small files
...
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707
Former-commit-id: 027cb2ef91
[formerly 4309016948
] [formerly 027cb2ef91
[formerly 4309016948
] [formerly acf250cf4d
[formerly 82cf8e81625ebf809ce62b1e21b4db8d5ef0a098]]]
Former-commit-id: acf250cf4d
Former-commit-id: dabeb6272d
[formerly d7170d1ea8
]
Former-commit-id: 650818a98c
2014-02-13 15:53:15 -06:00
Nate Jensen
65068869e1
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 63d5f94cbb
[formerly e05f1eae96
] [formerly 63d5f94cbb
[formerly e05f1eae96
] [formerly a85575a763
[formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 139479b4e1
[formerly 11fb06810f
]
Former-commit-id: 70285796ac
2014-02-13 15:35:53 -06:00
Nate Jensen
1aeeeffb0d
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: f2b32fa1ae
[formerly 2643d01b74
] [formerly f2b32fa1ae
[formerly 2643d01b74
] [formerly d8e2d2837e
[formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 1f3c4090a0
[formerly b31470f7e3
]
Former-commit-id: 3fb847a74c
2014-02-13 14:02:55 -06:00
Nate Jensen
16bfc2e8b5
Merge "Issue #2751 user identity refactor" into development
...
Former-commit-id: da2eb1f068
[formerly ee5b9b65bf
] [formerly da2eb1f068
[formerly ee5b9b65bf
] [formerly 38bd5b3d52
[formerly f652f28862822a0fd063a173fbb323b4b16394fb]]]
Former-commit-id: 38bd5b3d52
Former-commit-id: 1ff97122ea
[formerly 34906d5464
]
Former-commit-id: 0b24e2ca7c
2014-02-13 14:01:53 -06:00
Brian Clements
aa06f65038
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: 16ed18e0c6
[formerly ef52908906
] [formerly 16ed18e0c6
[formerly ef52908906
] [formerly 0ac7ff81cf
[formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: e6de3a118d
[formerly 3ec3ad0543
]
Former-commit-id: 1cc21dc160
2014-02-13 13:51:39 -06:00
Ben Steffensmeier
1e96945cb8
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: 2b30269ac9
[formerly 54a17c012d
] [formerly 2b30269ac9
[formerly 54a17c012d
] [formerly 23694f5e0c
[formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]
Former-commit-id: 23694f5e0c
Former-commit-id: be00537d6d
[formerly bedf3cf45d
]
Former-commit-id: c8feeebbbd
2014-02-13 13:27:32 -06:00
Ron Anderson
3598139635
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: 21e95cc2f0
[formerly 51c9d27a39
] [formerly 21e95cc2f0
[formerly 51c9d27a39
] [formerly 42fd9c8f9a
[formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: ca11555427
[formerly b84a83eb6f
]
Former-commit-id: 828738b81f
2014-02-13 10:46:27 -06:00
Ron Anderson
7447a71c10
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 3e78908bb5
[formerly fcf45916f4
] [formerly 3e78908bb5
[formerly fcf45916f4
] [formerly 2f067699f2
[formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: d9b82b4ebe
[formerly 2d7c87ac84
]
Former-commit-id: d298aabe40
2014-02-13 10:10:34 -06:00
Brian Clements
a3157035bc
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: 2d72c0f475
[formerly 579f7c826d
] [formerly 2d72c0f475
[formerly 579f7c826d
] [formerly caa8360ac7
[formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]
Former-commit-id: caa8360ac7
Former-commit-id: 46ea69990d
[formerly bafe2972a4
]
Former-commit-id: 8b618ea95b
2014-02-13 09:47:02 -06:00
Ben Steffensmeier
3a49bb1a90
Issue #2672 Fix problems encountered in data access layer.
...
Former-commit-id: d663567b36
[formerly 41983df7a0
] [formerly d663567b36
[formerly 41983df7a0
] [formerly 835bcc695d
[formerly ec95d1af0696b1f9b0b105143e26ea40937b28a8]]]
Former-commit-id: 835bcc695d
Former-commit-id: 8fb8ea57d5
[formerly d85014e363
]
Former-commit-id: 9cc950cf06
2014-02-12 18:37:02 -06:00
Nate Jensen
5771b557ef
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: ed87998c31
[formerly 6093312861
] [formerly ed87998c31
[formerly 6093312861
] [formerly 94b8b7eb04
[formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]]
Former-commit-id: 94b8b7eb04
Former-commit-id: f53e9523f3
[formerly b9e027059f
]
Former-commit-id: 78f8a9fbe3
2014-02-12 17:34:27 -06:00
Nate Jensen
e0bcd89020
Merge "Issue #2648 Add AlertMessage output. Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e" into development
...
Former-commit-id: 28235a99cc
[formerly b79e5e02f9
] [formerly 28235a99cc
[formerly b79e5e02f9
] [formerly fe139ac87f
[formerly 42e771181972a04c898c6fe30f8b1c6b70cedafd]]]
Former-commit-id: fe139ac87f
Former-commit-id: 5c64b43c04
[formerly 8ee9d781a2
]
Former-commit-id: 423510ca06
2014-02-12 17:34:15 -06:00
Ben Steffensmeier
b59ea9ac5a
Issue #2648 Add AlertMessage output.
...
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e
Former-commit-id: ca109598ec
[formerly f45ec64979
] [formerly ca109598ec
[formerly f45ec64979
] [formerly c96be7613c
[formerly 47826e8d3e4570c9f970fc30f5dac462611b91bf]]]
Former-commit-id: c96be7613c
Former-commit-id: 91eaba54df
[formerly 4cffeac65f
]
Former-commit-id: 27165c51b8
2014-02-12 17:08:23 -06:00