Commit graph

3088 commits

Author SHA1 Message Date
steve.naples
b94f554731 ASM #120
Change-Id: I657d872f612475ccf21cdd3c08f8075180ec192a

Former-commit-id: f850a0f028 [formerly 56deadaa00] [formerly 709dc589ce] [formerly b303d1ecbb [formerly 709dc589ce [formerly 656f31b7df8a805e7f38a02c29bce05a1bcff639]]]
Former-commit-id: b303d1ecbb
Former-commit-id: 5b75568ed0d2838de52b4dfef9a67b303ce27104 [formerly 38500e5d21]
Former-commit-id: fa35b8598b
2014-01-30 20:59:39 +00:00
Juliya Dynina
4ccbc43efa Merge "ASM #110" into asm_14.2.2
Former-commit-id: 36a899475b [formerly 33f10e0975] [formerly a28662b25d] [formerly c26a2d5cab [formerly a28662b25d [formerly aa8647f0479204a43bf50fc498a26768a2feb989]]]
Former-commit-id: c26a2d5cab
Former-commit-id: d64fc1912fd6093bb9c031d0dd3604694a60baa3 [formerly 5afea503a8]
Former-commit-id: a61405dda3
2014-01-30 15:34:16 -05:00
Bryan Kowal
116f872261 Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
Former-commit-id: 54d0d4fd55 [formerly 635548dae3] [formerly d88019d902] [formerly ee95e4de7e [formerly d88019d902 [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]]
Former-commit-id: ee95e4de7e
Former-commit-id: 1e726cd962bdd3d3452656fcf23cec9c7816c5da [formerly bd88b563fe]
Former-commit-id: 89e0e847c9
2014-01-29 14:25:38 -06:00
Ron Anderson
da9d8b55d6 Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development
Former-commit-id: a0e9e35891 [formerly d0e821e5d1] [formerly 61f35e86ec] [formerly f4f89c79a2 [formerly 61f35e86ec [formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]]
Former-commit-id: f4f89c79a2
Former-commit-id: c22c542a86577176c89c23cb7f84b62f159a84e7 [formerly 2e9389293a]
Former-commit-id: ff65b54555
2014-01-29 14:24:26 -06:00
David Friedman
b5ae8c70c9 ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

Former-commit-id: 0372fdd6cc [formerly d36cbb2ca9] [formerly 769086c0b7] [formerly e18c49ea72 [formerly 769086c0b7 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]]
Former-commit-id: e18c49ea72
Former-commit-id: e28494606e9e07a3b76cb461cbaa151022eaec7a [formerly 052e12b777]
Former-commit-id: 0ce67592ac
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
af698fa0f4 ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b

Former-commit-id: 94cd48fa70 [formerly 2c2b629206] [formerly 91c3468462] [formerly edbadf059e [formerly 91c3468462 [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]]
Former-commit-id: edbadf059e
Former-commit-id: ecf011705fb1cc4ffbdc9997beea53ea907403ab [formerly e3cb50bdbe]
Former-commit-id: ad27feeedc
2014-01-29 14:19:52 -05:00
Nate Jensen
075b8776da Merge "Issue #2698 made sessions private and invite only" into development
Former-commit-id: ab82a7fdb2 [formerly 1977b026ee] [formerly 52c3b71049] [formerly 004999bbec [formerly 52c3b71049 [formerly db4447bf109981ded541bff929687040cc28953a]]]
Former-commit-id: 004999bbec
Former-commit-id: bdc44ee479d463d8e50545c6697f7891ded78ee9 [formerly 0a7961457e]
Former-commit-id: bcf82eb692
2014-01-29 11:01:45 -06:00
Brian Clements
a225d12692 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: ceb8a89c7f4c8cc41774e50c75969cbdacc6d919 [formerly 4a0682a9e8]
Former-commit-id: 07452b7778
2014-01-29 10:16:15 -06:00
Max Schenkelberg
b495451e3f Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]])

Former-commit-id: b63edcc8a7 [formerly 122c3442f8] [formerly 0c840cf724] [formerly d566ed9927 [formerly 0c840cf724 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]
Former-commit-id: d566ed9927
Former-commit-id: 5c9afda4f5c9656fe346333485798a21a785033b [formerly f5ff746126]
Former-commit-id: e1717b2729
2014-01-29 10:15:38 -06:00
Michael Gamazaychikov
b117e710a8 ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02

Former-commit-id: 73deca037f [formerly 297d1cffc6] [formerly 97f9c2ea92] [formerly 8f90c0dee2 [formerly 97f9c2ea92 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]]
Former-commit-id: 8f90c0dee2
Former-commit-id: 8ea9bd6aedb12599a646b4ebb3e81c3350dde192 [formerly 7d7cf7cfab]
Former-commit-id: 0198607fe0
2014-01-29 10:58:18 -05:00
Steve Harris
cdb99cc3e0 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly 1aea63a1f6 [formerly 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f]
Former-commit-id: d9cd003a5a
2014-01-29 09:41:57 -06:00
Greg Armendariz
fc4ce60ce6 Issue #2754 - Remove extra character
Former-commit-id: ddf3e9785f [formerly 6ff868a167] [formerly 9cc089b369] [formerly 1017abdc78 [formerly 9cc089b369 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]]
Former-commit-id: 1017abdc78
Former-commit-id: 36e64f6fb42a953ef4b064e4d83069bf3fb501c5 [formerly a8c75ce81e]
Former-commit-id: 4e092b5810
2014-01-29 08:43:09 -06:00
Brian Clements
a2cc9001ae Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: aa642d5577 [formerly b4d930bcb9] [formerly 6b1843f19a] [formerly bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]
Former-commit-id: bd19366ada
Former-commit-id: aa6da3ca1e9307689f8365bc7178e584cb7032e6 [formerly f22052321b]
Former-commit-id: bffa4d84fe
2014-01-28 10:07:11 -06:00
brian.dyke
ac37e2ea2e merge 14.2.1-3 into asm-14.2.2
Former-commit-id: becf6322c6 [formerly 4a62e83835] [formerly 2294c81a57] [formerly f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0]
Former-commit-id: 621464ac0d
2014-01-27 15:27:49 -05:00
Richard Peter
6f92dc558e Merge "Issue #2711 Get All levels from the database for derived parameters." into development
Former-commit-id: ec60bff55c [formerly 766af8b281] [formerly 90dd7474b3] [formerly 5c1de78c24 [formerly 90dd7474b3 [formerly b238a853283cc1b71ce290b233db5f174e486c9f]]]
Former-commit-id: 5c1de78c24
Former-commit-id: 7f369638f9405f8d6174043e99a8d04a40fd4196 [formerly e9bc96c37e]
Former-commit-id: 953925d24b
2014-01-27 11:36:55 -06:00
Ben Steffensmeier
cdcd7dbe93 Issue #2711 Get All levels from the database for derived parameters.
Former-commit-id: bd5bb4eca1 [formerly fdb67f9979] [formerly 08d277fe62] [formerly 3ca92176ac [formerly 08d277fe62 [formerly 0b36f91188c458532eb26d8b4a01e7f8954eba5a]]]
Former-commit-id: 3ca92176ac
Former-commit-id: 0fdc05342c87ce2c1bf8e4756cf8cd0f8acd2da5 [formerly bedec49852]
Former-commit-id: c42af67f51
2014-01-27 11:12:08 -06:00
Brian Clements
e2ca671173 Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: fffb6aaf9a [formerly b86ad8ca6f] [formerly f615f2226f] [formerly 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: beabd84fb816fcf8a5201927f1389915efb941f7 [formerly 8944860cbb]
Former-commit-id: cfe945d76b
2014-01-27 10:14:10 -06:00
Mike Duff
07fb9b74d5 Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 9a0665ccc8 [formerly 3766f6a0f4] [formerly e46c226489] [formerly 81aa9ce0cb [formerly e46c226489 [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: 36d2c58bed76ee7aef5431b41fe9592aebf50dc7 [formerly 5fc96739b9]
Former-commit-id: ef5d3f370c
2014-01-26 18:57:26 -06:00
Mike Duff
3e4b74c79d Issue #2452 - Changed label based on feedback.
Former-commit-id: bb8b6eea5f [formerly fb6194c464] [formerly 1da1285311] [formerly 6dcd1a7969 [formerly 1da1285311 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: 28722ea6fd1407967384474a85ef503f13c4099c [formerly be59be53d4]
Former-commit-id: eaaab3b082
2014-01-25 14:41:20 -06:00
Nate Jensen
a773aec724 Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e

Former-commit-id: 567a18dab4 [formerly f5ce7b485d] [formerly 47d6e5b54f] [formerly cdbd05b293 [formerly 47d6e5b54f [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]]]
Former-commit-id: cdbd05b293
Former-commit-id: 53e2e8b666941bdcfe30a8f595600e7f0cdd6072 [formerly 7dd0b1c978]
Former-commit-id: e6e9cab9f9
2014-01-23 19:02:37 -06:00
Ben Steffensmeier
467cd5a9f2 Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963

Former-commit-id: 39fae5c109 [formerly 48bb8a59a1] [formerly 1897336455] [formerly 7b1245b0cf [formerly 1897336455 [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]]]
Former-commit-id: 7b1245b0cf
Former-commit-id: a5d0c33c597d28090b6fd7ad4486e862006ffc35 [formerly 76e76198d6]
Former-commit-id: c9a89659c3
2014-01-23 18:43:14 -06:00
Kiran Shrestha
2a3a010041 Issue #96
Change-Id: I9ad090ae29aa3f6bd32e448b94c3053f9d61429e

Former-commit-id: 7f90e774fa [formerly ef6c154f28] [formerly 60e090a963] [formerly 9411bbbac5 [formerly 60e090a963 [formerly 17a188a3440214cbfd913e854a093ceba287fff9]]]
Former-commit-id: 9411bbbac5
Former-commit-id: 7b12e33b5c2acf872f50268156e72a2e0a7f5954 [formerly dac48c1da9]
Former-commit-id: 6eab820e1b
2014-01-23 18:49:16 +00:00
Ben Steffensmeier
3f053ee508 Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 33bf8e9c44 [formerly 9c65c5b07b] [formerly 6aa6683258] [formerly a92f6e9bb6 [formerly 6aa6683258 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: beeaf72ec6549c4e1072090e287697ca2d2233bf [formerly b90004e46a]
Former-commit-id: 9b788b49b0
2014-01-23 12:41:16 -06:00
Nate Jensen
de36a7461e Merge "Issue #2667 added bin lightning data access factory" into development
Former-commit-id: 5e51b08ed3 [formerly 922cd8c3a2] [formerly 27b07e27f1] [formerly db10439844 [formerly 27b07e27f1 [formerly beede8dc30f5497c5769f78a46642d31c4b61cb0]]]
Former-commit-id: db10439844
Former-commit-id: 0605b72d3eccc8caa7656d9bed868a3e2fc82a0e [formerly 00bfd9d5bb]
Former-commit-id: 423e8f7fb5
2014-01-23 10:32:17 -06:00
Brian Clements
5bc0ffe4af Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData


Former-commit-id: ff97757a38 [formerly 54516275f1] [formerly 4758c9d3d29a5bd3ccc2e5af4b1bb418e31992c3 [formerly 402bef9c5b]] [formerly bd9fbc5f38 [formerly 402bef9c5b [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]]
Former-commit-id: bd9fbc5f38
Former-commit-id: 72626aac11a4c66833f161115fc8c8d2adc2b74c [formerly 83ed9dc04d]
Former-commit-id: 265137fd91
2014-01-23 09:32:18 -06:00
Ben Steffensmeier
5298304b65 Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74

Former-commit-id: 744d199be6 [formerly 3196471d18] [formerly 81b38e2ddf] [formerly 4f9e60c658 [formerly 81b38e2ddf [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]]]
Former-commit-id: 4f9e60c658
Former-commit-id: 9c47a4b5169c16e1c59ee4226a6eab5b09ec5636 [formerly 85eb694b23]
Former-commit-id: 831d904de2
2014-01-22 16:53:04 -06:00
Ben Steffensmeier
159642b200 Issue #2602 Don't try to load classes from uninstalled bundles.
Former-commit-id: f1de2aaded [formerly c7357863b9] [formerly 0c4fc0dd01] [formerly 3187754736 [formerly 0c4fc0dd01 [formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]]
Former-commit-id: 3187754736
Former-commit-id: 983c7624df570de47db5a313760f0b69fec21954 [formerly d1dbd0c9b6]
Former-commit-id: 32bac228db
2014-01-22 15:46:51 -06:00
Nate Jensen
438afc8ddf Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
Former-commit-id: b8fd9afeca [formerly 1f5a26dc30] [formerly e2f9e86659] [formerly 738c70e8ea [formerly e2f9e86659 [formerly 8c8215778f5e37dfa4ec2df000db90f1193107ac]]]
Former-commit-id: 738c70e8ea
Former-commit-id: f1d07570e73e9dfb9bf87e2e898ca0f0586aadff [formerly 10f9feddba]
Former-commit-id: 96ad72aa9e
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
b7cdcc757c Issue #2312 Add ability to export gif and image export dialog.
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: 7a8c934c5c [formerly b70faf1f7d] [formerly fc1c56f9cb] [formerly 4ad4b4a859 [formerly fc1c56f9cb [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: e898590f6488b3cb1f76a669ff09fbe8f3b22604 [formerly 8b2e5a06bc]
Former-commit-id: cd295e4172
2014-01-21 18:09:13 -06:00
Steve Harris
6cb92b1f57 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
2014-01-21 12:36:54 -06:00
Matthew Howard
2cc56ed217 Merge "Issue #87" into master_14.2.1
Former-commit-id: d29ff38434 [formerly 87c7f9b826] [formerly 58589f9088] [formerly 271f26fcfb [formerly 58589f9088 [formerly 62acdd26ccb37f8037729d676228d416a0e22f1b]]]
Former-commit-id: 271f26fcfb
Former-commit-id: 88e788c06c2fe3cb9f5eba0f87d0aff740ea26ad [formerly aa8ad53c55]
Former-commit-id: 148d82e05f
2014-01-21 12:43:14 -05:00
Gang.Zhang
b08c9673e0 Issue #87
Change-Id: I49c00c29769ef11ee7105b1e61be151ccabf454d

Former-commit-id: 78c6613674 [formerly 899d9fd7bf] [formerly e1584eeb0c] [formerly f78affc6f5 [formerly e1584eeb0c [formerly 1fa6738632faf85e2f540e807e5f4a208e6ffa3c]]]
Former-commit-id: f78affc6f5
Former-commit-id: de02cd117cc77e1273d39a5447d8f5e8bd120d2b [formerly f55aae98c4]
Former-commit-id: 7fb22b5223
2014-01-21 11:50:50 +00:00
Mike Duff
7e3e76e9da Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae]
Former-commit-id: e929abf7d7
2014-01-20 17:44:02 -06:00
Lee Venable
b40ae43582 Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly dd12515ca2 [formerly b3928f4f49 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]
Former-commit-id: dd12515ca2
Former-commit-id: 4206ad0dee836a41182154fcefd07a187f71acab [formerly 4e121d1261]
Former-commit-id: 82eafd385d
2014-01-20 17:32:38 -06:00
Nate Jensen
c2340dfd07 Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 54262ad318 [formerly d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]
Former-commit-id: 54262ad318
Former-commit-id: 3b53bce38675c75e649c3c5c70ab3876d1503296 [formerly f13cb9ae26]
Former-commit-id: 5b84b27087
2014-01-20 17:32:15 -06:00
Lee Venable
9ecbd3bc7a Issue #2291 - Fixed resizing of components.
Former-commit-id: ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 1927ba49ea [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: 3951681cd94fb490f91e2f28a8cc25e01dca0872 [formerly b8520d1e12]
Former-commit-id: dad11aca88
2014-01-20 17:26:28 -06:00
Ron Anderson
9b8c8310ab Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]
Former-commit-id: 66bbc99784
Former-commit-id: c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]
Former-commit-id: 0048ef6a96
2014-01-20 17:22:26 -06:00
Richard Peter
fa5e160245 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]
Former-commit-id: 29ba337367
Former-commit-id: 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]
Former-commit-id: 4796beec29
2014-01-20 17:21:21 -06:00
Max Schenkelberg
33a28153bf Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 7073ea5e90 [formerly 1256748c42] [formerly 68aa666045] [formerly 87a6db7853 [formerly 68aa666045 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 87a6db7853
Former-commit-id: d89b6e6e6de809f0a3a0a97dbbdaa5ada41e70fd [formerly 2574685291]
Former-commit-id: 424f2282f0
2014-01-20 13:54:27 -06:00
Steve Harris
9843517cb3 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]
Former-commit-id: 7ea285c48b
2014-01-20 10:17:44 -06:00
Nate Jensen
34d3fc8290 Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development
Former-commit-id: aff68ba134 [formerly d6862c2b02] [formerly 888d81edf429e0f9db860ba01ea462d2db99dee6 [formerly e2dfdb01b7]] [formerly 0bf6222d1e [formerly e2dfdb01b7 [formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]]
Former-commit-id: 0bf6222d1e
Former-commit-id: e526a8b4b05cbced58e5a091e619c30885fbca42 [formerly 83c27d7025]
Former-commit-id: dcd1906332
2014-01-20 09:23:24 -06:00
Mike Duff
5097ed2ad7 Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]
Former-commit-id: a492ec6a4d
2014-01-17 15:34:48 -06:00
Ben Steffensmeier
18d5f8e758 Issue #2651 Synchronize ResourceList.removeRsc.
Former-commit-id: 63ad599a0e [formerly 15c08d7209] [formerly a580fc74b7] [formerly d8263b358d [formerly a580fc74b7 [formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]]
Former-commit-id: d8263b358d
Former-commit-id: b2ba0007c44eefdeb638bd1e2c75c45504ab281b [formerly 18437701d9]
Former-commit-id: a4ce57502c
2014-01-17 11:58:00 -06:00
Nate Jensen
081ad146af Merge "Issue #2313 Image canvas rendering. Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417" into development
Former-commit-id: a20f8e437d [formerly 1bf74c5919] [formerly a431fa2bd9] [formerly 2d5dede634 [formerly a431fa2bd9 [formerly f343371577210225865239aef14a40b529de86ad]]]
Former-commit-id: 2d5dede634
Former-commit-id: 504cabc0959eb05d51ee736967b2bf5aa9280980 [formerly 1405fb3376]
Former-commit-id: 4aa2dbfbc5
2014-01-17 11:36:30 -06:00
Nate Jensen
2db509e59f Merge "Issue #2646 Fix Drawing layer NPE." into development
Former-commit-id: ab73bcad2d [formerly 211f7a1bf0] [formerly bad984f103] [formerly f85f54d2ae [formerly bad984f103 [formerly c8975c8b00feb8ab5dfa97d8f78bf54ab7290b90]]]
Former-commit-id: f85f54d2ae
Former-commit-id: ca0ca62010ed05466c5c5eefad134115c938c427 [formerly edc2c700c8]
Former-commit-id: e8bfb55387
2014-01-17 10:50:38 -06:00
Ben Steffensmeier
6df6690785 Issue #2646 Fix Drawing layer NPE.
Former-commit-id: 6ed57a4326 [formerly f31f7dc53a] [formerly 068a9c6efb] [formerly 5cbe38aade [formerly 068a9c6efb [formerly 1e5f3e1375ec3d9485863b38e6926e95e7b3921e]]]
Former-commit-id: 5cbe38aade
Former-commit-id: 60e91275a1e27856c383678c6751b198b8bedd38 [formerly e1fe6136ee]
Former-commit-id: d43a97c51e
2014-01-17 10:41:53 -06:00
Ben Steffensmeier
331b49ee85 Issue #2313 Image canvas rendering.
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 7656304906 [formerly 76414243ba] [formerly 625aac3ed3] [formerly 16c350f0c6 [formerly 625aac3ed3 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]
Former-commit-id: 16c350f0c6
Former-commit-id: f4c38ab8bac2347fb297605b675187a44fc3e2c2 [formerly 1973e5e015]
Former-commit-id: 19930b7c8b
2014-01-16 17:05:16 -06:00
gerritcm
c1df3eb55c 14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]
Former-commit-id: b72cd19055
2014-01-16 16:43:05 -05:00
Lee Venable
1f51e0e218 Issue #2691 - Fixed null pointer exception when closing MPE perspective.
Former-commit-id: 7369e58fad [formerly 24a4cafd0c] [formerly 8405e235e6] [formerly b435fd3050 [formerly 8405e235e6 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]
Former-commit-id: b435fd3050
Former-commit-id: 3e9e28a9e6d59237117b55c63bbb1de8dbd573e0 [formerly bc07967e3b]
Former-commit-id: a859b50881
2014-01-16 10:35:12 -06:00
Nate Jensen
d0b3c3bc48 Merge "Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D. Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69" into development
Former-commit-id: 1d1f4175d0 [formerly 65306a503e] [formerly a71ef7b581] [formerly 518a3165e4 [formerly a71ef7b581 [formerly 56fd57c3e00926c95ab05297772161e960586e8f]]]
Former-commit-id: 518a3165e4
Former-commit-id: 8ecb1e7f45b5b32d1ad43a493b683b92b14d074a [formerly 104a0a2de2]
Former-commit-id: d4db973df1
2014-01-16 09:06:10 -06:00