Steve Harris
|
aaead73ec5
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 9995d22e25
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
6d1b04e62c
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]
Former-commit-id: f3fe839c1c
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
13ea11ddfc
|
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]
Former-commit-id: ec0cd8d086
|
2012-02-21 08:57:12 -06:00 |
|
Steve Harris
|
b2965389c7
|
Merge branch 'ss_sync'
Former-commit-id: 7be1fb41ea [formerly b1c075b5f5af7df5058a409622a59b7d13b36416]
Former-commit-id: 4e1def89e7
|
2012-02-20 16:51:00 -06:00 |
|
Steve Harris
|
4a93298877
|
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: b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]
Former-commit-id: 496cc6a06b
|
2012-02-20 16:38:06 -06:00 |
|
Ben Steffensmeier
|
dcbe4fc7da
|
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]
Former-commit-id: 73d24fad2f
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
ff6c744fa7
|
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: eca4aef9a8 [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]
Former-commit-id: e5a5b3eefa
|
2012-02-20 14:02:14 -06:00 |
|
Steve Harris
|
5bc52de24a
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 07bf1f770d [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]
Former-commit-id: ebf5e8360e
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
33483f3960
|
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: cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]
Former-commit-id: 5e9d2dd367
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
d133454b27
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]
Former-commit-id: d02529fef4
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
54b5b6baef
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]
Former-commit-id: cc66c8be24
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
0fab56e0f1
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]
Former-commit-id: c825bd03a2
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
2ba23624b4
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 682c10767d
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
38ccaf882b
|
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: 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]
Former-commit-id: 9f1b7a613a
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
65b22abd24
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]
Former-commit-id: b137302802
|
2012-02-17 10:55:02 -06:00 |
|
Ben Steffensmeier
|
d4e7df98a9
|
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c9 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]
Former-commit-id: 3e3e4bd4e3
|
2012-02-16 16:36:56 -06:00 |
|
Steve Harris
|
ff45f4eaab
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e2989d1a9f [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]
Former-commit-id: 64ddef69b6
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
051e8faf55
|
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: bdb08a9f4c [formerly 712f278a25a67d3d05375213b4d5bc8e7743aaa9]
Former-commit-id: 642ad4e9b0
|
2012-02-16 14:00:33 -06:00 |
|
Bryan Kowal
|
71fe94b322
|
Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: c8dba08a9d [formerly d3affc909e299af8826d16bc02754fc61754e287]
Former-commit-id: 4888756560
|
2012-02-16 12:51:24 -06:00 |
|
Ben Steffensmeier
|
b819bfa8e9
|
Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 28c7e6bc22 [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]
Former-commit-id: 8cf7360e3b
|
2012-02-15 17:10:34 -06:00 |
|
Steve Harris
|
3c3eebfd0e
|
Merge commit 'awips2_OB12.1.1_Omaha'
Former-commit-id: 2783331dd6 [formerly b1bce76fd8170d05e57624f969e5293c1257c533]
Former-commit-id: 1909537682
|
2012-02-15 15:45:23 -06:00 |
|
Steve Harris
|
17c9ad4c0c
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 64b3ba9d2b [formerly 7b981a7bb3e35d9147bf686150e5ed91e5b22d79]
Former-commit-id: 09c3e613e5
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
ad402655f4
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 272ba87883 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]
Former-commit-id: c1129dbd00
|
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: b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: 23cc9689de
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
db1e3b1215
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]
Former-commit-id: 1707b98721
|
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: 05c0347d90 [formerly f83e2bd22a74e9604fb878a899d9a2df5fbb28eb]
Former-commit-id: 86a0e3f5ee
|
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: 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: a91b01bfbe
|
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: 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]
Former-commit-id: 521756e57e
|
2012-02-15 10:31:58 -06:00 |
|
Steve Harris
|
cb3371ee28
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]
Former-commit-id: 2e29bc8ee2
|
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: 7a28b5ea62 [formerly 70f1516d0cc4dcd62214453974f1e65dd57d1ddd]
Former-commit-id: 708348e9e4
|
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: 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]
Former-commit-id: f65d86a06a
|
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: 3973ed2360 [formerly e8e020e3bd86ffcd918366990d605acee8bd6a80]
Former-commit-id: 376650ce9d
|
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: 97000f0738 [formerly 78deeca92b5916c7c57b1f866e9be2e11992c13d]
Former-commit-id: b080ab8f6c
|
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: daeda3f898 [formerly 1135f27699b49795352ae5b1b31ac9fe06c564b6]
Former-commit-id: dd7d200f7f
|
2012-02-14 13:06:27 -06:00 |
|
Ben Steffensmeier
|
7914496c96
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 100b4c4ba0 [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]
Former-commit-id: 2995d2b29b
|
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: bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]
Former-commit-id: 061966f243
|
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: cb16a5256a [formerly 41ed9251ca6ef83a6de3362c52acaa21dd00da3d]
Former-commit-id: e3dda29720
|
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: 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]
Former-commit-id: 4faf9831ed
|
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: da7d13d933 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]
Former-commit-id: 06327646d9
|
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: 34d9122f14 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]
Former-commit-id: c77b9558e1
|
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: ebbbd0bafc [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]
Former-commit-id: f7985bff7b
|
2012-02-10 12:13:34 -06:00 |
|
Bryan Kowal
|
27c4557e0a
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 7ca62dc7d6 [formerly 26243249e27ee347933748aa53e9436e32751d9c]
Former-commit-id: 1855bbcbee
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
e85ed4a172
|
Issue #202 - fix deploy-install.
Former-commit-id: 0a141d49d0 [formerly e591702f5c924e5e1ad2e335861867626a24fc2e]
Former-commit-id: 23f61e0945
|
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: 5cdcd5a261 [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]
Former-commit-id: 6bfd8ccfee
|
2012-02-09 10:54:02 -06:00 |
|
Bryan Kowal
|
b26d700ef4
|
Issue #202 - fix deploy-install.
Former-commit-id: 8a57a8ce05 [formerly e8f28b51b70eccdf19de2075a6c5c7efb9ccedda]
Former-commit-id: 3060ca85cc
|
2012-02-09 10:41:46 -06:00 |
|
Steve Harris
|
f650243958
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]
Former-commit-id: f693b6d0a7
|
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: 37ca28aae8 [formerly ea128d2f4d9b676df50ef0d6727ff4f938f1c265]
Former-commit-id: d7e8c7fc26
|
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: 863fa0f635 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]
Former-commit-id: 3f60daa9c7
|
2012-02-08 16:29:02 -06:00 |
|
Steve Harris
|
a6b95a2e81
|
Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: 4eef9c3c20 [formerly e019344c6f96c6db35ede5985779eab537df523c]
Former-commit-id: 35cc62582b
|
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: 9cc539f8a4 [formerly bc6f1a41c0dee1c2030d1a2c90d337ddef20b36e]
Former-commit-id: db74c784d6
|
2012-02-08 09:06:55 -06:00 |
|