Brian Clements
00e7061f42
Issue #2903 set commons.lang to unpack in feature to fix odd bug
...
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: fe53a23d2c
[formerly fee0a858cb
] [formerly 873efa1c64
] [formerly f45e435f2c
[formerly 873efa1c64
[formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782
]
Former-commit-id: 20830253ba
2014-04-30 17:52:43 -05:00
Richard Peter
9ee5b7c648
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
...
Former-commit-id: 83658fcbb5
[formerly d28c4fdbae
] [formerly de9eb60629
] [formerly 86ddd480c1
[formerly de9eb60629
[formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6
]
Former-commit-id: d961ff6edc
2014-04-30 17:43:50 -05:00
Dave Hladky
5fc17cf3b8
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly 3b00ae03cc
[formerly c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740
]
Former-commit-id: ea791b5ca5
2014-04-30 17:38:28 -05:00
Nate Jensen
65ad418a94
Issue #2060 fix FFG processing
...
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e
[formerly 2d19ee46e5
] [formerly 8cbea21f32
] [formerly 9b19f95d24
[formerly 8cbea21f32
[formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac
]
Former-commit-id: 9a2c674142
2014-04-30 13:08:26 -05:00
Richard Peter
0dfa8cc4c6
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110
[formerly 67683dd891
] [formerly 44b1782461
] [formerly 32957285fc
[formerly 44b1782461
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878
]
Former-commit-id: 6966b79246
2014-04-28 16:27:40 -05:00
Lee Venable
090ea0fa5a
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50
[formerly a8ab7f3946
] [formerly 573465f316
] [formerly e054a7ab98
[formerly 573465f316
[formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]
Former-commit-id: e054a7ab98
Former-commit-id: d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6
]
Former-commit-id: eda26e6076
2014-04-28 15:24:26 -05:00
Nate Jensen
8830b4dc71
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: 99612f1324
[formerly d145961f4c
] [formerly 48cab0ae71
] [formerly dc3ba942a9
[formerly 48cab0ae71
[formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]
Former-commit-id: dc3ba942a9
Former-commit-id: e4462ad10f15d550cf3f5675a21220838cb4c684 [formerly 11a3ae5054
]
Former-commit-id: 74e77d307a
2014-04-25 15:05:07 -05:00
Nate Jensen
c7a6389dc5
Issue #2972 fix thin client startup
...
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: f007819a3b
[formerly 7811040f3e
] [formerly d47a09530a
] [formerly 86e9502341
[formerly d47a09530a
[formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]
Former-commit-id: 86e9502341
Former-commit-id: e06610b8bc72529769fa8960a6b7198bd30c2095 [formerly 27ed7e5dab
]
Former-commit-id: c802e6a05c
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
5b61473bd6
Issue #2874 Allow RTOFS nowcast to be identified by process type.
...
Former-commit-id: 214311cc6e
[formerly 9478f8adc9
] [formerly 2d96d9d2df
] [formerly fa3d4bb618
[formerly 2d96d9d2df
[formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52
]
Former-commit-id: 080c2a48f3
2014-04-25 14:38:36 -05:00
Brian Clements
922d56617f
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 1dc13cc151
[formerly 5f746c9c56
] [formerly 17ab4f6184
] [formerly f1213c1bda
[formerly 17ab4f6184
[formerly 57120491452b36bf15227bd4b6d0236221c71124]]]
Former-commit-id: f1213c1bda
Former-commit-id: d5d66283e23493ee2ad0d94aaa29c13df24989de [formerly fe6af8c315
]
Former-commit-id: ed2d66a6fa
2014-04-25 13:41:17 -05:00
David Gillingham
8db5524b3f
Issue #2897 : Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
...
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: 777456404b
[formerly c14497b1b7
] [formerly 2426e463f7
] [formerly 6ca193b8e9
[formerly 2426e463f7
[formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86
]
Former-commit-id: 48bc49fd4b
2014-04-25 10:56:43 -05:00
Brian.Dyke
14a63a19e1
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40
[formerly f0b8ea5822
] [formerly fb1f5aa593
] [formerly 3524838f9f
[formerly fb1f5aa593
[formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad
]
Former-commit-id: bf3758efa3
2014-04-25 11:06:11 -04:00
Richard Peter
d8950196fa
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb
[formerly 5b14b22ee1
] [formerly 37342cba87
] [formerly 9a7e1aa9b0
[formerly 37342cba87
[formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: 0442d2b0ea886a8fa3e51c518e72f6a8bad19366 [formerly caccf6ca52
]
Former-commit-id: 2d1262e41f
2014-04-24 19:11:50 -05:00
Lee Venable
ae2a0c44df
Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
...
Former-commit-id: 4583301be4
[formerly 15c9311c97
] [formerly a511f8d4e7
] [formerly e7acb04432
[formerly a511f8d4e7
[formerly 9762326cea40526042cd7f371d864a96abd63842]]]
Former-commit-id: e7acb04432
Former-commit-id: 354ff82939ff9af3bda0b0549c79621918a220c7 [formerly 20d563cd15
]
Former-commit-id: ae333a34dc
2014-04-24 17:53:05 -05:00
Lee Venable
cd5d582898
Merge "Issue #3045 Change column label to "Data Set"." into development
...
Former-commit-id: e35e76282f
[formerly fd7a86e187
] [formerly e45c999d47
] [formerly 9642dac1f1
[formerly e45c999d47
[formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]
Former-commit-id: 9642dac1f1
Former-commit-id: 4d167b8c2ca353a3b73426a8094c1a1a3ce6b803 [formerly e776e8c3d0
]
Former-commit-id: 059a2f59b5
2014-04-24 17:42:12 -05:00
Roger Ferrel
f88302b94d
Issue #3045 Change column label to "Data Set".
...
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c7978
[formerly 8eb4c91ab3
] [formerly 3a2a6afaf1
] [formerly cf6d1c8ca1
[formerly 3a2a6afaf1
[formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 675b98f9712eaa32b9b8d18b880b9cabd81a288f [formerly 0490023b2c
]
Former-commit-id: 555c8cf617
2014-04-24 16:25:01 -05:00
Brian Clements
32b8ddd64c
Issue #3070 fixed contact request handling
...
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 345fe6f866
[formerly 334ad3ca81
] [formerly 02f08d75c6
] [formerly 94aa761e19
[formerly 02f08d75c6
[formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8
]
Former-commit-id: 84f75ca30a
2014-04-24 16:10:27 -05:00
Roger Ferrel
b511341dc4
Issue #3045 - Change to prevent race conditions while getting table labels.
...
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686
[formerly e2b03eb190
] [formerly 9dad4c959b
] [formerly 2a0a9b5334
[formerly 9dad4c959b
[formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: 54b732727c2263f33c97df4d4d5ff55d84b6f396 [formerly d73f61c7e7
]
Former-commit-id: ef81949dd1
2014-04-24 14:48:15 -05:00
Slav Korolev
4dca796283
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
...
Former-commit-id: f39c9c151d
[formerly 150a132320
] [formerly 689930c484
] [formerly f458f75ecf
[formerly 689930c484
[formerly 879a50a60209abf95752c178a0266cdd42bde012]]]
Former-commit-id: f458f75ecf
Former-commit-id: 72ea0b9194f024a8e7ff25eef75d71cd7b0f041d [formerly e78c6edb8c
]
Former-commit-id: 27095ecca8
2014-04-24 15:40:52 -04:00
Brian Clements
363632479a
Issue #2955 ignore duplicate session invites
...
Former-commit-id: 9f18c5d54c
[formerly e81ee94171
] [formerly f888819646
] [formerly 4fa9afc9ae
[formerly f888819646
[formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 8ac39537a1c44d7ebe4df3667107708e5209338d [formerly 75465b69ed
]
Former-commit-id: 39c2a1ac37
2014-04-24 09:25:54 -05:00
Lee Venable
0c67eecb00
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: e17fa9f609
[formerly eed8c6cbba
] [formerly df05a79d63
] [formerly f13ac7e1b9
[formerly df05a79d63
[formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 0c6b693c6efe16d8a10f2143e1a25863ed0ea9e1 [formerly 222154d094
]
Former-commit-id: 421a4e4677
2014-04-23 18:24:25 -05:00
Nate Jensen
168283b32c
Issue #2623 remove ecf plugins from being included in cave
...
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18
Former-commit-id: 692e3de7d0
[formerly baa6714566
] [formerly 07fec6a69c
] [formerly ecb6b4d0ce
[formerly 07fec6a69c
[formerly 98e3e2137ecb9ce14f8dfd295791a79a897867a2]]]
Former-commit-id: ecb6b4d0ce
Former-commit-id: 0d4ccc0072c9a7dbe0c56ac010a6d2d20050a50d [formerly 3671e18036
]
Former-commit-id: 9bac89c776
2014-04-23 17:29:00 -05:00
Richard Peter
d4c155e693
Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
...
Former-commit-id: 14cbe67add
[formerly 99036341f3
] [formerly 026575b202
] [formerly e10434a727
[formerly 026575b202
[formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]
Former-commit-id: e10434a727
Former-commit-id: 7e8673ea1eef68b1c7e1e7f7774589fb2de1b258 [formerly b4226666be
]
Former-commit-id: 4d2ee42fc9
2014-04-23 17:25:25 -05:00
Ben Steffensmeier
7fc6f021f7
Issue #2947 Fixes for derived products with multiple records per frame.
...
Former-commit-id: 313cb63228
[formerly c6fc0fd4b1
] [formerly c19d52db72
] [formerly 01fc21b6f2
[formerly c19d52db72
[formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: 5e26c3c2b09cdc4a748a79253c16203bcde2b78f [formerly 0cde4689fa
]
Former-commit-id: e3e78283dd
2014-04-23 17:14:02 -05:00
Ron Anderson
569608769f
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
...
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: bf6d35aa0f
[formerly 2f68fb8f2c
] [formerly 221a06e467
] [formerly f3185dd206
[formerly 221a06e467
[formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 373f6b66bdafbfe9284322be7df3257cc614b264 [formerly 3e37419dc6
]
Former-commit-id: 00f2f374cd
2014-04-23 17:04:16 -05:00
Nate Jensen
73a3cde77b
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 68e3650305
[formerly 827112349a
] [formerly ad6e4712d6
] [formerly 2b20cf5440
[formerly ad6e4712d6
[formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 56369e0fe9e69598af2bbd95632d4f6ff4857957 [formerly a0423843b3
]
Former-commit-id: 418741ce55
2014-04-23 15:30:44 -05:00
Nate Jensen
e44fd81dba
Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
...
Former-commit-id: 4232c6b1b2
[formerly 547bcafdb6
] [formerly c193eac6e8
] [formerly 1067e4b09c
[formerly c193eac6e8
[formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]
Former-commit-id: 1067e4b09c
Former-commit-id: 5874c8cb5482f0b1e18efc0d04e83673cd092509 [formerly d1c581aed6
]
Former-commit-id: a2df4a7ec5
2014-04-23 14:24:33 -05:00
Brian Clements
00ebd60fad
Issue #2822 shared display invitations always go to cave
...
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients
Former-commit-id: 148d158380
[formerly 117eeca83a
] [formerly f3ee7b453a
] [formerly 6969321db0
[formerly f3ee7b453a
[formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: a24c2596dc9f506edbc4e849e78e744becb558ec [formerly 5d2ec9b909
]
Former-commit-id: 50acaac149
2014-04-23 14:16:42 -05:00
Lee Venable
e7b038f996
Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
...
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986
Former-commit-id: 456ef5b18a
[formerly 41cd3242f5
] [formerly 331dc3397f
] [formerly 765d2e80bc
[formerly 331dc3397f
[formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]]]
Former-commit-id: 765d2e80bc
Former-commit-id: 6462dc7ff313f4567226222bb4da5eb4d49eff71 [formerly 26e8c1ecf6
]
Former-commit-id: 029de4a1b1
2014-04-23 14:07:29 -05:00
Brian.Dyke
05c0e1ad1c
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 4938304674
[formerly 88d44a3129
] [formerly 2a4fe3dbae
] [formerly a7c9ddc05e
[formerly 2a4fe3dbae
[formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17
]
Former-commit-id: 953236aad8
2014-04-23 14:05:50 -04:00
Nate Jensen
342c851b04
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: 37371486ba
[formerly fbecf66f79
] [formerly 426f103e7b
] [formerly 38d493ff1b
[formerly 426f103e7b
[formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]
Former-commit-id: 38d493ff1b
Former-commit-id: f2ca8041ae7698bcc9759ba71d21e9d90aae5740 [formerly 20f3f8ffa2
]
Former-commit-id: 2b68a49a43
2014-04-23 12:26:27 -05:00
Nate Jensen
439e345f98
Merge "Issue #2903 added connection tests to session close methods" into development
...
Former-commit-id: a24262b3a9
[formerly c88597b6c2
] [formerly 9ec6169646
] [formerly 4a04662972
[formerly 9ec6169646
[formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]
Former-commit-id: 4a04662972
Former-commit-id: efae253c5ad86a47ac5d792c2c5124876253603d [formerly e9456b4ab7
]
Former-commit-id: d60701a264
2014-04-22 12:53:08 -05:00
Nate Jensen
9ca82ebdd7
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: bf06389b9e
[formerly cc1da5fb88
] [formerly fe3ff669a7
] [formerly 8df505325c
[formerly fe3ff669a7
[formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]
Former-commit-id: 8df505325c
Former-commit-id: 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10 [formerly be6818e96b
]
Former-commit-id: 484b197a56
2014-04-22 12:50:27 -05:00
Nate Jensen
7434d299fa
Merge "Issue #3038 added initialized flag to session feed view" into development
...
Former-commit-id: a9f0d3f6ee
[formerly 963a848f90
] [formerly 42d0d7681d
] [formerly fc2be9521a
[formerly 42d0d7681d
[formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]
Former-commit-id: fc2be9521a
Former-commit-id: 4cf54574a3262851c041d42381722c70bb079ea0 [formerly ca8eab399f
]
Former-commit-id: 7f777e6fb9
2014-04-22 12:49:02 -05:00
Brian Clements
15279b35c9
Issue #2903 added connection tests to session close methods
...
fixes illegal state exception problem when booted from xmpp server
Former-commit-id: 053136ccbb
[formerly f9ab4f9cfe
] [formerly 50f3f420eb
] [formerly 49f86e4153
[formerly 50f3f420eb
[formerly d570c81caed35576e867df15c2a8d900135fef5f]]]
Former-commit-id: 49f86e4153
Former-commit-id: 6540ea31c93aa2adc8f9e805932f31f84eb11dec [formerly c9453a2440
]
Former-commit-id: 9ef018dbe8
2014-04-22 12:36:40 -05:00
Nate Jensen
6f504176ea
Issue #2984 remove unnecessary dependencies
...
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877
Former-commit-id: 3e583eaa7a
[formerly 48d4759371
] [formerly d03afcdcba
] [formerly be21c41512
[formerly d03afcdcba
[formerly 290ec544e38e71332be2072435aff3b933c649ab]]]
Former-commit-id: be21c41512
Former-commit-id: d216f1bdf02ec5de7389774511663158b90f5596 [formerly 8f893545f1
]
Former-commit-id: 8eb74232df
2014-04-22 12:03:44 -05:00
Brian Clements
38fbf8048e
Issue #3056 made venue participant equals method case insensitive
...
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server
Former-commit-id: a5730ca7bd
[formerly bfd88f3e14
] [formerly 1adbf6253a
] [formerly 2a9d341910
[formerly 1adbf6253a
[formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]
Former-commit-id: 2a9d341910
Former-commit-id: a85a4bc02f2dd752ca54943517184b9bdbf83b43 [formerly 8677a9f359
]
Former-commit-id: 19c2695dca
2014-04-22 11:55:36 -05:00
Nate Jensen
a0095992e1
Merge "Issue #2060 dropping grid dataURI column" into development
...
Former-commit-id: 17945fcbef
[formerly 96268f1d35
] [formerly c161a2ba50
] [formerly ffaa7d8f58
[formerly c161a2ba50
[formerly d9876133fcb3975c8c7e58ff2ee75ca90dc8a0dd]]]
Former-commit-id: ffaa7d8f58
Former-commit-id: 19c714125fe5658e7f57714616e9191ebd8cfaa0 [formerly 0b25aebbb1
]
Former-commit-id: c65e827d4e
2014-04-22 10:42:11 -05:00
Brian Clements
001e0b030b
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: 1665175d35
[formerly cdf3aa90e9
] [formerly 717cdf4280
] [formerly ef61a7c281
[formerly 717cdf4280
[formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]
Former-commit-id: ef61a7c281
Former-commit-id: 80e474ab1d11f23309bd83f864334950b90dc4ac [formerly 295ff106b6
]
Former-commit-id: e7005953eb
2014-04-22 10:01:27 -05:00
Ron Anderson
2afa2d0cda
Merge "Issue #2998 Fix regression made in earlier check in." into development
...
Former-commit-id: b9f41e3108
[formerly 447ff809a3
] [formerly 8026973c95
] [formerly a6b5997663
[formerly 8026973c95
[formerly 2a78a1d70ab05322a8a69f96865cb3eba0fa6397]]]
Former-commit-id: a6b5997663
Former-commit-id: 406a14e47fd69c8d2b25bdc3aab2841b0b42ace9 [formerly 5f8ac71e11
]
Former-commit-id: b389398c95
2014-04-21 17:55:22 -05:00
Nate Jensen
c4819a4e95
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 03451ab6b2
[formerly 263611f905
] [formerly a37a2afe18
] [formerly 5dfb652775
[formerly a37a2afe18
[formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]
Former-commit-id: 5dfb652775
Former-commit-id: 6295d04b083ae6cd109f1c2f595fb1922420e2a1 [formerly cdb932cc4d
]
Former-commit-id: 3eddbf452d
2014-04-21 17:34:39 -05:00
Ron Anderson
b1b0dcf75f
Issue #2998 Fix regression made in earlier check in.
...
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71
Former-commit-id: 5570193f21
[formerly 2a819003c5
] [formerly ed99abbb9d
] [formerly 04467d51dd
[formerly ed99abbb9d
[formerly 8c48d369b3b6af0222b541ccfa9230495d4cb0f9]]]
Former-commit-id: 04467d51dd
Former-commit-id: f335a0dab919cc88d957bc2df62452c5a76437b7 [formerly 04a7c2d8cd
]
Former-commit-id: 243c929fc1
2014-04-21 17:26:29 -05:00
Nate Jensen
9c7e88211f
Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
...
Former-commit-id: f0cdb9e8ad
[formerly 1651a79187
] [formerly 1a617796cb
] [formerly ec82e51d28
[formerly 1a617796cb
[formerly 1fde0217948dad64221d0348f9e45a8e1430cdd7]]]
Former-commit-id: ec82e51d28
Former-commit-id: 31f7dac3240712ec81e5f3265ec55796ae1240a7 [formerly 0d7ae042d5
]
Former-commit-id: efc5dba997
2014-04-21 17:08:17 -05:00
Nate Jensen
9e6ca096e7
Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
...
Former-commit-id: 7530137f38
[formerly 535a5f836d
] [formerly e401fca661
] [formerly cb7d485004
[formerly e401fca661
[formerly 74946a00033737aae24aabbfc333d661598cd6f2]]]
Former-commit-id: cb7d485004
Former-commit-id: 1f516d923aaa0e50bc15f2399e7e29a856f577ad [formerly 87457f26fc
]
Former-commit-id: f75fc8da0c
2014-04-21 15:13:53 -05:00
Ron Anderson
d851b549ef
Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
...
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c
Former-commit-id: 0097799e2c
[formerly 8aac4d32b1
] [formerly 665246d72e
] [formerly c4a0a4ef6e
[formerly 665246d72e
[formerly 2b67417e6128e3cd4cafa5c8f2ac23c10be2b300]]]
Former-commit-id: c4a0a4ef6e
Former-commit-id: 9ccb16c1887bb7f23193c421183a85e48e5cb136 [formerly e515f42b94
]
Former-commit-id: b5dc730fea
2014-04-21 14:25:53 -05:00
Lee Venable
e5d73f64ac
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ed407b11c6
[formerly ac914e72e7
] [formerly 3c45a24efb
] [formerly dcb7e697e8
[formerly 3c45a24efb
[formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]
Former-commit-id: dcb7e697e8
Former-commit-id: dcaad16ef8d601c796b1e22040cf86806d2002cf [formerly 20764b1d97
]
Former-commit-id: 91d37d783c
2014-04-21 13:47:31 -05:00
Ron Anderson
2c67fd60b4
Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development
...
Former-commit-id: 0bf7593ccd
[formerly efdd37b012
] [formerly 750c054ab0
] [formerly 5f82bb7cc8
[formerly 750c054ab0
[formerly 3038cbecf8efc76c76cdc86702986069788b6a02]]]
Former-commit-id: 5f82bb7cc8
Former-commit-id: 75334e768d73f39e084bb28d84fc8f55e8865a82 [formerly 1df03eb2dc
]
Former-commit-id: 020045fee3
2014-04-21 13:25:11 -05:00
Brian Clements
79c5884e45
Issue #2822 fixed check for topic subscription before leader transfer
...
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles
Former-commit-id: 833d693098
[formerly c4a38d1f68
] [formerly 6c47c78038
] [formerly aed25eeb61
[formerly 6c47c78038
[formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]]
Former-commit-id: aed25eeb61
Former-commit-id: 7ac0692b2d053f58ada13699f7e27bac3e23b62c [formerly 474255ed29
]
Former-commit-id: 56e0dad5ff
2014-04-21 13:07:14 -05:00
Ron Anderson
0a9cfdea1a
Issue #2998 Fixed null pointer in AttributeViewer.
...
Improved sizing of displayAttributes.
Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93
Former-commit-id: a506479e56
[formerly a3a8a1ebb4
] [formerly 811f05f164
] [formerly 541a908a41
[formerly 811f05f164
[formerly 0fac12a4f17de189a88e6dd4415f6364afc4f459]]]
Former-commit-id: 541a908a41
Former-commit-id: 6f390a352c1b816539d9422ef8bd0ec4832c766f [formerly a5cea97c6f
]
Former-commit-id: d4fcdb0851
2014-04-21 13:03:50 -05:00
Lee Venable
e70c07c29d
Merge "Issue #2891 - Fix refresh of Utilization Graph" into development
...
Former-commit-id: 13c46b95a7
[formerly b01eac4cc3
] [formerly dd7f0a82f9
] [formerly 370ff09548
[formerly dd7f0a82f9
[formerly 194b601d5938ba599abc5dd9e29f0a62a7713cb0]]]
Former-commit-id: 370ff09548
Former-commit-id: 82cb64c66e31fa00648fe582e7f00b4040f23e2f [formerly 74df7202b0
]
Former-commit-id: a8cb00e2c6
2014-04-21 12:59:00 -05:00