Steve Harris
581546a5eb
12.6.1-3 baseline
...
Former-commit-id: bc96eba820
[formerly 7c5306b795
] [formerly 42f3513175
] [formerly bc96eba820
[formerly 7c5306b795
] [formerly 42f3513175
] [formerly d57eb02b9e
[formerly 42f3513175
[formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04
[formerly 32c0464d79
] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237
]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3
]
Former-commit-id: 518fa79f7f
2012-06-11 16:23:47 -05:00
Steve Harris
42f3513175
12.6.1-3 baseline
...
Former-commit-id: 2f4e12140a9b026770563eee58577b8aa2c041e1
2012-06-11 16:23:47 -05:00
Steve Harris
b13cbb7e00
12.5.1-15 baseline
...
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
e460104ec9
12.5.1-6 baseline
...
Former-commit-id: ba6d779949
[formerly df80148db6
] [formerly 24474489f9
] [formerly ba6d779949
[formerly df80148db6
] [formerly 24474489f9
] [formerly fa87dc6cf1
[formerly 24474489f9
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025
[formerly 4792884ab2
] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633
]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019
]
Former-commit-id: 26ed02c3dc
2012-05-16 16:41:22 -05:00
Steve Harris
24474489f9
12.5.1-6 baseline
...
Former-commit-id: a75af2f0de38d65dcbbd919e159c3b0a268fc245
2012-05-16 16:41:22 -05:00
Steve Harris
c76fddc7e4
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed
[formerly 572e1bb476
] [formerly 27bc369818
] [formerly bcc12e03ed
[formerly 572e1bb476
] [formerly 27bc369818
] [formerly 58037cb5d1
[formerly 27bc369818
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c
[formerly 9c9e01dbda
] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7
]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640
]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
27bc369818
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
2012-05-09 13:14:00 -05:00
Steve Harris
6715112613
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84
[formerly ac708c050d
] [formerly 84d191e7b6
] [formerly c1bc408f84
[formerly ac708c050d
] [formerly 84d191e7b6
] [formerly b36c69cc67
[formerly 84d191e7b6
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e
[formerly f6300cd995
] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf
]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413
]
Former-commit-id: ef49f63d8d
2012-05-03 19:17:13 -05:00
Steve Harris
84d191e7b6
12.5.1-2 baseline
...
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
2012-05-03 19:17:13 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
67a5a68300
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Max Schenkelberg
57e0dbf2bf
Issue #239 Got zoom/pan events working for remote users
...
Former-commit-id: 7416bd9839
[formerly 65f6c07530
] [formerly 6e0c5c3cdf
] [formerly 7416bd9839
[formerly 65f6c07530
] [formerly 6e0c5c3cdf
] [formerly 18e9f2c6ad
[formerly 6e0c5c3cdf
[formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 2c47c3a99d
[formerly 9853d46099
] [formerly 651085c3a24f9ed2b19ae0a5cf80b31fa2d7e0be [formerly 0d21a9a35e
]]
Former-commit-id: fe6a73e790f39586ffbcd7eb1035a198363895b3 [formerly dbd37bb4ae
]
Former-commit-id: 5977b8bcba
2012-04-10 14:40:51 -05:00
Max Schenkelberg
6e0c5c3cdf
Issue #239 Got zoom/pan events working for remote users
...
Former-commit-id: a817a720868fe887deca6ce6589014f0cd439c2d
2012-04-10 14:40:51 -05:00
Max Schenkelberg
1ade3f1684
Issue #239 Fixed D2D context activation so as not to override important
...
keys when a unrelated view is active such as Product Browser or
Collaboration views.
Former-commit-id: 65e7184cc4
[formerly a5fa19c914
] [formerly cbe92bdf32
] [formerly 65e7184cc4
[formerly a5fa19c914
] [formerly cbe92bdf32
] [formerly 6812c1ba2b
[formerly cbe92bdf32
[formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: c19de5dcc3
[formerly 532f2d691b
] [formerly a24149c0db6c44d2a20bc8fb7a45708e704473a7 [formerly 824b24dfcb
]]
Former-commit-id: 7994a40c93b0f5a9b6f2414d1ff1061656c15e12 [formerly a6c9c88b4f
]
Former-commit-id: 54d8c44956
2012-04-06 10:23:24 -05:00
Max Schenkelberg
cbe92bdf32
Issue #239 Fixed D2D context activation so as not to override important
...
keys when a unrelated view is active such as Product Browser or
Collaboration views.
Former-commit-id: c7badfd1c2a77d410cd3b841fef967c07c9e6434
2012-04-06 10:23:24 -05:00
Steve Harris
587c928f4e
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 0be3703c7e
[formerly 4981170462
] [formerly dcadf7baa4
] [formerly 0be3703c7e
[formerly 4981170462
] [formerly dcadf7baa4
] [formerly 86e586befe
[formerly dcadf7baa4
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]]
Former-commit-id: 86e586befe
Former-commit-id: fbb5de922a
[formerly 4eb1ef5b0f
] [formerly 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c
]]
Former-commit-id: a02575690595cf7dbca41fcc8e53a47ab455d3ac [formerly 2c958713b6
]
Former-commit-id: 93d99ca49c
2012-02-23 12:38:55 -06:00
Steve Harris
dcadf7baa4
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Steve Harris
43ff909553
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5a96582f16
[formerly 92084b3f20
] [formerly d0bbbfefcc
] [formerly 5a96582f16
[formerly 92084b3f20
] [formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be
[formerly 92b7072b82
] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719
]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012
]
Former-commit-id: 3aef320ffd
2012-02-23 10:06:18 -06:00
Steve Harris
d0bbbfefcc
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
3a4af24369
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 829d2791e9
[formerly 8da36046de
] [formerly c8aae98741
] [formerly 829d2791e9
[formerly 8da36046de
] [formerly c8aae98741
] [formerly 54be9660f1
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6
[formerly b55a488ed8
] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963
]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc
]
Former-commit-id: 978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
c8aae98741
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
9df09d3111
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 60b350f7f2
[formerly 695e2979c3
] [formerly 1002555dbd
] [formerly 60b350f7f2
[formerly 695e2979c3
] [formerly 1002555dbd
] [formerly f693b6d0a7
[formerly 1002555dbd
[formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 5ee70f0f28
[formerly 93e856457b
] [formerly ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958
]]
Former-commit-id: c794a75c8d74844afb8888a761b9fa0f1da0eaac [formerly 3cbce90726
]
Former-commit-id: 87ffdc4f01
2012-02-09 08:54:18 -06:00
Steve Harris
1002555dbd
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
2012-02-09 08:54:18 -06:00
Matt Nash
7cb78d5150
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: e512d27770
[formerly a659029ea0
] [formerly f4c5d7f94b
] [formerly e512d27770
[formerly a659029ea0
] [formerly f4c5d7f94b
] [formerly 28e3da498e
[formerly f4c5d7f94b
[formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]]
Former-commit-id: 28e3da498e
Former-commit-id: 628da725c1
[formerly 8dbb17b2e8
] [formerly d0e84e05ac9aabb1cf0f0936159cb5c6919bb005 [formerly ef18b8c47f
]]
Former-commit-id: 7add8b2ce2e06b31de0dd26e7afc5fc7caf67c7b [formerly cc50a32732
]
Former-commit-id: 53612b087f
2012-02-07 11:45:28 -06:00
Matt Nash
f4c5d7f94b
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: c12bae0a615198f6d409cf5e6d79a6a32e57494d
2012-02-07 11:45:28 -06:00
Ben Steffensmeier
f0e595338e
Issue #230 fix scaling problems with printing to high dpi printers
...
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: 15afb5b8bd
[formerly 89b327974a
] [formerly d35d365b7f
] [formerly 15afb5b8bd
[formerly 89b327974a
] [formerly d35d365b7f
] [formerly f78fa301a8
[formerly d35d365b7f
[formerly 22418489fd697c94b2350d79e7701c8399842e2e]]]]
Former-commit-id: f78fa301a8
Former-commit-id: 460820bac9
[formerly 25adbef6ab
] [formerly 968bdeb040264a08ad8cd18803cb98f7c769e7e9 [formerly 55689025ff
]]
Former-commit-id: 7de7d30b81cf8d94ddb55f7a585648884b5ac5be [formerly ffe5d42a03
]
Former-commit-id: b338fc07e7
2012-02-03 12:49:59 -06:00
Ben Steffensmeier
d35d365b7f
Issue #230 fix scaling problems with printing to high dpi printers
...
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: 22418489fd697c94b2350d79e7701c8399842e2e
2012-02-03 12:49:59 -06:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90
[formerly 82300ccdcf
] [formerly 21d2361f00
[formerly 1faae42484
]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf
[formerly 8e80217e59
] [formerly 377dcd10b9
[formerly 3360eb6c5f
]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00