Steve Harris
3c3eebfd0e
Merge commit 'awips2_OB12.1.1_Omaha'
...
Former-commit-id: 2783331dd61909537682
2012-02-15 15:45:23 -06:00
Steve Harris
17c9ad4c0c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 64b3ba9d2b09c3e613e5
2012-02-15 15:09:30 -06:00
Steve Harris
ad402655f4
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 272ba87883c1129dbd00
2012-02-15 15:08:58 -06:00
Steve Harris
a2e3aabc60
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: b9f4780fcb23cc9689de
2012-02-15 14:39:43 -06:00
Steve Harris
db1e3b1215
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 7356d655da1707b98721
2012-02-15 14:34:47 -06:00
Steve Harris
72466ef0ca
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
...
Former-commit-id: 05c0347d9086a0e3f5ee
2012-02-15 14:26:22 -06:00
Steve Harris
39b13d7102
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: 5e47f8c33aa91b01bfbe
2012-02-15 12:54:54 -06:00
Bryan Kowal
1c023403e2
Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
...
Former-commit-id: 38eb4bd2b6521756e57e
2012-02-15 10:31:58 -06:00
Steve Harris
cb3371ee28
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2119a1513e2e29bc8ee2
2012-02-14 15:54:46 -06:00
Steve Harris
6c719e6fc2
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: 7a28b5ea62708348e9e4
2012-02-14 15:47:32 -06:00
Ben Steffensmeier
d00572c122
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 944e59e989f65d86a06a
2012-02-14 15:46:11 -06:00
Steve Harris
b847ef442c
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
...
Former-commit-id: 3973ed2360376650ce9d
2012-02-14 15:41:54 -06:00
Ben Steffensmeier
2e49f3b6aa
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
...
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 97000f0738b080ab8f6c
2012-02-14 15:39:50 -06:00
Nate Jensen
c49691bc7b
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: daeda3f898dd7d200f7f
2012-02-14 13:06:27 -06:00
Ben Steffensmeier
7914496c96
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 100b4c4ba02995d2b29b
2012-02-14 12:59:42 -06:00
David Gillingham
9f416558fa
Issue #20 : Committing refactored archiver capability
...
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20 : Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: bb1ac9959b061966f243
2012-02-13 16:09:36 -06:00
Greg Armendariz
7ce17e1234
Merge "Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console." into 4-Thin_Client
...
Former-commit-id: cb16a5256ae3dda29720
2012-02-13 15:02:29 -06:00
Bryan Kowal
eb91bb964e
Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
...
Former-commit-id: 67562b06744faf9831ed
2012-02-13 13:57:10 -06:00
Nate Jensen
dd8500b081
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: da7d13d93306327646d9
2012-02-13 11:40:36 -06:00
Bryan Kowal
2c3f67d470
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 34d9122f14c77b9558e1
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
a9e13fac26
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: ebbbd0bafcf7985bff7b
2012-02-10 12:13:34 -06:00
Bryan Kowal
27c4557e0a
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 7ca62dc7d61855bbcbee
2012-02-09 12:14:37 -06:00
Bryan Kowal
e85ed4a172
Issue #202 - fix deploy-install.
...
Former-commit-id: 0a141d49d023f61e0945
2012-02-09 11:28:22 -06:00
Ben Steffensmeier
512e0f1bd5
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 5cdcd5a2616bfd8ccfee
2012-02-09 10:54:02 -06:00
Bryan Kowal
b26d700ef4
Issue #202 - fix deploy-install.
...
Former-commit-id: 8a57a8ce053060ca85cc
2012-02-09 10:41:46 -06:00
Steve Harris
f650243958
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 1002555dbdf693b6d0a7
2012-02-09 08:54:18 -06:00
Steve Harris
4b3c90acde
Merge branch '4-Thin_Client' into 104-integration
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose 'created' to keep these files
Former-commit-id: 37ca28aae8d7e8c7fc26
2012-02-09 08:53:53 -06:00
Ben Steffensmeier
d49939ddb2
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: 863fa0f6353f60daa9c7
2012-02-08 16:29:02 -06:00
Steve Harris
a6b95a2e81
Merge "Issue #192 gitignore changes" into ss_sync
...
Former-commit-id: 4eef9c3c2035cc62582b
2012-02-08 09:09:28 -06:00
Lee Venable
74cd5a6f0b
Merge changes I92d52e19,Ia6e18647 into 9-Wes2Bridge
...
* changes:
Issue #13 Corrected valid month check - from code review Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
Issue #13 - Modified/corrected handling of "ARCHIVE" time stamp
Former-commit-id: 9cc539f8a4db74c784d6
2012-02-08 09:06:55 -06:00
Lee Venable
ead1c644fd
Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge
...
Former-commit-id: a97a61c74c225aadb85b
2012-02-08 09:06:46 -06:00
Matt Nash
5c10b1d587
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
...
Former-commit-id: e52a1315b225b9659dc7
2012-02-08 08:53:19 -06:00
Matt Nash
82089434e5
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: f7652d25e3bb4f690393
2012-02-07 16:49:34 -06:00
Mike Duff
846110bac4
Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds
...
error
Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7
Former-commit-id: 60de2210f5d8d84fbe2e
2012-02-07 16:46:36 -06:00
Max Schenkelberg
9a7efcaae8
Issue #206 fixed dialog context deactivation bug
...
Former-commit-id: 9535ae2d0efe59c3e8d8
2012-02-07 16:45:59 -06:00
Steve Harris
2f928d6d77
Merge "Issue #16 - data/manual now uses subdirectories (2)" into 9-Wes2Bridge
...
Former-commit-id: 64295a4ab4127aee04f8
2012-02-07 16:36:34 -06:00
Mike Duff
122937e1b2
Issue #16 - data/manual now uses subdirectories (2)
...
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: 97d5923be9f194c39a7f
2012-02-07 16:30:13 -06:00
Matt Nash
e629c0bc38
Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
...
Former-commit-id: 81ec1d5dacbe92a03f2d
2012-02-07 16:13:03 -06:00
Max Schenkelberg
a6622153d7
Issue #206 - Fixed loading and disposing bugs in tear off menus
...
Issue #206 Fixed bugs in maps menu and other dynamically created menus
Former-commit-id: 370e20f0aea7ccea5eda
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
0873a518c6
Issue #235 Ability to screen capture or print multiple frames at once.
...
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7
Former-commit-id: e904dadb5ec74dae631e
2012-02-07 15:33:23 -06:00
Matt Nash
ef18b8c47f
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: f4c5d7f94b28e3da498e
2012-02-07 11:45:28 -06:00
Nate Jensen
47d4648cd5
Merge "Issue #176 fix PersistablePluginDataObject" into 4-Thin_Client
...
Former-commit-id: a25342a5c8e79aa3bfa1
2012-02-07 09:47:46 -06:00
Nate Jensen
b1264d105b
Merge "Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline. Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40" into 4-Thin_Client
...
Former-commit-id: 00cf561d8842e12cc025
2012-02-07 09:45:28 -06:00
Ben Steffensmeier
22809228d6
Issue #176 fix PersistablePluginDataObject
...
Change-Id: I29f37b0fceb180eb0950ff1e00c44eb94b05f82e
Former-commit-id: 20247d0d896d901d27ae
2012-02-07 09:42:07 -06:00
Ben Steffensmeier
7db3623545
Issue #229 make sure default cache directory exists when opening the preference page.
...
Change-Id: I25ba5cba8c74b764e39c1a42c78ee14f861ba283
Former-commit-id: a1455f9c7d34f45958ce
2012-02-06 17:16:52 -06:00
Ben Steffensmeier
56c1b70d03
Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline.
...
Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40
Former-commit-id: 324b358c44851046ccf3
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
7bcbf3e3bc
Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
...
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4
Former-commit-id: f016be988e73f6e9e322
2012-02-03 17:33:32 -06:00
Matt Nash
380179f10d
Issue #192 gitignore changes
...
Former-commit-id: 5fdadf4333426da850d3
2012-02-03 15:03:21 -06:00
Matt Nash
88689efbfa
Issue #26 tear off menu changes to fix issues
...
Former-commit-id: 542049e4550ff3ef8d72
2012-02-03 13:13:15 -06:00
Ben Steffensmeier
55689025ff
Issue #230 fix scaling problems with printing to high dpi printers
...
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: d35d365b7ff78fa301a8
2012-02-03 12:49:59 -06:00
