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
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
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
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
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
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
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
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
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
Juliya Dynina
ea517caad4
Merge "ASM #85 " into asm_14.2.2
...
Former-commit-id: d04aa5b55f8e4c8bf92d5095ac0758deff8db6eb5095ac0758deff8db6ebeeffda2e2f99a2addf18
2014-02-12 13:15:58 -05: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
Loubna.Bousaidi
a83805651f
ASM #85
...
Change-Id: I782bbebc746425446c523b6b4db026d81f85b2da
Former-commit-id: e985e9d296fe1c94a422e3168d08cf55d8f64139e3168d08cf55d8f64139de69883b43d0109c690c
2014-02-11 22:12:48 +00:00
Brian.Dyke
1c7bf39f73
14.1.1-18 baseline
...
Former-commit-id: 1f27652aa3f05a2220cd575e3281231d6a9456b7575e3281231d6a9456b7c5857c30f2d61ae6c5f4
2014-02-11 15:52:50 -05: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
Juliya Dynina
76e5b16f21
Merge "ASM #94 " into asm_14.2.2
...
Former-commit-id: a90e5adb6800d8dfb641e2479f40750ae2a064a3e2479f40750ae2a064a356c383bb73d66458b0b0
2014-02-11 10:08:00 -05:00
Michael Gamazaychikov
affc8cbf35
ASM #94
...
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed
Former-commit-id: 7531090e3d8cd5cce89e42399284cab63053d8b442399284cab63053d8b460de3bbc43293dd963f1
2014-02-11 01:32:37 +00: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
Juliya Dynina
172898471c
Merge "ASM #250 " into asm_14.2.2
...
Former-commit-id: 48a5acd6ee2cdba70b78d63bec582a81f1d6cf12d63bec582a81f1d6cf12eb0e858f60e5d4f42649
2014-02-10 14:04:52 -05: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
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
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
Rici.Yu
6d8b43f409
ASM #102
...
Change-Id: Idae87ce34f52bc79144742b92cff7e3537a84e99
Former-commit-id: 44656c81d96c8fa82be24010ef5fd83bc070a8ec4010ef5fd83bc070a8ec7cd5b3e16db35b74ca23
2014-02-07 10:43:29 -05:00
Loubna.Bousaidi
a91c29b99f
ASM #250
...
Change-Id: I81033a3a597e63f1ad53a7a1cefc4a775297f513
Former-commit-id: 1afff8be6343d3e156a744e04ffef0176de0262c44e04ffef0176de0262ca0f435ca20729beccf49
2014-02-07 15:15:58 +00:00
Richard Peter
5a7e7af23b
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 8ad3c5857b82fc0a2ed364f0cabaef36d3d21b5764f0cabaef36d3d21b57c965993d17c3c1205848
2014-02-05 18:20:36 -06:00
Nate Jensen
73c1a1141d
Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
...
Former-commit-id: 6b9561855bd3d0dc5f77d863bf208cf00d4c54d8d863bf208cf00d4c54d88feed9aadf39c9dda92b
2014-02-05 17:09:17 -06:00
Mike Duff
229efa7c5b
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 3691146e34bafe19bbd5101c08818d6b01c2957f101c08818d6b01c2957f6a2f75e8d59edf591218
2014-02-05 16:08:01 -06:00
Ben Steffensmeier
3a13cfcb78
Issue #2672 Handle envelopes in data access requests of gridded types.
...
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c
Former-commit-id: f3eebf56f5b84bf8c8919c439866d5dc5b5526a39c439866d5dc5b5526a302a08746465b7cf3caec
2014-02-05 15:57:08 -06:00
Juliya Dynina
d191fb83af
Merge "ASM #114 " into asm_14.2.2
...
Former-commit-id: dd71746c6f3edd73f78c575ed3610dc6253811e8575ed3610dc6253811e8430b9a1acef54454f8f1
2014-02-05 10:42:30 -05:00
Brian.Dyke
d274021768
Issue #124
...
Former-commit-id: 6d35a4b1bc3ba93b175e439f0533090cc11ddfd3439f0533090cc11ddfd390b4e7ebf0e1d788683d
2014-02-04 16:56:47 -05:00
Brian.Dyke
8e78870c71
Issue #83
...
Former-commit-id: 89422cef7cf2e56b268c484119f6b0fb15dd5dfb484119f6b0fb15dd5dfbf088dab5ef3c160bb05e
2014-02-04 16:32:42 -05:00
Slav Korolev
0ebbffc8fc
Issue #2757 . Added filter for removed stations and cleaned code.
...
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534
Former-commit-id: 91972c1b42cbd17ea025c7c40a3467fa59172d87c7c40a3467fa59172d874ec22d9530aea166d7b9
2014-02-04 15:21:22 -05:00
Mike Duff
e1023f0bc4
Issue #2722 - Add auto refresh to sub manager dialog
...
Former-commit-id: 8d92217e94227eb2315704ee397f2bab9621698f04ee397f2bab9621698fe984863c1cf7566298b2
2014-02-04 12:45:33 -06:00
steve.naples
6d24becad9
ASM #235
...
Change-Id: Ic3a6237b0a1f9ddf06621c984d2f11b7e08d7adb
Former-commit-id: 0f1a16498ab7b5dc3497c76099274a22808af7e2c76099274a22808af7e2cb508369cf26dd36e272
2014-02-04 18:23:46 +00:00
Brian.Dyke
6e66bb7b6e
14.1.1-17 baseline
...
Former-commit-id: 4c6eb0c001f3d34b0c38180d1356cd23280af290180d1356cd23280af290947ec5fd96f1cc9d6ee2
2014-02-04 12:33:46 -05:00
Brian Clements
876b60e15d
Issue #2699 fixed assumption that usersearch was exact
...
usersearch returns matches for any part of string
added method to restrict to exact matches only
Former-commit-id: ddbfe9a763bebd62c6b6cfa3c9e0e86ea009a2e1cfa3c9e0e86ea009a2e1aff354a3d7bc75d43bc3
2014-02-03 15:34:58 -06:00
Lee Venable
803102f8b3
Merge "Issue #2757 . Fixed issues in Area Configuration Dialogs." into development
...
Former-commit-id: 39021a203a72a4a12e8919b883a407c44b12017619b883a407c44b12017615f94a61b53e3805e1a7
2014-02-03 14:31:28 -06:00
Ben Steffensmeier
a63cd52b14
Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
...
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834
Former-commit-id: fc0d044bd9921401ffe98865177c6b97a64f89f18865177c6b97a64f89f12be72739b51f34342948
2014-02-03 14:07:07 -06:00
