Nate Jensen
0f317fd808
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: ed76393cd80fe984258230632fbd84063d85ee2230632fbd84063d85ee22996663ccee1169f85a3b
2014-02-17 11:22:53 -06:00
Max Schenkelberg
748a81d884
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: 554e0caec51de140a526acad6702296a2a33abe1acad6702296a2a33abe191f707537bff9fdc63b0
2014-02-17 11:07:45 -06:00
Steve Harris
1fbbb6e73f
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 1b7e02636dd0352c69d4267cc881a49fcc5ad930267cc881a49fcc5ad930e115197bb7146412a8bd
2014-02-17 08:54:34 -06:00
Ron Anderson
facdf2b779
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: 4b2981b74fce8d59e075fae824482b769c56bf08fae824482b769c56bf0829e24081a68434f5cc65
2014-02-17 08:56:48 -06:00
Nate Jensen
d3c66cb748
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: fa87ba313856aa06888f723ff23ee9f3d107580f723ff23ee9f3d107580fdbc420e917b1c976ac17
2014-02-14 10:50:38 -06:00
Max Schenkelberg
db72c9efca
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 38aae37f014d656b5d066309f9b34bc8e93190f26309f9b34bc8e93190f23571135645b311aba5d5
2014-02-14 10:47:42 -06:00
Mike Duff
fad65749a8
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: b34c9eedd043ea3b0918ac62d322ed346dc4afffac62d322ed346dc4afff5b3a55d11f6601dff483
2014-02-14 08:53:40 -06:00
Ron Anderson
c77d1c7e95
Issue #2758 Fix MHSEmulator to pass small files
...
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707
Former-commit-id: 0f73b51155027cb2ef914309016948acf250cf4d4309016948acf250cf4dd7170d1ea8dabeb6272d
2014-02-13 15:53:15 -06:00
Nate Jensen
740e71adba
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 47b27c602f63d5f94cbbe05f1eae96a85575a763e05f1eae96a85575a76311fb06810f139479b4e1
2014-02-13 15:35:53 -06:00
Nate Jensen
2772ad3c9c
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: ec6d8585e1f2b32fa1ae2643d01b74d8e2d2837e2643d01b74d8e2d2837eb31470f7e31f3c4090a0
2014-02-13 14:02:55 -06:00
Nate Jensen
b357f36676
Merge "Issue #2751 user identity refactor" into development
...
Former-commit-id: 8ef1cef675da2eb1f068ee5b9b65bf38bd5b3d52ee5b9b65bf38bd5b3d5234906d54641ff97122ea
2014-02-13 14:01:53 -06:00
Brian Clements
21b1a6844a
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: 01653c76de16ed18e0c6ef529089060ac7ff81cfef529089060ac7ff81cf3ec3ad0543e6de3a118d
2014-02-13 13:51:39 -06:00
Ben Steffensmeier
bc38342841
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: 94f0b523442b30269ac954a17c012d23694f5e0c54a17c012d23694f5e0cbedf3cf45dbe00537d6d
2014-02-13 13:27:32 -06:00
Ron Anderson
c2e56111c1
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: ce72867ab921e95cc2f051c9d27a3942fd9c8f9a51c9d27a3942fd9c8f9ab84a83eb6fca11555427
2014-02-13 10:46:27 -06:00
Ron Anderson
4d8ebf6712
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad3e78908bb5fcf45916f42f067699f2fcf45916f42f067699f22d7c87ac84d9b82b4ebe
2014-02-13 10:10:34 -06:00
Brian Clements
d4afb01ecc
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: a0eb8342bf2d72c0f475579f7c826dcaa8360ac7579f7c826dcaa8360ac7bafe2972a446ea69990d
2014-02-13 09:47:02 -06:00
Ben Steffensmeier
0bf76e4cd7
Issue #2672 Fix problems encountered in data access layer.
...
Former-commit-id: 5ed46c8b38d663567b3641983df7a0835bcc695d41983df7a0835bcc695dd85014e3638fb8ea57d5
2014-02-12 18:37:02 -06:00
Nate Jensen
906e7f679a
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: 1841c4f7bfed87998c31609331286194b8b7eb04609331286194b8b7eb04b9e027059ff53e9523f3
2014-02-12 17:34:27 -06:00
Nate Jensen
23af1cfafc
Merge "Issue #2648 Add AlertMessage output. Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e" into development
...
Former-commit-id: fe1e70c49f28235a99ccb79e5e02f9fe139ac87fb79e5e02f9fe139ac87f8ee9d781a25c64b43c04
2014-02-12 17:34:15 -06:00
Ben Steffensmeier
325cc8f289
Issue #2648 Add AlertMessage output.
...
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e
Former-commit-id: f910b9277cca109598ecf45ec64979c96be7613cf45ec64979c96be7613c4cffeac65f91eaba54df
2014-02-12 17:08:23 -06:00
Brian Clements
0145571fe4
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 2a687e7ac51e19c8d62c1bf3a090569d7490a1581bf3a090569d7490a158f22268295e667a1450cf
2014-02-12 17:06:44 -06:00
Brian Clements
c322557870
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: b8a1c8f56d22031aa87d81ddf87b0423e203902881ddf87b0423e203902809859bdee9a1ba9c6b9d
2014-02-12 16:54:46 -06:00
Richard Peter
9709f881bf
Merge "Issue #2655 fix textlightning distribution regex" into development
...
Former-commit-id: 6611c70839172f0a9fa470e9bef7503feee2cf5070e9bef7503feee2cf50ca851b6d2e9d183aaa97
2014-02-12 15:34:43 -06:00
Nate Jensen
fc4670578b
Merge "Issue #2793 improved error handling for packet extension" into development
...
Former-commit-id: 1bf941fc58fa42c40bc7eec72c59565e6656581beec72c59565e6656581b7247d69202bac84c698f
2014-02-12 15:06:43 -06:00
Nate Jensen
31fed91d11
Issue #2655 fix textlightning distribution regex
...
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99
Former-commit-id: 2cd9b9ef13cf1dcae597a6c562d3f016d6a29bb9a6c562d3f016d6a29bb93b918cee5f929d683210
2014-02-12 15:03:45 -06:00
Brian Clements
85e92777e3
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: 87a7bf82e53034ac5994e381edcd60b0714ba659e381edcd60b0714ba6594406477877b94bc84429
2014-02-12 14:22:33 -06:00
Lee Venable
c17a417cbe
Issue #2773 - added code to help prevent eclipse bug from occurring.
...
Former-commit-id: 328aebb4a68073fd22b17099472204ce08022db77099472204ce08022db7c74ae6b83da7302a3232
2014-02-12 13:47:20 -06:00
Brian Clements
8b275e94b2
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: 88db377b418f07ae2a420765451a9dddf5b2a3ef0765451a9dddf5b2a3effab4fea1779c67bcbbcf
2014-02-12 09:13:48 -06:00
Ron Anderson
e0403fd81d
Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
...
Former-commit-id: cf7281ba3c8ba331e7fbaf4f8de839d906b780e8af4f8de839d906b780e8361881dfda2fdcef7338
2014-02-11 17:16:07 -06:00
Ron Anderson
07fdb410c6
Issue #2719 Update NHA GFE domain
...
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: 0b73d0703e0f9b44ff94a665530831ee89463d27a665530831ee89463d27bfa65ed39e1ca9c95567
2014-02-11 17:07:01 -06:00
Brian.Dyke
1c7bf39f73
14.1.1-18 baseline
...
Former-commit-id: 1f27652aa3f05a2220cd575e3281231d6a9456b7575e3281231d6a9456b7c5857c30f2d61ae6c5f4
2014-02-11 15:52:50 -05:00
Slav Korolev
b2d7b314d4
Issue #2763 . Made LFCR correction of input data.
...
Former-commit-id: d715fc58dc633a33dd2143802c3a5f47fc09a68443802c3a5f47fc09a684239f37f467293af25a13
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
be4d0f1c88
Issue #2765 Fix aliases for probability parameters.
...
Former-commit-id: 89d47e32432952ae37a643a8b80ef20bb18f2cd743a8b80ef20bb18f2cd7eb9c4ef999c0dbdb9906
2014-02-11 11:35:03 -06:00
Lee Venable
f8ae04bce2
Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
...
Former-commit-id: 6773d174ecc7cfd496225c256dc19cf078971b5d5c256dc19cf078971b5d42fdfa4964ab6fab4199
2014-02-11 09:15:44 -06:00
Ben Steffensmeier
aa9542cf3f
Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
...
Former-commit-id: 6d4e5d79de3bc210a1f13d08979eee40bc9df4203d08979eee40bc9df420a0227d2c4e01c4ce8e29
2014-02-10 17:39:32 -06:00
Nate Jensen
1dcb3a77c3
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 24bbf4949dc28085118f75ca70fba6fd43d9e09575ca70fba6fd43d9e0952111989497c0256ac19e
2014-02-10 16:48:29 -06:00
Max Schenkelberg
8ddc6b95e4
Issue #2680 fixed samplers in structs issues with GLSL spec.
...
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9
Former-commit-id: 7de6ff30da3c1fafe3287822511754a8a67634f97822511754a8a67634f9e2e9eaaf35dd872433c7
2014-02-10 13:43:16 -06:00
Lee Venable
e9e5667274
Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
...
Former-commit-id: b90abb03c1d6fa79f1a727be4297e688a9d2031627be4297e688a9d20316d975dcf01e65e6fa1963
2014-02-10 11:50:07 -06:00
Nate Jensen
3bbd2ecd54
Merge "Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back" into development
...
Former-commit-id: c6b13c6ddb9f2d49e31d93c84e2f9506679bbd4693c84e2f9506679bbd46733c21051c3de470ba73
2014-02-10 11:26:10 -06:00
Nate Jensen
c65669a6bf
Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
...
Former-commit-id: fb8ce8da65d16d6798095c7c14a6c4a48c1c67835c7c14a6c4a48c1c678357aa6788833047063c6e
2014-02-10 09:53:41 -06:00
Matt Nash
f2831d38e9
Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back
...
Change-Id: I31120de5d206ddcade83e2c5455742deb1d6598a
Former-commit-id: dca4590a15dccb8197384252e589921ecc4541cf4252e589921ecc4541cff300282a225ce022cc1e
2014-02-10 08:40:25 -06:00
Ron Anderson
bbd44e89ba
Merge "Issue #2509 : Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1
...
Former-commit-id: 40f316bcf842850542af2170fb56150476a288db2170fb56150476a288db3cb44b9a129e775c7d28
2014-02-10 08:31:31 -06:00
Mike Duff
b62abd4219
Issue #2453 - Notification Center refactor
...
Former-commit-id: c20018d0ba61c57d2254eeb78f7f202c9d603e50eeb78f7f202c9d603e504a87525df07535b51fe7
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
7f8ff5efc0
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: e7baa5b186d219a687c9724bb856763d76d6655b724bb856763d76d6655b6a95dd6242a37a910f67
2014-02-07 13:00:00 -06:00
Brian Clements
0dd73fed5a
Issue #2699 removed over cautious handle validation
...
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters
Former-commit-id: 6c6467d235639f7745677d6e116b9f6518b88fe57d6e116b9f6518b88fe58742be3a136efb4f51d2
2014-02-07 10:06:06 -06:00
David Gillingham
8cdf1ce158
Issue #2509 : Fix baseline merge breakage to ifpIMAGE.
...
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: dc8f0dde25b12e29dd7c03d36b8309e8ffc7389303d36b8309e8ffc7389394ec272ab2ad8c40032f
2014-02-07 09:51:42 -06:00
Brad Gonzales
e57abad188
Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
...
in-memory bandwidth manager to setup initial scheduling because it
is much faster.
Amend: updated log statement.
fix for rescheduling of already scheduled BandwidthAllocations.
Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3
Former-commit-id: c275da67259529c1d1919c50fb29fd704e466f289c50fb29fd704e466f280b211e8036b59278f73f
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
b4cf53d154
Issue #2672 Handle envelopes in data access requests of points and lightning.
...
Change-Id: Id9a56e9f8027a2f489561c241e2f34dd92dce400
Former-commit-id: dad7e3cbcdcd772d896125ad0e327cec8514000f25ad0e327cec8514000f19cb907ac8b28f945bc1
2014-02-06 14:04:14 -06:00
Ben Steffensmeier
7954587c40
Issue #2762 Fix Satellite Data Access.
...
Former-commit-id: 89105e1257a26a150a692166b5b696ed2c1a03292166b5b696ed2c1a0329e7662de8db270433f5f3
2014-02-06 13:53:44 -06:00
Ben Steffensmeier
955df80a07
Issue #2672 Fix serialization of jts envelopes.
...
Former-commit-id: abb8ce22a7fc783a8e6e97eef922efa068650e4397eef922efa068650e4343df5b25d91cee24ce50
2014-02-06 11:27:07 -06:00
