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
Ben Steffensmeier
84b00e0970
Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D.
...
Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69
Former-commit-id: 6c2d88015f
[formerly 8b23f32311
] [formerly ee11e5d13c
] [formerly ac33fb9463
[formerly ee11e5d13c
[formerly a8bcec4a2fa9ddd49dc300ebd63aebfdfb41723e]]]
Former-commit-id: ac33fb9463
Former-commit-id: 991162dcb72a27484a63e9f7e13632171f60ae34 [formerly be163ebf2a
]
Former-commit-id: b2b2136868
2014-01-16 09:03:50 -06:00
Nate Jensen
9f4360fdda
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
...
Former-commit-id: 26ce19331e
[formerly 9028260386
] [formerly ae10129713
] [formerly 9d529b3b21
[formerly ae10129713
[formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6
]
Former-commit-id: 98e1bf9194
2014-01-15 17:36:30 -06:00
Nate Jensen
c1e42e49e9
Merge "Issue #2630 added away timeout for collaboration inactivity" into development
...
Former-commit-id: 181994548e
[formerly 8420f87348
] [formerly 70fbdbfd0bcaaf3ddbadf5bfde88aa15020dae99 [formerly bdb4d8bdeb
]] [formerly eafe61cd37
[formerly bdb4d8bdeb
[formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]
Former-commit-id: eafe61cd37
Former-commit-id: 0bddc08432f572efd0ebc61e9e5e47a4becfcea3 [formerly 46dfbe9334
]
Former-commit-id: 5504ec1efd
2014-01-15 13:48:13 -06:00
Nate Jensen
472cf2905c
Issue #2359 printout connection exceptions to aid in diagnosing
...
connectivity problems
Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c
Former-commit-id: aa0639a878
[formerly ccaa9dbde1
] [formerly fc6b31c1c0
] [formerly 5f39322d59
[formerly fc6b31c1c0
[formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]
Former-commit-id: 5f39322d59
Former-commit-id: 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35
]
Former-commit-id: 4533642f26
2014-01-15 13:39:28 -06:00
Matthew Howard
ea43bb90bf
Merge "Issue #92 " into master_14.2.1
...
Former-commit-id: 8825b9099b
[formerly 8304216bbe
] [formerly 951004e5e5
] [formerly 9fae7f2b8d
[formerly 951004e5e5
[formerly 041e6db2ebf27664ee75f4e2da31e21827721fef]]]
Former-commit-id: 9fae7f2b8d
Former-commit-id: f2867dde119009ee0adc30eb200e5a47053e0373 [formerly d1d9c431d7
]
Former-commit-id: 2722ad654f
2014-01-15 14:24:54 -05:00
Brian Clements
998e8ca8c2
Issue #2630 added away timeout for collaboration inactivity
...
eclipse job in connection subscriber
preferences added to collaboration prefs page
Former-commit-id: b9c1e59353
[formerly 7e952c5ba8
] [formerly 24190efb75
] [formerly 57fb953b8d
[formerly 24190efb75
[formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]
Former-commit-id: 57fb953b8d
Former-commit-id: e2a3bebef2dc240ed45242a0f8d5e55ec133f6ab [formerly 53273c4e5a
]
Former-commit-id: 7410c36783
2014-01-15 13:20:25 -06:00
Rici.Yu
84455e68d3
Issue #92
...
Change-Id: Ib8d12e9be787c9b5b41a776eb22bb4c4a8c2fc7d
Former-commit-id: 18eec46389
[formerly f4fd057900
] [formerly 129bbcee45a16487cdf7680f19a6f9b18a0aaa3b [formerly ac72d56ae0
]] [formerly a36e9b3219
[formerly ac72d56ae0
[formerly c12f51881a565e2ec812e83e79b4bc59fbb5af1e]]]
Former-commit-id: a36e9b3219
Former-commit-id: ebd5aa7742786904da20f105c705310e23b5e040 [formerly 4b1ba5531f
]
Former-commit-id: f9f5091cc1
2014-01-15 11:48:36 -05:00
Matthew Howard
1d10ec5b95
Merge "Issue #112 " into master_14.2.1
...
Former-commit-id: 19ea9a39d8
[formerly bb834fc9bf
] [formerly c1ff14017b
] [formerly 7a36600a04
[formerly c1ff14017b
[formerly 1054241eeb4931982f295bc8a9927ffe1510a24d]]]
Former-commit-id: 7a36600a04
Former-commit-id: d7d6c4d6f032e75cb7666e10bd972888e3ab9a74 [formerly 32d8c53549
]
Former-commit-id: 4c5b7f24ff
2014-01-15 11:45:32 -05:00
Brian Clements
46c751d7da
Issue #2630 fixed status parsing bug
...
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils
Former-commit-id: e3f615b2b7
[formerly 45b5df24d4
] [formerly 79446d983b
] [formerly bf6cf2f2ee
[formerly 79446d983b
[formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: 053ba48475681c6ca6bde16071dbe1d6807e277a [formerly 1219713128
]
Former-commit-id: bfbcbf382a
2014-01-15 10:24:09 -06:00
Zhidong.Hao
f0b4fce274
Issue #112
...
Change-Id: I674975b805661ad191c5b4af3ad7132371e1a479
Former-commit-id: 19ed94a647
[formerly b86b5fc0ee
] [formerly d61fe61466
] [formerly 57e78b6a11
[formerly d61fe61466
[formerly b937a25ac189024718ee7832386d20f79e1d63e0]]]
Former-commit-id: 57e78b6a11
Former-commit-id: bce8ce2fe920c4189ba4e4f20ad73f653d00962b [formerly 54bab6905a
]
Former-commit-id: 4be6cef7c8
2014-01-15 11:16:26 -05:00
Mike Duff
c5f28e0f37
Issue #2459 - Refactor the subscription status
...
Former-commit-id: 43810aa5f5
[formerly d03c012a54
] [formerly f94593867e
] [formerly 245d76358e
[formerly f94593867e
[formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: 245d76358e
Former-commit-id: ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937
]
Former-commit-id: 9a45b95db6
2014-01-15 09:21:30 -06:00
Kevin P. Johnson
cf6c2fd016
Issue #245
...
Change-Id: I7fca90d9f039b46061bb12a28485c92e21c4fd85
Former-commit-id: 12e5cfe85c
[formerly e795890344
] [formerly e10493f734
] [formerly 75dd01d768
[formerly e10493f734
[formerly e776776d797a80b059f00bd78dd0806b7b0f2241]]]
Former-commit-id: 75dd01d768
Former-commit-id: 5d0c9ef45e8cfc0861341c10c214957e1638b320 [formerly d920f4c3c3
]
Former-commit-id: 143b0fd1eb
2014-01-15 14:02:07 +00:00
Brian Clements
d53024b73f
Issue #2594 added low memory warning job
...
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files
Former-commit-id: 8d6a469928
[formerly c63c8e2fc6
] [formerly f9a8b68da5
] [formerly 0076ec9aaf
[formerly f9a8b68da5
[formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: 99fc908864fba07455340f77fae46faf16981fcf [formerly e420ae009d
]
Former-commit-id: 496d15d77f
2014-01-14 17:05:28 -06:00
Matthew Howard
b59abd696e
Merge "Issue #106 " into master_14.2.1
...
Former-commit-id: ba4abc9e09
[formerly a9ac6ef900
] [formerly 5acedd1030
] [formerly 456e07d8da
[formerly 5acedd1030
[formerly 59f69bf99e624723de801fdd6c9e2f490a2106b7]]]
Former-commit-id: 456e07d8da
Former-commit-id: 3d26522de97c6600c123ad0191abe7e1f69184e6 [formerly 92e2f3548d
]
Former-commit-id: 4cdbef3c5e
2014-01-14 13:45:16 -05:00
Zhidong.Hao
d6d8358d62
Issue #106
...
Change-Id: Ib33b9294d4fd50d1cd3a815c841d4744ec4ba691
Former-commit-id: 634d0fd90a
[formerly 95a104be58
] [formerly 04079da5ad
] [formerly f3f378bcdc
[formerly 04079da5ad
[formerly 00e518eafbc5032d4e23128ac0c415d4f9c0ab79]]]
Former-commit-id: f3f378bcdc
Former-commit-id: 7894c2e9211937796415c0d2c4ecc8e7dbf6e563 [formerly ed44b4b896
]
Former-commit-id: 8d42d86883
2014-01-14 12:02:11 -05:00
Steve Naples
20d5c316ec
Issue #237
...
Change-Id: Iab0716c7e09739cbb4a525111eb34ecc0594a388
Former-commit-id: b0ab548349
[formerly f60d81202c
] [formerly c2667bd719
] [formerly 62dfc1f0b2
[formerly c2667bd719
[formerly 3f252c7aa8fc5598f3f74c376c713150793868e5]]]
Former-commit-id: 62dfc1f0b2
Former-commit-id: 4af266f8c1d3a3f722e2b89bab828a72957ab576 [formerly 687511035a
]
Former-commit-id: ee525c5525
2014-01-14 16:38:44 +00:00
Steve Naples
ac201730c8
Issue #125
...
Change-Id: I677be3fa551206e6c8b024a1aef45edb2c4e18ba
Former-commit-id: 5fe256b40d
[formerly aab6c0cc76
] [formerly 1c983d481c
] [formerly 68ff510bc8
[formerly 1c983d481c
[formerly 6ddb1bb4204a1b405976720c9f48fc20ff84e7c4]]]
Former-commit-id: 68ff510bc8
Former-commit-id: ca103f5e3767dd684c5a13158b9bac3a31b6ee30 [formerly 2ca557053c
]
Former-commit-id: f537328a25
2014-01-14 16:30:19 +00:00
Ron Anderson
46735c9afe
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f
[formerly 0bde38cef3
] [formerly ba7a25a88f
] [formerly 62c445d872
[formerly ba7a25a88f
[formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e
]
Former-commit-id: dca7f21f7b
2014-01-13 17:45:20 -06:00
Matthew Howard
086b6f1054
Merge "Issue #100 " into master_14.2.1
...
Former-commit-id: ed6bf0f03d
[formerly 71e136082b
] [formerly 30a0fe634d
] [formerly 8d0bae66e2
[formerly 30a0fe634d
[formerly b377e3267da4cda9367bb0d0b6831c8027579e6a]]]
Former-commit-id: 8d0bae66e2
Former-commit-id: 32d14b725a1eff1bfbee53d4eab5545ee2627529 [formerly 3edc895903
]
Former-commit-id: 114863f2e2
2014-01-13 15:12:23 -05:00
Zhidong.Hao
eefb42c343
Issue #100
...
Change-Id: I31c56395a69d8b1a140e652b434149dd98207e81
Former-commit-id: 9c1196d427
[formerly 6cb6519232
] [formerly 7009311c86
] [formerly a5280b938c
[formerly 7009311c86
[formerly f58eb9a800491de5850fa82a6e37b029f41ceb1c]]]
Former-commit-id: a5280b938c
Former-commit-id: 4cd237bf69117f0b4a2788ff2fcbbf36d67a10e1 [formerly 018536c97f
]
Former-commit-id: 96e371fd9e
2014-01-13 14:11:44 -05:00
Nate Jensen
8101a9fb70
Merge "Issue #2594 made heap status monitor default on launch" into development
...
Former-commit-id: e65c983653
[formerly 8d4d024617
] [formerly 542bbd88bc
] [formerly 09082cc89e
[formerly 542bbd88bc
[formerly 0907626a01c547a49d89d6cf15f479271dd0e0fe]]]
Former-commit-id: 09082cc89e
Former-commit-id: 42dd2d0efa21b3ab92b9121fca34f516371e73da [formerly 4d6bb9a75d
]
Former-commit-id: 86d6e78d17
2014-01-13 13:01:29 -06:00
Nate Jensen
70035635ec
Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
...
Former-commit-id: 10b6341adb
[formerly 02f7b23f72
] [formerly aba4acf355
] [formerly bd44fec4eb
[formerly aba4acf355
[formerly 2c9ce82cec838ac27153cfa1227b7bf787c1964b]]]
Former-commit-id: bd44fec4eb
Former-commit-id: 6ab8eb314426f4b3bc9fdde253d7d7e3cb7267d7 [formerly 708c77878f
]
Former-commit-id: 4b9411854e
2014-01-13 09:33:26 -06:00
Richard Peter
1e10acc664
Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
...
Former-commit-id: 434c05b458
[formerly bc4ad18fe9
] [formerly 7bbefddcc1
] [formerly e6d7acb609
[formerly 7bbefddcc1
[formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4
]
Former-commit-id: 5b687c7bd5
2014-01-10 15:42:48 -06:00
Brian Clements
42e259b83c
Issue #2594 made heap status monitor default on launch
...
Former-commit-id: 3333d3b926
[formerly 4f37164fc5
] [formerly 6ba1eb0edb
] [formerly 4a62eb90dc
[formerly 6ba1eb0edb
[formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: 0c8dc064b7186b1457f6e9bd47835cc2ba812b79 [formerly 3d196a00dd
]
Former-commit-id: cde78c4006
2014-01-10 14:54:14 -06:00
Juliya Dynina
ce9955d462
Merge "Issue #123 " into master_14.2.1
...
Former-commit-id: f1affcc3d2
[formerly 68d5188d77
] [formerly 393dc5907a
] [formerly f36c0dd1e4
[formerly 393dc5907a
[formerly 3cedd2e13e6bfa454cc9c6a64f610150d4c72104]]]
Former-commit-id: f36c0dd1e4
Former-commit-id: 8130185e78c0b5def1615fcead53a9be50231956 [formerly c9b5f53137
]
Former-commit-id: ee3356bbb1
2014-01-10 14:58:23 -05:00
Matthew Howard
2442bfcb28
Merge "Issue #95 " into master_14.2.1
...
Former-commit-id: 802069ebe6
[formerly a14146b67a
] [formerly f1cc7fbef1
] [formerly c2adc31d2a
[formerly f1cc7fbef1
[formerly d4a222fa74114ea25820d112c5a5cf786832a33e]]]
Former-commit-id: c2adc31d2a
Former-commit-id: 1709ee67aaec84d910e01ac5ce383ec2d41d70f1 [formerly 4fb7d37d85
]
Former-commit-id: e854cbfaac
2014-01-10 13:12:12 -05:00
Mike Duff
c8885b34f1
Issue #2452 - Add label stating all lat/lons will be converted to easting.
...
Former-commit-id: 2e6173b619
[formerly 67f6311354
] [formerly 69ca0dd0d2
] [formerly 7081c26823
[formerly 69ca0dd0d2
[formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb
]
Former-commit-id: b616f34af2
2014-01-10 12:05:30 -06:00
Gang.Zhang
18c0075d01
Issue #95
...
Change-Id: If9d3827df8c8d9e1798910113112415f98bdaa6b
Former-commit-id: 0db12d547d
[formerly ab9a7b925b
] [formerly 51f7643752
] [formerly 2b7b91c35b
[formerly 51f7643752
[formerly 35ae75bbd4f542e437879191873fece08a463d46]]]
Former-commit-id: 2b7b91c35b
Former-commit-id: 1077731f9d4543d7e0d411efd66c7b3c59f906dc [formerly 41ff33c799
]
Former-commit-id: d4094866da
2014-01-10 17:31:29 +00:00
Mike Duff
5f19ccc46e
Issue #2642 - Update header comment
...
Former-commit-id: b70c96297f
[formerly 5d669a97af
] [formerly 101d9939d6
] [formerly 28114764a5
[formerly 101d9939d6
[formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6
]
Former-commit-id: 12c47ea375
2014-01-10 10:57:18 -06:00
Max Schenkelberg
6fa1f6cc12
Issue #2620 Reordered developer feature.xml to match p2-build.xml
...
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67
Former-commit-id: a3495d01dc
[formerly 13172879fd
] [formerly ae7eb39380
] [formerly 73c022da20
[formerly ae7eb39380
[formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]
Former-commit-id: 73c022da20
Former-commit-id: 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611
]
Former-commit-id: 59586b673b
2014-01-10 10:39:07 -06:00
Richard Peter
a25ad86347
Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
...
Former-commit-id: 102bbe3e15
[formerly b37d6e9c91
] [formerly 8ca1217f03
] [formerly 52850fe95a
[formerly 8ca1217f03
[formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd
]
Former-commit-id: b833c4333c
2014-01-09 16:58:39 -06:00
Richard Peter
a2eef48cfb
Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
...
Former-commit-id: a39f2bff20
[formerly 0bd52b65e7
] [formerly b711c35c68
] [formerly f45a281935
[formerly b711c35c68
[formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e
]
Former-commit-id: f4108b8be2
2014-01-09 16:53:52 -06:00
Ben Steffensmeier
05ebc3eece
Issue #2647 Fix window focus problems.
...
Former-commit-id: eebab1d33f
[formerly 13da8899de
] [formerly 206754a3f8eac1e2ede760acafef51f7d6fa12a4 [formerly 2b9e9a41db
]] [formerly 488d5e45b1
[formerly 2b9e9a41db
[formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 7b56714a7309f567fe16d1c7a70ee9741297c5dc [formerly 0ada0c6d3f
]
Former-commit-id: 1aa018e5b7
2014-01-09 15:14:38 -06:00
Nate Jensen
7b17f4eabf
Merge "Issue #2563 added user server add/remove functionality" into development
...
Former-commit-id: c2a2a657bf
[formerly f7adb31fc5
] [formerly 7d0fc33055
] [formerly 6fdf4361f8
[formerly 7d0fc33055
[formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: 9b4895ed93f0a2ae2e0b94f8d502c98a45ed7a60 [formerly 0351c26443
]
Former-commit-id: aeffb73883
2014-01-09 13:44:24 -06:00
Brian Clements
9a28a4e067
Issue #2563 added user server add/remove functionality
...
now persists user entered servers to localization
Former-commit-id: 7279fbf6b3
[formerly af9292ea71
] [formerly 487aa58778
] [formerly c8cfc788f3
[formerly 487aa58778
[formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69
]
Former-commit-id: a8f746f794
2014-01-09 13:19:59 -06:00
Qinglu.Lin
8b573ce3a4
Issue #123
...
Change-Id: Iac88a9d04fce04b4f604fb3d29c6591c90d85a65
Former-commit-id: fc823260ca
[formerly e52d03fd37
] [formerly 1c2b48a66e
] [formerly 14e34361db
[formerly 1c2b48a66e
[formerly bbd87416db31892d00960da0d9076e265578dd43]]]
Former-commit-id: 14e34361db
Former-commit-id: 70eafbfab403d0915618090f09481a9e6ab26e50 [formerly 1aba68221a
]
Former-commit-id: f606fdb839
2014-01-09 14:13:25 -05:00
Mike Duff
2a94a50ec8
Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
...
Former-commit-id: 41ac6a70dd
[formerly e4f56affd3
] [formerly 16a8f16ee4
] [formerly 9b5adfaba2
[formerly 16a8f16ee4
[formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6
]
Former-commit-id: d2f74b6238
2014-01-09 13:02:08 -06:00
Max Schenkelberg
4085a38f94
Issue #2680 Fixed various OpenGL errors
...
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
Former-commit-id: 037cd48c62
[formerly 5d488d27b9
] [formerly 83c600ada9
] [formerly f4765d1577
[formerly 83c600ada9
[formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]
Former-commit-id: f4765d1577
Former-commit-id: 078c53e38b0dfbb2d2f1efc3df9341d3b037960b [formerly e4de3defec
]
Former-commit-id: f10dcc6de3
2014-01-09 11:26:19 -06:00