Bryan Kowal
|
012661cc90
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 9a63901c0e [formerly 9a63901c0e [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]
Former-commit-id: cd35220cf7
Former-commit-id: 5ca7ce8373
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
5b11c36f19
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: a7b68a50be [formerly a7b68a50be [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: aaf2fbd05b
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
15c56d11bc
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
156ad8471d
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
a14d90ed4d
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 84926c80be [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]
Former-commit-id: f3fe839c1c
Former-commit-id: 6d1b04e62c
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
f92be47f79
|
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: b90611d995 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]
Former-commit-id: ec0cd8d086
Former-commit-id: 13ea11ddfc
|
2012-02-21 08:57:12 -06:00 |
|
Ben Steffensmeier
|
f949f622dd
|
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde115 [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]
Former-commit-id: 73d24fad2f
Former-commit-id: dcbe4fc7da
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
06fd623597
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 07bf1f770d [formerly 07bf1f770d [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]
Former-commit-id: ebf5e8360e
Former-commit-id: 5bc52de24a
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
acd7845ebd
|
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 cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
d9c8a99210
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: 6a064cb78b [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: d02529fef4
Former-commit-id: d133454b27
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
09b81c6e00
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: 4b76d22f77 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
f265cb965d
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 62c587b841 [formerly 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]
Former-commit-id: c825bd03a2
Former-commit-id: 0fab56e0f1
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
8403801a2b
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 10a0ca252d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
2fefca4860
|
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 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 38ccaf882b
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
895404abeb
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
|
2012-02-17 10:55:02 -06:00 |
|
Ben Steffensmeier
|
c286cb0406
|
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c9 [formerly 26d82729c9 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: d4e7df98a9
|
2012-02-16 16:36:56 -06:00 |
|
Steve Harris
|
c2cf0253bf
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e2989d1a9f [formerly e2989d1a9f [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]
Former-commit-id: 64ddef69b6
Former-commit-id: ff45f4eaab
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
f7767084b6
|
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: bdb08a9f4c [formerly bdb08a9f4c [formerly 712f278a25a67d3d05375213b4d5bc8e7743aaa9]]
Former-commit-id: 642ad4e9b0
Former-commit-id: 051e8faf55
|
2012-02-16 14:00:33 -06:00 |
|
Bryan Kowal
|
82513080ba
|
Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: c8dba08a9d [formerly c8dba08a9d [formerly d3affc909e299af8826d16bc02754fc61754e287]]
Former-commit-id: 4888756560
Former-commit-id: 71fe94b322
|
2012-02-16 12:51:24 -06:00 |
|
Ben Steffensmeier
|
1aff4d27fb
|
Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 28c7e6bc22 [formerly 28c7e6bc22 [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]
Former-commit-id: 8cf7360e3b
Former-commit-id: b819bfa8e9
|
2012-02-15 17:10:34 -06:00 |
|
Steve Harris
|
69dec3a5fa
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 64b3ba9d2b [formerly 64b3ba9d2b [formerly 7b981a7bb3e35d9147bf686150e5ed91e5b22d79]]
Former-commit-id: 09c3e613e5
Former-commit-id: 17c9ad4c0c
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
c74ded15b9
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 272ba87883 [formerly 272ba87883 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]
Former-commit-id: c1129dbd00
Former-commit-id: ad402655f4
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
b2999a6d59
|
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 b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: 23cc9689de
Former-commit-id: a2e3aabc60
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
a1462275f7
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 7356d655da [formerly 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 1707b98721
Former-commit-id: db1e3b1215
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
28471f8e94
|
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: 05c0347d90 [formerly 05c0347d90 [formerly f83e2bd22a74e9604fb878a899d9a2df5fbb28eb]]
Former-commit-id: 86a0e3f5ee
Former-commit-id: 72466ef0ca
|
2012-02-15 14:26:22 -06:00 |
|
Steve Harris
|
ad1f608967
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 5e47f8c33a [formerly 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]
Former-commit-id: a91b01bfbe
Former-commit-id: 39b13d7102
|
2012-02-15 12:54:54 -06:00 |
|
Bryan Kowal
|
e19d034858
|
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 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]
Former-commit-id: 521756e57e
Former-commit-id: 1c023403e2
|
2012-02-15 10:31:58 -06:00 |
|
Steve Harris
|
dc9df63a11
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2119a1513e [formerly 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: cb3371ee28
|
2012-02-14 15:54:46 -06:00 |
|
Steve Harris
|
e3832b4054
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 7a28b5ea62 [formerly 7a28b5ea62 [formerly 70f1516d0cc4dcd62214453974f1e65dd57d1ddd]]
Former-commit-id: 708348e9e4
Former-commit-id: 6c719e6fc2
|
2012-02-14 15:47:32 -06:00 |
|
Ben Steffensmeier
|
800e674078
|
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 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]
Former-commit-id: f65d86a06a
Former-commit-id: d00572c122
|
2012-02-14 15:46:11 -06:00 |
|
Steve Harris
|
2a2bffa947
|
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: 3973ed2360 [formerly 3973ed2360 [formerly e8e020e3bd86ffcd918366990d605acee8bd6a80]]
Former-commit-id: 376650ce9d
Former-commit-id: b847ef442c
|
2012-02-14 15:41:54 -06:00 |
|
Ben Steffensmeier
|
cc173f99d2
|
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 97000f0738 [formerly 97000f0738 [formerly 78deeca92b5916c7c57b1f866e9be2e11992c13d]]
Former-commit-id: b080ab8f6c
Former-commit-id: 2e49f3b6aa
|
2012-02-14 15:39:50 -06:00 |
|
Nate Jensen
|
18671bb3e6
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: daeda3f898 [formerly daeda3f898 [formerly 1135f27699b49795352ae5b1b31ac9fe06c564b6]]
Former-commit-id: dd7d200f7f
Former-commit-id: c49691bc7b
|
2012-02-14 13:06:27 -06:00 |
|
Ben Steffensmeier
|
a8b2e65a7c
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 100b4c4ba0 [formerly 100b4c4ba0 [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]]
Former-commit-id: 2995d2b29b
Former-commit-id: 7914496c96
|
2012-02-14 12:59:42 -06:00 |
|
Greg Armendariz
|
0793dc0853
|
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 cb16a5256a [formerly 41ed9251ca6ef83a6de3362c52acaa21dd00da3d]]
Former-commit-id: e3dda29720
Former-commit-id: 7ce17e1234
|
2012-02-13 15:02:29 -06:00 |
|
Bryan Kowal
|
0978aa5d1d
|
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 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]
Former-commit-id: 4faf9831ed
Former-commit-id: eb91bb964e
|
2012-02-13 13:57:10 -06:00 |
|
Nate Jensen
|
ab4ab01dd4
|
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 da7d13d933 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]
Former-commit-id: 06327646d9
Former-commit-id: dd8500b081
|
2012-02-13 11:40:36 -06:00 |
|
Bryan Kowal
|
e40f50ba36
|
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 34d9122f14 [formerly 34d9122f14 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]
Former-commit-id: c77b9558e1
Former-commit-id: 2c3f67d470
|
2012-02-13 10:08:15 -06:00 |
|
Ben Steffensmeier
|
7d16f12962
|
Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: ebbbd0bafc [formerly ebbbd0bafc [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]
Former-commit-id: f7985bff7b
Former-commit-id: a9e13fac26
|
2012-02-10 12:13:34 -06:00 |
|
Bryan Kowal
|
8cef173e1d
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 7ca62dc7d6 [formerly 7ca62dc7d6 [formerly 26243249e27ee347933748aa53e9436e32751d9c]]
Former-commit-id: 1855bbcbee
Former-commit-id: 27c4557e0a
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
7dc74ad29a
|
Issue #202 - fix deploy-install.
Former-commit-id: 0a141d49d0 [formerly 0a141d49d0 [formerly e591702f5c924e5e1ad2e335861867626a24fc2e]]
Former-commit-id: 23f61e0945
Former-commit-id: e85ed4a172
|
2012-02-09 11:28:22 -06:00 |
|
Ben Steffensmeier
|
e1eeef7827
|
Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 5cdcd5a261 [formerly 5cdcd5a261 [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 512e0f1bd5
|
2012-02-09 10:54:02 -06:00 |
|
Bryan Kowal
|
928f6f8362
|
Issue #202 - fix deploy-install.
Former-commit-id: 8a57a8ce05 [formerly 8a57a8ce05 [formerly e8f28b51b70eccdf19de2075a6c5c7efb9ccedda]]
Former-commit-id: 3060ca85cc
Former-commit-id: b26d700ef4
|
2012-02-09 10:41:46 -06:00 |
|
Steve Harris
|
3cbce90726
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 1002555dbd [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]
Former-commit-id: f693b6d0a7
Former-commit-id: f650243958
|
2012-02-09 08:54:18 -06:00 |
|
Steve Harris
|
38ab2acab2
|
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 37ca28aae8 [formerly ea128d2f4d9b676df50ef0d6727ff4f938f1c265]]
Former-commit-id: d7e8c7fc26
Former-commit-id: 4b3c90acde
|
2012-02-09 08:53:53 -06:00 |
|
Ben Steffensmeier
|
6164ad39b6
|
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: 863fa0f635 [formerly 863fa0f635 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]]
Former-commit-id: 3f60daa9c7
Former-commit-id: d49939ddb2
|
2012-02-08 16:29:02 -06:00 |
|
Steve Harris
|
b1bab03dcb
|
Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: 4eef9c3c20 [formerly 4eef9c3c20 [formerly e019344c6f96c6db35ede5985779eab537df523c]]
Former-commit-id: 35cc62582b
Former-commit-id: a6b95a2e81
|
2012-02-08 09:09:28 -06:00 |
|
Matt Nash
|
bbb3cacd0d
|
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: e52a1315b2 [formerly e52a1315b2 [formerly ac489b3dc676f7f202991906e0b004baa074dfe0]]
Former-commit-id: 25b9659dc7
Former-commit-id: 5c10b1d587
|
2012-02-08 08:53:19 -06:00 |
|
Matt Nash
|
7ef7069905
|
Issue #26 fix gage color for hydro to refresh
Former-commit-id: f7652d25e3 [formerly f7652d25e3 [formerly 1a8d135e07c56e8ac202c01e7aa866290b28b0a4]]
Former-commit-id: bb4f690393
Former-commit-id: 82089434e5
|
2012-02-07 16:49:34 -06:00 |
|
Max Schenkelberg
|
e4fca4c6f7
|
Issue #206 fixed dialog context deactivation bug
Former-commit-id: 9535ae2d0e [formerly 9535ae2d0e [formerly b2b66e7483065e9677d8bd34f19b514c7914ef8c]]
Former-commit-id: fe59c3e8d8
Former-commit-id: 9a7efcaae8
|
2012-02-07 16:45:59 -06:00 |
|