Nate Jensen
e2a024ea00
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 8d5ec4bb04
[formerly 3222914fde
] [formerly 137818d03a
] [formerly 8d5ec4bb04
[formerly 3222914fde
] [formerly 137818d03a
] [formerly a73a310709
[formerly 137818d03a
[formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]]
Former-commit-id: a73a310709
Former-commit-id: 834dd4895a
[formerly b245e49d53
] [formerly 61860d514df7120cc0bb0d8c083c115b3944aa73 [formerly 84dbedcff5
]]
Former-commit-id: 48dea045c9df8e5f4f88eaca3f0e152ddc64138d [formerly c7ddb6d476
]
Former-commit-id: 562a70b8fb
2014-05-01 16:20:35 -05:00
Richard Peter
d2682acaf2
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: c7f5b23633
[formerly 25fd0e03f4
] [formerly 4056f53fa2
] [formerly c7f5b23633
[formerly 25fd0e03f4
] [formerly 4056f53fa2
] [formerly a4fb460e17
[formerly 4056f53fa2
[formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]]
Former-commit-id: a4fb460e17
Former-commit-id: 3297632b5d
[formerly f364f02f58
] [formerly 38c78f7ac3ebdff8190b01723125c22a2058c85f [formerly c3c7ebb146
]]
Former-commit-id: 7a8980241b9c8931fec2ce1f756924532831bd95 [formerly 472077fbd5
]
Former-commit-id: b8bdced87a
2014-05-01 14:47:41 -05:00
Steve Harris
059faff023
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: d2905e51d4
[formerly 9ecd871825
] [formerly c8ba70a146
] [formerly d2905e51d4
[formerly 9ecd871825
] [formerly c8ba70a146
] [formerly 779e85cc77
[formerly c8ba70a146
[formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac
[formerly 9a6ab8c52f
] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be
]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9
]
Former-commit-id: 523cf536e2
2014-05-01 13:25:15 -05:00
Brian Clements
de694643a9
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: eae19ec5ca
[formerly 93912625ea
] [formerly 3ca4f8cc52
] [formerly eae19ec5ca
[formerly 93912625ea
] [formerly 3ca4f8cc52
] [formerly dd5412e119
[formerly 3ca4f8cc52
[formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89
[formerly 3fd504f1de
] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56
]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7
]
Former-commit-id: 36b2419ff1
2014-05-01 12:34:09 -05:00
Brian Clements
542b75e5be
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 fe53a23d2c
[formerly fee0a858cb
] [formerly 873efa1c64
] [formerly f45e435f2c
[formerly 873efa1c64
[formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 00e7061f42
[formerly 20830253ba
] [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782
]]
Former-commit-id: 1a699056f312f4be2eb1ef65d741ba8d01a416f7 [formerly c3d2b4be86
]
Former-commit-id: 4c1a6b44c8
2014-04-30 17:52:43 -05:00
Richard Peter
68474fb70c
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 83658fcbb5
[formerly d28c4fdbae
] [formerly de9eb60629
] [formerly 86ddd480c1
[formerly de9eb60629
[formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 9ee5b7c648
[formerly d961ff6edc
] [formerly 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6
]]
Former-commit-id: f6db2a6fbbc579ddd2e876bdea84339cafc85568 [formerly dd54408a10
]
Former-commit-id: cfb980db11
2014-04-30 17:43:50 -05:00
Dave Hladky
5fa53b22dc
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly 3b00ae03cc
[formerly c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8
[formerly ea791b5ca5
] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740
]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636
]
Former-commit-id: a06db5a4e7
2014-04-30 17:38:28 -05:00
Richard Peter
7dbdba81ac
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
...
Former-commit-id: 9e9ff43e16
[formerly 37a5292083
] [formerly f80e16d0c9
] [formerly 9e9ff43e16
[formerly 37a5292083
] [formerly f80e16d0c9
] [formerly bfe46bb5e6
[formerly f80e16d0c9
[formerly 31d75a4b82413b015353055668defab0095ef893]]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 307a149bea
[formerly f2d07ce35c
] [formerly e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd
]]
Former-commit-id: e544947f2f7406e11c3bbafca5f51212bcd4decb [formerly 5d18fbe5d3
]
Former-commit-id: fe5fe5b587
2014-04-30 14:49:24 -05:00
Nate Jensen
a11f0d304c
Issue #2060 fix FFG processing
...
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e
[formerly 2d19ee46e5
] [formerly 8cbea21f32
] [formerly acfcaea04e
[formerly 2d19ee46e5
] [formerly 8cbea21f32
] [formerly 9b19f95d24
[formerly 8cbea21f32
[formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94
[formerly 9a2c674142
] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac
]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842
]
Former-commit-id: eb5dd811ca
2014-04-30 13:08:26 -05:00
Richard Peter
e748b7c1e5
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 8b1a177110
[formerly 67683dd891
] [formerly 44b1782461
] [formerly 32957285fc
[formerly 44b1782461
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6
[formerly 6966b79246
] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878
]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466
]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
Lee Venable
b011f13fb1
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50
[formerly a8ab7f3946
] [formerly 573465f316
] [formerly 761101dd50
[formerly a8ab7f3946
] [formerly 573465f316
] [formerly e054a7ab98
[formerly 573465f316
[formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]]
Former-commit-id: e054a7ab98
Former-commit-id: 090ea0fa5a
[formerly eda26e6076
] [formerly d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6
]]
Former-commit-id: a4e6f79e43287a75219721e1af377b8859a3b82e [formerly ede8740acc
]
Former-commit-id: 3a133f6626
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
9980eb1eb1
Issue #2947 ensure consistent interpolation levels for derived satellite.
...
Former-commit-id: f4744737e4
[formerly 41b0c1a3c8
] [formerly 812eebdd72
] [formerly f4744737e4
[formerly 41b0c1a3c8
] [formerly 812eebdd72
] [formerly f318c9eb62
[formerly 812eebdd72
[formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]]
Former-commit-id: f318c9eb62
Former-commit-id: e9bc29a18e
[formerly bb562c9755
] [formerly 78b9fa75af2953ddce6bfad5265e177fb5696833 [formerly 868945fb1b
]]
Former-commit-id: d9fda2331fa5824648a44fe1daf5e0b77e37a03d [formerly 40e3df3ba1
]
Former-commit-id: c59046cda1
2014-04-28 13:00:39 -05:00
Nate Jensen
5ad4b4430f
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: 99612f1324
[formerly d145961f4c
] [formerly 48cab0ae71
] [formerly 99612f1324
[formerly d145961f4c
] [formerly 48cab0ae71
] [formerly dc3ba942a9
[formerly 48cab0ae71
[formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 8830b4dc71
[formerly 74e77d307a
] [formerly e4462ad10f15d550cf3f5675a21220838cb4c684 [formerly 11a3ae5054
]]
Former-commit-id: f5b7bcc5cc48a601ee19bd22cfeff91d7968b363 [formerly 195db736e8
]
Former-commit-id: d2bfcfa53b
2014-04-25 15:05:07 -05:00
Nate Jensen
c720e2aae7
Issue #2972 fix thin client startup
...
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: f007819a3b
[formerly 7811040f3e
] [formerly d47a09530a
] [formerly f007819a3b
[formerly 7811040f3e
] [formerly d47a09530a
] [formerly 86e9502341
[formerly d47a09530a
[formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]]
Former-commit-id: 86e9502341
Former-commit-id: c7a6389dc5
[formerly c802e6a05c
] [formerly e06610b8bc72529769fa8960a6b7198bd30c2095 [formerly 27ed7e5dab
]]
Former-commit-id: 8c93b8803ebf8badcca85d808ea826377574c911 [formerly ce3c2c1341
]
Former-commit-id: 4b6db92b9f
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
d6eadfc34c
Issue #2874 Allow RTOFS nowcast to be identified by process type.
...
Former-commit-id: 214311cc6e
[formerly 9478f8adc9
] [formerly 2d96d9d2df
] [formerly 214311cc6e
[formerly 9478f8adc9
] [formerly 2d96d9d2df
] [formerly fa3d4bb618
[formerly 2d96d9d2df
[formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5b61473bd6
[formerly 080c2a48f3
] [formerly 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52
]]
Former-commit-id: 57669c24cddfb753d969f18626729fa9ecf6418f [formerly 86174019b5
]
Former-commit-id: 1bb8ce2cbe
2014-04-25 14:38:36 -05:00
Brian Clements
52e575f833
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 1dc13cc151
[formerly 5f746c9c56
] [formerly 17ab4f6184
] [formerly 1dc13cc151
[formerly 5f746c9c56
] [formerly 17ab4f6184
] [formerly f1213c1bda
[formerly 17ab4f6184
[formerly 57120491452b36bf15227bd4b6d0236221c71124]]]]
Former-commit-id: f1213c1bda
Former-commit-id: 922d56617f
[formerly ed2d66a6fa
] [formerly d5d66283e23493ee2ad0d94aaa29c13df24989de [formerly fe6af8c315
]]
Former-commit-id: d581af1f7d2638e596a708f8133e8ab2cb129ea5 [formerly edaaa9a426
]
Former-commit-id: eb318a9a0d
2014-04-25 13:41:17 -05:00
David Gillingham
b68680eb65
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 777456404b
[formerly c14497b1b7
] [formerly 2426e463f7
] [formerly 6ca193b8e9
[formerly 2426e463f7
[formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 8db5524b3f
[formerly 48bc49fd4b
] [formerly cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86
]]
Former-commit-id: c46af48dc3a4136893d9194d27b43b98838b448d [formerly c0fd32360d
]
Former-commit-id: 83674f8444
2014-04-25 10:56:43 -05:00
Brian.Dyke
19b4bb7dcc
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 362d882b40
[formerly f0b8ea5822
] [formerly fb1f5aa593
] [formerly 3524838f9f
[formerly fb1f5aa593
[formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1
[formerly bf3758efa3
] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad
]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952
]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Richard Peter
a32345d1cb
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb
[formerly 5b14b22ee1
] [formerly 37342cba87
] [formerly ee59a298eb
[formerly 5b14b22ee1
] [formerly 37342cba87
] [formerly 9a7e1aa9b0
[formerly 37342cba87
[formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: d8950196fa
[formerly 2d1262e41f
] [formerly 0442d2b0ea886a8fa3e51c518e72f6a8bad19366 [formerly caccf6ca52
]]
Former-commit-id: 4bd4b3b5852acfa88c28932b1c603be585f53bb9 [formerly b234142252
]
Former-commit-id: dcd2468bee
2014-04-24 19:11:50 -05:00
Lee Venable
25612cea42
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 4583301be4
[formerly 15c9311c97
] [formerly a511f8d4e7
] [formerly e7acb04432
[formerly a511f8d4e7
[formerly 9762326cea40526042cd7f371d864a96abd63842]]]]
Former-commit-id: e7acb04432
Former-commit-id: ae2a0c44df
[formerly ae333a34dc
] [formerly 354ff82939ff9af3bda0b0549c79621918a220c7 [formerly 20d563cd15
]]
Former-commit-id: b87ed90d9dad9a8dfa6ac58452d6f27ef01b616e [formerly 40e1bbc5f1
]
Former-commit-id: 9bbc3844f9
2014-04-24 17:53:05 -05:00
Lee Venable
022d1ff834
Merge "Issue #3045 Change column label to "Data Set"." into development
...
Former-commit-id: e35e76282f
[formerly fd7a86e187
] [formerly e45c999d47
] [formerly e35e76282f
[formerly fd7a86e187
] [formerly e45c999d47
] [formerly 9642dac1f1
[formerly e45c999d47
[formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]]
Former-commit-id: 9642dac1f1
Former-commit-id: cd5d582898
[formerly 059a2f59b5
] [formerly 4d167b8c2ca353a3b73426a8094c1a1a3ce6b803 [formerly e776e8c3d0
]]
Former-commit-id: 78c5416a7d70a9ecc41cd9e73d3b25e14e8552d2 [formerly 890891c1b5
]
Former-commit-id: 70465fb1bd
2014-04-24 17:42:12 -05:00
Roger Ferrel
541ee5a81d
Issue #3045 Change column label to "Data Set".
...
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c7978
[formerly 8eb4c91ab3
] [formerly 3a2a6afaf1
] [formerly dd679c7978
[formerly 8eb4c91ab3
] [formerly 3a2a6afaf1
] [formerly cf6d1c8ca1
[formerly 3a2a6afaf1
[formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: f88302b94d
[formerly 555c8cf617
] [formerly 675b98f9712eaa32b9b8d18b880b9cabd81a288f [formerly 0490023b2c
]]
Former-commit-id: e456e77496a0301296471813c64c0022c292f98e [formerly 3d744452af
]
Former-commit-id: 0ece281810
2014-04-24 16:25:01 -05:00
Brian Clements
d3813b0f96
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 345fe6f866
[formerly 334ad3ca81
] [formerly 02f08d75c6
] [formerly 94aa761e19
[formerly 02f08d75c6
[formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]]
Former-commit-id: 94aa761e19
Former-commit-id: 32b8ddd64c
[formerly 84f75ca30a
] [formerly 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8
]]
Former-commit-id: 7d1e4b70e650e3930f0ba2b7d95a341ff827b93d [formerly c27f2d9e53
]
Former-commit-id: 670c4e1611
2014-04-24 16:10:27 -05:00
Roger Ferrel
457ae58495
Issue #3045 - Change to prevent race conditions while getting table labels.
...
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686
[formerly e2b03eb190
] [formerly 9dad4c959b
] [formerly dd86b04686
[formerly e2b03eb190
] [formerly 9dad4c959b
] [formerly 2a0a9b5334
[formerly 9dad4c959b
[formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: b511341dc4
[formerly ef81949dd1
] [formerly 54b732727c2263f33c97df4d4d5ff55d84b6f396 [formerly d73f61c7e7
]]
Former-commit-id: 61c965fb5391ac0a0e33f1f1fed5bd390ebde6eb [formerly ca30aa6b8a
]
Former-commit-id: 5fda70501e
2014-04-24 14:48:15 -05:00
Slav Korolev
d5438ccac5
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
...
Former-commit-id: f39c9c151d
[formerly 150a132320
] [formerly 689930c484
] [formerly f39c9c151d
[formerly 150a132320
] [formerly 689930c484
] [formerly f458f75ecf
[formerly 689930c484
[formerly 879a50a60209abf95752c178a0266cdd42bde012]]]]
Former-commit-id: f458f75ecf
Former-commit-id: 4dca796283
[formerly 27095ecca8
] [formerly 72ea0b9194f024a8e7ff25eef75d71cd7b0f041d [formerly e78c6edb8c
]]
Former-commit-id: 8dff33928d12bb7f6066533d4e9a0cc09195cf1f [formerly 1bf6d72572
]
Former-commit-id: cd38f3636d
2014-04-24 15:40:52 -04:00
Brian Clements
88c8e3be8e
Issue #2955 ignore duplicate session invites
...
Former-commit-id: 9f18c5d54c
[formerly e81ee94171
] [formerly f888819646
] [formerly 9f18c5d54c
[formerly e81ee94171
] [formerly f888819646
] [formerly 4fa9afc9ae
[formerly f888819646
[formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 363632479a
[formerly 39c2a1ac37
] [formerly 8ac39537a1c44d7ebe4df3667107708e5209338d [formerly 75465b69ed
]]
Former-commit-id: 729b6df5f19a32c2faab5eaeae7c9625470cf031 [formerly 3b96c4c628
]
Former-commit-id: 9e2497714b
2014-04-24 09:25:54 -05:00
Lee Venable
cb2d378302
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: e17fa9f609
[formerly eed8c6cbba
] [formerly df05a79d63
] [formerly e17fa9f609
[formerly eed8c6cbba
] [formerly df05a79d63
] [formerly f13ac7e1b9
[formerly df05a79d63
[formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 0c67eecb00
[formerly 421a4e4677
] [formerly 0c6b693c6efe16d8a10f2143e1a25863ed0ea9e1 [formerly 222154d094
]]
Former-commit-id: d5533a155ad3c0d43ac03773bee2a4a39ca0e4aa [formerly e81836e371
]
Former-commit-id: 6c54817117
2014-04-23 18:24:25 -05:00
Nate Jensen
c0af16b39a
Issue #2623 remove ecf plugins from being included in cave
...
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18
Former-commit-id: 692e3de7d0
[formerly baa6714566
] [formerly 07fec6a69c
] [formerly 692e3de7d0
[formerly baa6714566
] [formerly 07fec6a69c
] [formerly ecb6b4d0ce
[formerly 07fec6a69c
[formerly 98e3e2137ecb9ce14f8dfd295791a79a897867a2]]]]
Former-commit-id: ecb6b4d0ce
Former-commit-id: 168283b32c
[formerly 9bac89c776
] [formerly 0d4ccc0072c9a7dbe0c56ac010a6d2d20050a50d [formerly 3671e18036
]]
Former-commit-id: ad0588b7fad41d0c35f73662444482b80a2de6a6 [formerly 91b8d9b72b
]
Former-commit-id: e0b54d7b7a
2014-04-23 17:29:00 -05:00
Richard Peter
6555ec63cd
Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
...
Former-commit-id: 14cbe67add
[formerly 99036341f3
] [formerly 026575b202
] [formerly 14cbe67add
[formerly 99036341f3
] [formerly 026575b202
] [formerly e10434a727
[formerly 026575b202
[formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]]
Former-commit-id: e10434a727
Former-commit-id: d4c155e693
[formerly 4d2ee42fc9
] [formerly 7e8673ea1eef68b1c7e1e7f7774589fb2de1b258 [formerly b4226666be
]]
Former-commit-id: 888e1b1ab9db25a1f677abd37ac596e26b26a5a9 [formerly bf8b504942
]
Former-commit-id: 4a7642c44e
2014-04-23 17:25:25 -05:00
Ben Steffensmeier
12f86412e1
Issue #2947 Fixes for derived products with multiple records per frame.
...
Former-commit-id: 313cb63228
[formerly c6fc0fd4b1
] [formerly c19d52db72
] [formerly 313cb63228
[formerly c6fc0fd4b1
] [formerly c19d52db72
] [formerly 01fc21b6f2
[formerly c19d52db72
[formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: 7fc6f021f7
[formerly e3e78283dd
] [formerly 5e26c3c2b09cdc4a748a79253c16203bcde2b78f [formerly 0cde4689fa
]]
Former-commit-id: 943040a6f1a35a0eeddc743c38ab5aa32c4c8770 [formerly bae8296507
]
Former-commit-id: fbb4703fe3
2014-04-23 17:14:02 -05:00
Ron Anderson
997390456d
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 bf6d35aa0f
[formerly 2f68fb8f2c
] [formerly 221a06e467
] [formerly f3185dd206
[formerly 221a06e467
[formerly e636563052042d2dbfab6a4e476b71004b28c165]]]]
Former-commit-id: f3185dd206
Former-commit-id: 569608769f
[formerly 00f2f374cd
] [formerly 373f6b66bdafbfe9284322be7df3257cc614b264 [formerly 3e37419dc6
]]
Former-commit-id: 8be9012562513da025e5171ffb93c9c520d7ee60 [formerly 78ef1d5c4c
]
Former-commit-id: dd5c3bf2fd
2014-04-23 17:04:16 -05:00
Nate Jensen
bfc78fc68f
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 68e3650305
[formerly 827112349a
] [formerly ad6e4712d6
] [formerly 68e3650305
[formerly 827112349a
] [formerly ad6e4712d6
] [formerly 2b20cf5440
[formerly ad6e4712d6
[formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 73a3cde77b
[formerly 418741ce55
] [formerly 56369e0fe9e69598af2bbd95632d4f6ff4857957 [formerly a0423843b3
]]
Former-commit-id: 92e3587e5640d2a1f27ca32c1843be9b9df2ba4a [formerly 1abd65120e
]
Former-commit-id: 61eca0980f
2014-04-23 15:30:44 -05:00
Nate Jensen
e61fea7af1
Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
...
Former-commit-id: 4232c6b1b2
[formerly 547bcafdb6
] [formerly c193eac6e8
] [formerly 4232c6b1b2
[formerly 547bcafdb6
] [formerly c193eac6e8
] [formerly 1067e4b09c
[formerly c193eac6e8
[formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]]
Former-commit-id: 1067e4b09c
Former-commit-id: e44fd81dba
[formerly a2df4a7ec5
] [formerly 5874c8cb5482f0b1e18efc0d04e83673cd092509 [formerly d1c581aed6
]]
Former-commit-id: e7e816da3dfd0f10c401f377083dfc1b7e228c72 [formerly c1aa647d6d
]
Former-commit-id: ba32067353
2014-04-23 14:24:33 -05:00
Brian Clements
9c6a004507
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 148d158380
[formerly 117eeca83a
] [formerly f3ee7b453a
] [formerly 6969321db0
[formerly f3ee7b453a
[formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]]
Former-commit-id: 6969321db0
Former-commit-id: 00ebd60fad
[formerly 50acaac149
] [formerly a24c2596dc9f506edbc4e849e78e744becb558ec [formerly 5d2ec9b909
]]
Former-commit-id: fbd7e100e18e887890a44088729e97f34fef0552 [formerly d9a1bba4c8
]
Former-commit-id: 8cdeb571f3
2014-04-23 14:16:42 -05:00
Lee Venable
7f99fecc75
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 456ef5b18a
[formerly 41cd3242f5
] [formerly 331dc3397f
] [formerly 765d2e80bc
[formerly 331dc3397f
[formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]]]]
Former-commit-id: 765d2e80bc
Former-commit-id: e7b038f996
[formerly 029de4a1b1
] [formerly 6462dc7ff313f4567226222bb4da5eb4d49eff71 [formerly 26e8c1ecf6
]]
Former-commit-id: faa268db84c3fb4d257f996a958b117beabf6887 [formerly 906340fb07
]
Former-commit-id: 711d471f3e
2014-04-23 14:07:29 -05:00
Brian.Dyke
83dce492e5
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 4938304674
[formerly 88d44a3129
] [formerly 2a4fe3dbae
] [formerly 4938304674
[formerly 88d44a3129
] [formerly 2a4fe3dbae
] [formerly a7c9ddc05e
[formerly 2a4fe3dbae
[formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 05c0e1ad1c
[formerly 953236aad8
] [formerly cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17
]]
Former-commit-id: 76c73f256e229c073a4ca79c01bc6c9e1abe965a [formerly 26cb172a04
]
Former-commit-id: 2161c569ea
2014-04-23 14:05:50 -04:00
Nate Jensen
52cf9e0b37
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: 37371486ba
[formerly fbecf66f79
] [formerly 426f103e7b
] [formerly 37371486ba
[formerly fbecf66f79
] [formerly 426f103e7b
] [formerly 38d493ff1b
[formerly 426f103e7b
[formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 342c851b04
[formerly 2b68a49a43
] [formerly f2ca8041ae7698bcc9759ba71d21e9d90aae5740 [formerly 20f3f8ffa2
]]
Former-commit-id: 455ce998f25ebf8f278cbe9b316a5e569c7eb06a [formerly ff9101c057
]
Former-commit-id: 7c349e268e
2014-04-23 12:26:27 -05:00
Nate Jensen
96a50b7460
Merge "Issue #2903 added connection tests to session close methods" into development
...
Former-commit-id: a24262b3a9
[formerly c88597b6c2
] [formerly 9ec6169646
] [formerly a24262b3a9
[formerly c88597b6c2
] [formerly 9ec6169646
] [formerly 4a04662972
[formerly 9ec6169646
[formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]]
Former-commit-id: 4a04662972
Former-commit-id: 439e345f98
[formerly d60701a264
] [formerly efae253c5ad86a47ac5d792c2c5124876253603d [formerly e9456b4ab7
]]
Former-commit-id: e57876d32e52b9a0f6aaf566c21bbf1ec20b15c6 [formerly 455f4385aa
]
Former-commit-id: f4cefbc459
2014-04-22 12:53:08 -05:00
Nate Jensen
c93aa94cde
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: bf06389b9e
[formerly cc1da5fb88
] [formerly fe3ff669a7
] [formerly bf06389b9e
[formerly cc1da5fb88
] [formerly fe3ff669a7
] [formerly 8df505325c
[formerly fe3ff669a7
[formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]]
Former-commit-id: 8df505325c
Former-commit-id: 9ca82ebdd7
[formerly 484b197a56
] [formerly 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10 [formerly be6818e96b
]]
Former-commit-id: 5eea4c11b89c95940f50903c81294fd99a1657b7 [formerly ad96f9d128
]
Former-commit-id: 2b71b60b2e
2014-04-22 12:50:27 -05:00
Nate Jensen
3f35f90072
Merge "Issue #3038 added initialized flag to session feed view" into development
...
Former-commit-id: a9f0d3f6ee
[formerly 963a848f90
] [formerly 42d0d7681d
] [formerly a9f0d3f6ee
[formerly 963a848f90
] [formerly 42d0d7681d
] [formerly fc2be9521a
[formerly 42d0d7681d
[formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]]
Former-commit-id: fc2be9521a
Former-commit-id: 7434d299fa
[formerly 7f777e6fb9
] [formerly 4cf54574a3262851c041d42381722c70bb079ea0 [formerly ca8eab399f
]]
Former-commit-id: 0f8a1a8db148068df138f332d41e084cfb501fd9 [formerly 5f35eedfb1
]
Former-commit-id: a3036cee45
2014-04-22 12:49:02 -05:00
Brian Clements
797a972930
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 053136ccbb
[formerly f9ab4f9cfe
] [formerly 50f3f420eb
] [formerly 49f86e4153
[formerly 50f3f420eb
[formerly d570c81caed35576e867df15c2a8d900135fef5f]]]]
Former-commit-id: 49f86e4153
Former-commit-id: 15279b35c9
[formerly 9ef018dbe8
] [formerly 6540ea31c93aa2adc8f9e805932f31f84eb11dec [formerly c9453a2440
]]
Former-commit-id: ed03eb93f51618d2292a99e0f95dfd295b769184 [formerly 9ea5430774
]
Former-commit-id: d2b2106f4c
2014-04-22 12:36:40 -05:00
Nate Jensen
7dd0078ead
Issue #2984 remove unnecessary dependencies
...
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877
Former-commit-id: 3e583eaa7a
[formerly 48d4759371
] [formerly d03afcdcba
] [formerly 3e583eaa7a
[formerly 48d4759371
] [formerly d03afcdcba
] [formerly be21c41512
[formerly d03afcdcba
[formerly 290ec544e38e71332be2072435aff3b933c649ab]]]]
Former-commit-id: be21c41512
Former-commit-id: 6f504176ea
[formerly 8eb74232df
] [formerly d216f1bdf02ec5de7389774511663158b90f5596 [formerly 8f893545f1
]]
Former-commit-id: 1dbd3633b825494ce55c96762634c824acff5866 [formerly 57e5bbfe84
]
Former-commit-id: 75cc9ecbfc
2014-04-22 12:03:44 -05:00
Brian Clements
e750a1e5a5
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 a5730ca7bd
[formerly bfd88f3e14
] [formerly 1adbf6253a
] [formerly 2a9d341910
[formerly 1adbf6253a
[formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]]
Former-commit-id: 2a9d341910
Former-commit-id: 38fbf8048e
[formerly 19c2695dca
] [formerly a85a4bc02f2dd752ca54943517184b9bdbf83b43 [formerly 8677a9f359
]]
Former-commit-id: f678746e9629ae3e37e221f399d19883fbdc4848 [formerly 97c5fe6d4a
]
Former-commit-id: d74f192819
2014-04-22 11:55:36 -05:00
Nate Jensen
5e88e2e8bf
Merge "Issue #2060 dropping grid dataURI column" into development
...
Former-commit-id: 17945fcbef
[formerly 96268f1d35
] [formerly c161a2ba50
] [formerly 17945fcbef
[formerly 96268f1d35
] [formerly c161a2ba50
] [formerly ffaa7d8f58
[formerly c161a2ba50
[formerly d9876133fcb3975c8c7e58ff2ee75ca90dc8a0dd]]]]
Former-commit-id: ffaa7d8f58
Former-commit-id: a0095992e1
[formerly c65e827d4e
] [formerly 19c714125fe5658e7f57714616e9191ebd8cfaa0 [formerly 0b25aebbb1
]]
Former-commit-id: f79a4e9f19839ad7d8324397c8db1297a5552799 [formerly 8a7e16be50
]
Former-commit-id: f93a81d2f6
2014-04-22 10:42:11 -05:00
Brian Clements
95e4effdc3
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 1665175d35
[formerly cdf3aa90e9
] [formerly 717cdf4280
] [formerly ef61a7c281
[formerly 717cdf4280
[formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]]
Former-commit-id: ef61a7c281
Former-commit-id: 001e0b030b
[formerly e7005953eb
] [formerly 80e474ab1d11f23309bd83f864334950b90dc4ac [formerly 295ff106b6
]]
Former-commit-id: 2047ae5bb2050dbdf619f1a51871a47a0ff3718e [formerly fb24e315bf
]
Former-commit-id: fb74637aa8
2014-04-22 10:01:27 -05:00
Ron Anderson
260706f1cc
Merge "Issue #2998 Fix regression made in earlier check in." into development
...
Former-commit-id: b9f41e3108
[formerly 447ff809a3
] [formerly 8026973c95
] [formerly b9f41e3108
[formerly 447ff809a3
] [formerly 8026973c95
] [formerly a6b5997663
[formerly 8026973c95
[formerly 2a78a1d70ab05322a8a69f96865cb3eba0fa6397]]]]
Former-commit-id: a6b5997663
Former-commit-id: 2afa2d0cda
[formerly b389398c95
] [formerly 406a14e47fd69c8d2b25bdc3aab2841b0b42ace9 [formerly 5f8ac71e11
]]
Former-commit-id: b87085fbb9f53a32bb6e8fedbe6a3f5febe509d8 [formerly 04e617706c
]
Former-commit-id: abfc0c3ba3
2014-04-21 17:55:22 -05:00
Nate Jensen
43bb667c30
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 03451ab6b2
[formerly 263611f905
] [formerly a37a2afe18
] [formerly 03451ab6b2
[formerly 263611f905
] [formerly a37a2afe18
] [formerly 5dfb652775
[formerly a37a2afe18
[formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]]
Former-commit-id: 5dfb652775
Former-commit-id: c4819a4e95
[formerly 3eddbf452d
] [formerly 6295d04b083ae6cd109f1c2f595fb1922420e2a1 [formerly cdb932cc4d
]]
Former-commit-id: c56097498f5f6539bb58e0c60cabc43139bd2578 [formerly 9ef0154104
]
Former-commit-id: 403f4c3195
2014-04-21 17:34:39 -05:00
Ron Anderson
db4b6b617d
Issue #2998 Fix regression made in earlier check in.
...
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71
Former-commit-id: 5570193f21
[formerly 2a819003c5
] [formerly ed99abbb9d
] [formerly 5570193f21
[formerly 2a819003c5
] [formerly ed99abbb9d
] [formerly 04467d51dd
[formerly ed99abbb9d
[formerly 8c48d369b3b6af0222b541ccfa9230495d4cb0f9]]]]
Former-commit-id: 04467d51dd
Former-commit-id: b1b0dcf75f
[formerly 243c929fc1
] [formerly f335a0dab919cc88d957bc2df62452c5a76437b7 [formerly 04a7c2d8cd
]]
Former-commit-id: be57c5312eedc7a4f6cc05fa42e91b7ae1557417 [formerly d6990dd0b8
]
Former-commit-id: 62056f6eff
2014-04-21 17:26:29 -05:00
Nate Jensen
db8d725d94
Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
...
Former-commit-id: f0cdb9e8ad
[formerly 1651a79187
] [formerly 1a617796cb
] [formerly f0cdb9e8ad
[formerly 1651a79187
] [formerly 1a617796cb
] [formerly ec82e51d28
[formerly 1a617796cb
[formerly 1fde0217948dad64221d0348f9e45a8e1430cdd7]]]]
Former-commit-id: ec82e51d28
Former-commit-id: 9c7e88211f
[formerly efc5dba997
] [formerly 31f7dac3240712ec81e5f3265ec55796ae1240a7 [formerly 0d7ae042d5
]]
Former-commit-id: 760d2635f49f93fd0789ed0173bf4a285deaa866 [formerly 2cf79494bc
]
Former-commit-id: 0972f4e3f1
2014-04-21 17:08:17 -05:00
Nate Jensen
a444f97aa8
Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
...
Former-commit-id: 7530137f38
[formerly 535a5f836d
] [formerly e401fca661
] [formerly 7530137f38
[formerly 535a5f836d
] [formerly e401fca661
] [formerly cb7d485004
[formerly e401fca661
[formerly 74946a00033737aae24aabbfc333d661598cd6f2]]]]
Former-commit-id: cb7d485004
Former-commit-id: 9e6ca096e7
[formerly f75fc8da0c
] [formerly 1f516d923aaa0e50bc15f2399e7e29a856f577ad [formerly 87457f26fc
]]
Former-commit-id: 853ff7a10f00c036adc59be94d00d1aa55d96597 [formerly 252fb2a3a7
]
Former-commit-id: f685ade735
2014-04-21 15:13:53 -05:00