Ben Steffensmeier
|
1bf949a006
|
Issue #189 fix contour subgridding for worldwide grids
Former-commit-id: 33d07530c6 [formerly 3ee95cff21] [formerly 33d07530c6 [formerly 3ee95cff21] [formerly 929a785e1b [formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]]
Former-commit-id: 929a785e1b
Former-commit-id: 7de15734e9 [formerly 76996706f4]
Former-commit-id: acd5002c94
|
2012-11-14 11:38:25 -06:00 |
|
Steve Harris
|
ae9d9985cd
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
7058ebec23
|
12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
53d74c66e7
|
12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
|
2012-11-13 17:14:24 -06:00 |
|
Lee Venable
|
4353b75410
|
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 2827143110 [formerly 989d5dc5e4] [formerly 2827143110 [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 77af9b8699 [formerly 282e8858da]
Former-commit-id: 5f79e0f562
|
2012-11-13 16:02:05 -06:00 |
|
Steve Harris
|
81015f6f41
|
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 1f1659cb16 [formerly 63b0f18a89] [formerly 1f1659cb16 [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 6db07e2e5e [formerly 1e0ad343d6]
Former-commit-id: 07abe90d1c
|
2012-11-13 16:02:03 -06:00 |
|
Ben Steffensmeier
|
9f2f2591ee
|
Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
|
2012-11-13 16:00:19 -06:00 |
|
Roger Ferrel
|
de65e19817
|
Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: cbacc77367 [formerly 1d5bd95866] [formerly cbacc77367 [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]
Former-commit-id: dceb2cde5d
Former-commit-id: c498e21b23 [formerly 29eb436b19]
Former-commit-id: 0b8ecada1b
|
2012-11-13 15:53:03 -06:00 |
|
Lee Venable
|
c79fb63b54
|
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: 5b4f3c68f1 [formerly c1e46f52ca] [formerly 5b4f3c68f1 [formerly c1e46f52ca] [formerly 9d149bef29 [formerly 795564ae453a7afb423980679c3719a7c453aa74]]]
Former-commit-id: 9d149bef29
Former-commit-id: 3d07136ccc [formerly 32f088d986]
Former-commit-id: 07c1a3b61b
|
2012-11-13 15:35:13 -06:00 |
|
Roger Ferrel
|
295c73d59e
|
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 6f6b9dd21a [formerly 1e8dfdc857] [formerly 6f6b9dd21a [formerly 1e8dfdc857] [formerly b421a30116 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]
Former-commit-id: b421a30116
Former-commit-id: 1272837397 [formerly d646f32d6e]
Former-commit-id: 3eb1da1b66
|
2012-11-13 13:20:28 -06:00 |
|
Roger Ferrel
|
046da0519b
|
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: e3ae2eb355 [formerly 22f8bc10f0] [formerly e3ae2eb355 [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]]
Former-commit-id: 4c3af2a258
Former-commit-id: c1c0e53b2d [formerly 8e85e1c8df]
Former-commit-id: 1b582e49a6
|
2012-11-13 12:55:33 -06:00 |
|
Roger Ferrel
|
58dc77407c
|
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: fdfa0f2030 [formerly 5ce67ffd9e] [formerly fdfa0f2030 [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]
Former-commit-id: ae52206cc7
Former-commit-id: 122a5cf0a4 [formerly 30c70cc181]
Former-commit-id: d31e866744
|
2012-11-13 09:49:16 -06:00 |
|
Nate Jensen
|
7be1809e99
|
Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: ca20259c16 [formerly 8a07ba3c11] [formerly ca20259c16 [formerly 8a07ba3c11] [formerly e7045022ad [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]]
Former-commit-id: e7045022ad
Former-commit-id: 2be953df6b [formerly 7baf10fc53]
Former-commit-id: b4bfd19895
|
2012-11-13 09:28:05 -06:00 |
|
Nate Jensen
|
0f982fbf32
|
Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 254e88a70c [formerly 8a1f3a10a4] [formerly 254e88a70c [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 14b61ef0f8 [formerly cf8fd9f731]
Former-commit-id: d94afa6a55
|
2012-11-12 17:16:07 -06:00 |
|
Lee Venable
|
e383520c28
|
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: e62c2fb732 [formerly a576274c3c] [formerly e62c2fb732 [formerly a576274c3c] [formerly d4276e6474 [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]
Former-commit-id: d4276e6474
Former-commit-id: eaf7e7c724 [formerly fb4b76b003]
Former-commit-id: 85b200a973
|
2012-11-12 16:58:17 -06:00 |
|
Max Schenkelberg
|
c6b516ff9e
|
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 30c1802398 [formerly d1099addc6] [formerly 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 4408af827f [formerly c4e5092f94]
Former-commit-id: 9a13824af2
|
2012-11-12 16:46:21 -06:00 |
|
Roger Ferrel
|
3bc3bf17fd
|
Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: ab77dfa758 [formerly 66606f88de] [formerly ab77dfa758 [formerly 66606f88de] [formerly e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]
Former-commit-id: e982c0f43a
Former-commit-id: 3b07bb1ae6 [formerly de21a3f2ef]
Former-commit-id: d9c7c4ae56
|
2012-11-12 16:27:08 -06:00 |
|
Roger Ferrel
|
a3608d98fd
|
Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 13c0fb3f3d [formerly 6445081aa9] [formerly 13c0fb3f3d [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]
Former-commit-id: 76109f3bf7
Former-commit-id: 01899535e3 [formerly e7cd99ff0d]
Former-commit-id: 3ebaaa8992
|
2012-11-12 15:26:03 -06:00 |
|
Ben Steffensmeier
|
19f9437de6
|
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: 65441372df [formerly 7d3f479031] [formerly 65441372df [formerly 7d3f479031] [formerly b5b472dee1 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]
Former-commit-id: b5b472dee1
Former-commit-id: 810e0abd77 [formerly 220f41ec4c]
Former-commit-id: 94d44ed440
|
2012-11-12 15:15:49 -06:00 |
|
Roger Ferrel
|
577c2b88ab
|
Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 6ec9c1fac4 [formerly 9c9a068908] [formerly 6ec9c1fac4 [formerly 9c9a068908] [formerly f48474fc82 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]]
Former-commit-id: f48474fc82
Former-commit-id: 398f71471d [formerly b11413b7f0]
Former-commit-id: 6b0c3820d8
|
2012-11-12 14:22:02 -06:00 |
|
Lee Venable
|
b02aebcfad
|
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: 72aedbcece [formerly ab62adea95] [formerly 72aedbcece [formerly ab62adea95] [formerly 7db247e33a [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]]
Former-commit-id: 7db247e33a
Former-commit-id: 6ab3480255 [formerly ded0bfb92f]
Former-commit-id: 92063028bc
|
2012-11-12 14:13:06 -06:00 |
|
Lee Venable
|
19bf7ac8aa
|
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: d9022d16a6 [formerly 879078484e] [formerly d9022d16a6 [formerly 879078484e] [formerly 62c42850e8 [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]]
Former-commit-id: 62c42850e8
Former-commit-id: 2b1be166a2 [formerly 4f26da9a9a]
Former-commit-id: 0a39d42de1
|
2012-11-12 14:09:44 -06:00 |
|
Roger Ferrel
|
d3eda170ed
|
Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: ce6d6e277e [formerly 3676829e8f] [formerly ce6d6e277e [formerly 3676829e8f] [formerly ee323d9c60 [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]]
Former-commit-id: ee323d9c60
Former-commit-id: 88968c54e5 [formerly 73d9e78e92]
Former-commit-id: 4f86b0b521
|
2012-11-12 13:20:05 -06:00 |
|
Matt Nash
|
4822f87139
|
Issue #1324 make times display in 24 hour time
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 7fa21f5041 [formerly 1480e0abfc] [formerly 7fa21f5041 [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: dcda4b3fa4 [formerly d728ffadd0]
Former-commit-id: 31241c2d94
|
2012-11-12 12:53:26 -06:00 |
|
Roger Ferrel
|
f5343fae99
|
Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 1f509c5a54 [formerly 30ef939e3c] [formerly 1f509c5a54 [formerly 30ef939e3c] [formerly 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]]
Former-commit-id: 438731ca2e
Former-commit-id: 8490814573 [formerly 195d876753]
Former-commit-id: df5b8485c6
|
2012-11-12 12:00:03 -06:00 |
|
Roger Ferrel
|
e1bf6814d8
|
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: b60cbeda7a [formerly d89ce26aeb] [formerly b60cbeda7a [formerly d89ce26aeb] [formerly d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]]
Former-commit-id: d489a7ef9f
Former-commit-id: ecba7301a1 [formerly e01a4ae243]
Former-commit-id: 26afb7f186
|
2012-11-12 07:14:15 -06:00 |
|
Lee Venable
|
2542ec20ca
|
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: 125ac804a7 [formerly 109076cb73] [formerly 125ac804a7 [formerly 109076cb73] [formerly dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]]
Former-commit-id: dac9544eed
Former-commit-id: ff21b8d604 [formerly a267d9020b]
Former-commit-id: 458133c121
|
2012-11-08 17:06:54 -06:00 |
|
Nate Jensen
|
f3daf3dfbb
|
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: 5e718ca85b [formerly a92bfa9393] [formerly 5e718ca85b [formerly a92bfa9393] [formerly cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]]
Former-commit-id: cdd6a986e8
Former-commit-id: 38511f0e95 [formerly 5e3c076506]
Former-commit-id: cbd03947da
|
2012-11-08 14:50:17 -06:00 |
|
Dustin Johnson
|
f9c6566ba7
|
Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: db4d728eb7 [formerly 595c421e47] [formerly db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]
Former-commit-id: 2b6e98954e
Former-commit-id: eac5bc8197 [formerly 0806be04dd]
Former-commit-id: 1317e0b3ef
|
2012-11-08 14:47:17 -06:00 |
|
Ben Steffensmeier
|
2223e6ff64
|
Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c [formerly 884c82c4fe]
Former-commit-id: 74d1381180
|
2012-11-08 14:45:36 -06:00 |
|
Roger Ferrel
|
e3b4a7d750
|
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: 709798659d [formerly e26b14a84d] [formerly 709798659d [formerly e26b14a84d] [formerly 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]
Former-commit-id: 89617dda68
Former-commit-id: 553344fb3b [formerly 05825bd6f3]
Former-commit-id: f13bedab32
|
2012-11-08 11:19:51 -06:00 |
|
Lee Venable
|
2f390bd372
|
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 6c0bb76679 [formerly be460c956e] [formerly 6c0bb76679 [formerly be460c956e] [formerly e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]
Former-commit-id: e791e73a30
Former-commit-id: 1e61d4bd08 [formerly 7b5f085643]
Former-commit-id: b3991fa4c9
|
2012-11-08 11:11:15 -06:00 |
|
Nate Jensen
|
d70b6dd868
|
Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: e3487942ac [formerly 96cb1ecc7f] [formerly e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]
Former-commit-id: 01072652dc
Former-commit-id: bdbad943ef [formerly 375c864d28]
Former-commit-id: 7430e8dbfe
|
2012-11-08 11:08:48 -06:00 |
|
Lee Venable
|
4329af5cea
|
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: c4526c5ba0 [formerly ff5083715b] [formerly c4526c5ba0 [formerly ff5083715b] [formerly c44f90f675 [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]
Former-commit-id: c44f90f675
Former-commit-id: 9523ad6085 [formerly 4a22ded443]
Former-commit-id: 3bdfe02fe3
|
2012-11-08 10:57:45 -06:00 |
|
Roger Ferrel
|
b895611562
|
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 359ee69fa6 [formerly dfb55edb3d] [formerly 359ee69fa6 [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]
Former-commit-id: eae8a68fd5
Former-commit-id: e7aa940f52 [formerly 24a2e79b28]
Former-commit-id: 062109f9a7
|
2012-11-08 10:54:41 -06:00 |
|
Nate Jensen
|
42dc82c260
|
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: ca5db2ec43 [formerly 9038ff4e10] [formerly ca5db2ec43 [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]]
Former-commit-id: 48dae3a5e9
Former-commit-id: fca1922f7b [formerly 7da4882cfb]
Former-commit-id: 7d8c983f1e
|
2012-11-08 10:34:56 -06:00 |
|
Max Schenkelberg
|
f1a74fb0c5
|
Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b
Former-commit-id: 5f0b4286ba [formerly 9aa4221fdf] [formerly 5f0b4286ba [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]]
Former-commit-id: c80dbffad8
Former-commit-id: c219fcb112 [formerly 0a410412db]
Former-commit-id: d7afa4376e
|
2012-11-08 10:08:38 -06:00 |
|
Dustin Johnson
|
b4a13190ad
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: efd3d3735a [formerly 064ef82d1e] [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09]
Former-commit-id: 6613c51d3b
|
2012-11-08 09:57:16 -06:00 |
|
Roger Ferrel
|
eea2a76c7f
|
Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 3ad0d7d516 [formerly 023252fb84] [formerly 3ad0d7d516 [formerly 023252fb84] [formerly c3f451f799 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]]
Former-commit-id: c3f451f799
Former-commit-id: 9a1283fb1e [formerly de534f5b43]
Former-commit-id: bf4c19927c
|
2012-11-08 08:24:38 -06:00 |
|
Roger Ferrel
|
056dbf2fb3
|
Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 94a4440625 [formerly 76f60240c5] [formerly 94a4440625 [formerly 76f60240c5] [formerly 199475f671 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]]
Former-commit-id: 199475f671
Former-commit-id: c1d0b744b2 [formerly e072532a77]
Former-commit-id: 3aa144b2df
|
2012-11-08 07:57:56 -06:00 |
|
Nate Jensen
|
04c843cb1b
|
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]
Former-commit-id: 6b205399d4
Former-commit-id: 2fe69a5871 [formerly e3208d48a0]
Former-commit-id: 01e11761d8
|
2012-11-07 18:18:06 -06:00 |
|
Lee Venable
|
374a019df4
|
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: c8955b5425 [formerly 36c44db46b] [formerly c8955b5425 [formerly 36c44db46b] [formerly 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]]
Former-commit-id: 8956718961
Former-commit-id: 15842d7d22 [formerly eacc1ca32c]
Former-commit-id: 139ca20a3c
|
2012-11-07 17:38:21 -06:00 |
|
Roger Ferrel
|
dda46f3046
|
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: ee038e811c [formerly a46535ee0c] [formerly ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]]
Former-commit-id: 65d10be5d6
Former-commit-id: 42f453ffca [formerly 35f3a3953c]
Former-commit-id: f2f0d2320f
|
2012-11-07 15:07:47 -06:00 |
|
Roger Ferrel
|
51b57e0dfa
|
Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 4b0c701d69 [formerly 190922a233] [formerly 4b0c701d69 [formerly 190922a233] [formerly 81de6cd45b [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]]
Former-commit-id: 81de6cd45b
Former-commit-id: d6e00b6c35 [formerly d6560d7730]
Former-commit-id: 1d7ee19deb
|
2012-11-07 14:35:38 -06:00 |
|
Steve Harris
|
af59663a99
|
12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
|
2012-11-07 12:41:20 -06:00 |
|
Lee Venable
|
c65c92e4d5
|
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: 074543d75e [formerly f368b93484] [formerly 074543d75e [formerly f368b93484] [formerly 297d2bbc9c [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]]
Former-commit-id: 297d2bbc9c
Former-commit-id: 412c29f116 [formerly 24dd8a1bc7]
Former-commit-id: c6f4c2e53b
|
2012-11-07 12:31:39 -06:00 |
|
Roger Ferrel
|
9f91e9326e
|
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 8bf89ad495 [formerly 82abbbf0b7] [formerly 8bf89ad495 [formerly 82abbbf0b7] [formerly 974431a13a [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]]
Former-commit-id: 974431a13a
Former-commit-id: 35b0dc2cef [formerly c6749e3740]
Former-commit-id: 9f6f6c9c16
|
2012-11-07 11:27:36 -06:00 |
|
Max Schenkelberg
|
2345861756
|
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1 [formerly 747ab974e9]
Former-commit-id: 50625b0453
|
2012-11-07 10:44:42 -06:00 |
|
Matt Nash
|
79d997ef52
|
Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2
Former-commit-id: 76cdfc09bb [formerly 9c9db6643a] [formerly 76cdfc09bb [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c7477357508794a00267991b825d169df5ae71a]]]
Former-commit-id: 284aecc6f9
Former-commit-id: e87cb88d60 [formerly 46f695b72d]
Former-commit-id: fc838f3de2
|
2012-11-06 14:06:49 -06:00 |
|
Roger Ferrel
|
70627eb1f3
|
Issue #1304 Clear text field when point removed.
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc
Former-commit-id: a6b093c2ce [formerly 921134848b] [formerly a6b093c2ce [formerly 921134848b] [formerly 1f71a3bed7 [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]]
Former-commit-id: 1f71a3bed7
Former-commit-id: 5c241a7e5d [formerly a996839d2c]
Former-commit-id: 7dc93cee73
|
2012-11-05 12:56:07 -06:00 |
|