Ben Steffensmeier
|
55aa66a510
|
Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 8b906b245fd927ed79825b00dfba456a1c327fbb
|
2012-02-22 17:40:48 -06:00 |
|
Bryan Kowal
|
cd35220cf7
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 979af119b4da4e99e0ee2f090b9c28c02db7f7a3
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
1fc25c6cb2
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: 5ea9539870491d7ea3d1a050b700a17d18ecee1d
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
54be9660f1
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
9995d22e25
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
f3fe839c1c
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: fe86fe3696731660f6b37a147194c670906cdf4f
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
ec0cd8d086
|
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ac8ad6fa074f715a4b53a66fc41267a70ccb90f8
|
2012-02-21 08:57:12 -06:00 |
|
Steve Harris
|
4e1def89e7
|
Merge branch 'ss_sync'
Former-commit-id: b1c075b5f5af7df5058a409622a59b7d13b36416
|
2012-02-20 16:51:00 -06:00 |
|
Steve Harris
|
496cc6a06b
|
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 85082f273a85a3967d54d4a489b6ea973d0688be
|
2012-02-20 16:38:06 -06:00 |
|
Ben Steffensmeier
|
73d24fad2f
|
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: e0f697c492eecff4bb8d83d05efbcaf2876125c9
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
e5a5b3eefa
|
Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added
Former-commit-id: d74a1285a30ce98a656668c93c71462e7dc51c2a
|
2012-02-20 14:02:14 -06:00 |
|
Steve Harris
|
ebf5e8360e
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 80817ea48545c3315d8445c9acae60b6c92088f7
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
5e9d2dd367
|
Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
d02529fef4
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
cc66c8be24
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
c825bd03a2
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aaf3d445f517bba03e9f6b768850f2a8c77d26ed
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
682c10767d
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
9f1b7a613a
|
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 1ec51accade835c1133eac9222131f9186985053
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
b137302802
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
|
2012-02-17 10:55:02 -06:00 |
|
Ben Steffensmeier
|
3e3e4bd4e3
|
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 04a68e6815001450fece9bb5fbf6ce99143e2d05
|
2012-02-16 16:36:56 -06:00 |
|
Steve Harris
|
64ddef69b6
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: d3ca90194ff9d361ba9ff7679c2f4da43a439de4
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
642ad4e9b0
|
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: 712f278a25a67d3d05375213b4d5bc8e7743aaa9
|
2012-02-16 14:00:33 -06:00 |
|
Bryan Kowal
|
4888756560
|
Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: d3affc909e299af8826d16bc02754fc61754e287
|
2012-02-16 12:51:24 -06:00 |
|
Ben Steffensmeier
|
8cf7360e3b
|
Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: cb03ef54be5e9dae57d758903f6956a8c2a9a617
|
2012-02-15 17:10:34 -06:00 |
|
Steve Harris
|
1909537682
|
Merge commit 'awips2_OB12.1.1_Omaha'
Former-commit-id: b1bce76fd8170d05e57624f969e5293c1257c533
|
2012-02-15 15:45:23 -06:00 |
|
Steve Harris
|
09c3e613e5
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 7b981a7bb3e35d9147bf686150e5ed91e5b22d79
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
c1129dbd00
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 14c8ac5618aa04da5408a1d75297f3f9fa19d023
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
23cc9689de
|
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: 0c520ee63a42d53754686f52ffa5b94a0fe4eea1
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
1707b98721
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
86a0e3f5ee
|
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: f83e2bd22a74e9604fb878a899d9a2df5fbb28eb
|
2012-02-15 14:26:22 -06:00 |
|
Steve Harris
|
a91b01bfbe
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: ab787c94408e85afe2d92c3f860b7b9bd271c616
|
2012-02-15 12:54:54 -06:00 |
|
Bryan Kowal
|
521756e57e
|
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: 1dd23c4dea214938fe9660f303458c5f08efdc01
|
2012-02-15 10:31:58 -06:00 |
|
Steve Harris
|
2e29bc8ee2
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
|
2012-02-14 15:54:46 -06:00 |
|
Steve Harris
|
708348e9e4
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 70f1516d0cc4dcd62214453974f1e65dd57d1ddd
|
2012-02-14 15:47:32 -06:00 |
|
Ben Steffensmeier
|
f65d86a06a
|
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: 518db101f2ec18afa31a5b12fbaab3bbb903013b
|
2012-02-14 15:46:11 -06:00 |
|
Steve Harris
|
376650ce9d
|
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: e8e020e3bd86ffcd918366990d605acee8bd6a80
|
2012-02-14 15:41:54 -06:00 |
|
Ben Steffensmeier
|
b080ab8f6c
|
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 78deeca92b5916c7c57b1f866e9be2e11992c13d
|
2012-02-14 15:39:50 -06:00 |
|
Nate Jensen
|
dd7d200f7f
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 1135f27699b49795352ae5b1b31ac9fe06c564b6
|
2012-02-14 13:06:27 -06:00 |
|
Ben Steffensmeier
|
2995d2b29b
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 32b8f723ebf64d97636705911c0b7b22a9cd2148
|
2012-02-14 12:59:42 -06:00 |
|
David Gillingham
|
061966f243
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: 47750dfd5e387238f409ead55549cbb24f5afbe1
|
2012-02-13 16:09:36 -06:00 |
|
Greg Armendariz
|
e3dda29720
|
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: 41ed9251ca6ef83a6de3362c52acaa21dd00da3d
|
2012-02-13 15:02:29 -06:00 |
|
Bryan Kowal
|
4faf9831ed
|
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: de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122
|
2012-02-13 13:57:10 -06:00 |
|
Nate Jensen
|
06327646d9
|
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9
|
2012-02-13 11:40:36 -06:00 |
|
Bryan Kowal
|
c77b9558e1
|
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 00ce48c7698c9baad8a3ab643d39858c47c18226
|
2012-02-13 10:08:15 -06:00 |
|
Ben Steffensmeier
|
f7985bff7b
|
Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: 622a02770dc84c8cedd9707b741f5f1e2b6ab81d
|
2012-02-10 12:13:34 -06:00 |
|
Bryan Kowal
|
1855bbcbee
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
23f61e0945
|
Issue #202 - fix deploy-install.
Former-commit-id: e591702f5c924e5e1ad2e335861867626a24fc2e
|
2012-02-09 11:28:22 -06:00 |
|
Ben Steffensmeier
|
6bfd8ccfee
|
Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f
|
2012-02-09 10:54:02 -06:00 |
|
Bryan Kowal
|
3060ca85cc
|
Issue #202 - fix deploy-install.
Former-commit-id: e8f28b51b70eccdf19de2075a6c5c7efb9ccedda
|
2012-02-09 10:41:46 -06:00 |
|
Steve Harris
|
f693b6d0a7
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
|
2012-02-09 08:54:18 -06:00 |
|