Steve Harris
|
07bf1f770d
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 80817ea48545c3315d8445c9acae60b6c92088f7
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
cabf9fd956
|
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
|
6a064cb78b
|
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
|
4b76d22f77
|
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
|
62c587b841
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aaf3d445f517bba03e9f6b768850f2a8c77d26ed
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
10a0ca252d
|
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
|
4276fc2fe8
|
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
|
93f6535bd8
|
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
|
26d82729c9
|
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
|
e2989d1a9f
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: d3ca90194ff9d361ba9ff7679c2f4da43a439de4
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
bdb08a9f4c
|
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
|
c8dba08a9d
|
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
|
28c7e6bc22
|
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
|
2783331dd6
|
Merge commit 'awips2_OB12.1.1_Omaha'
Former-commit-id: b1bce76fd8170d05e57624f969e5293c1257c533
|
2012-02-15 15:45:23 -06:00 |
|
Steve Harris
|
64b3ba9d2b
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 7b981a7bb3e35d9147bf686150e5ed91e5b22d79
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
272ba87883
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 14c8ac5618aa04da5408a1d75297f3f9fa19d023
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
b9f4780fcb
|
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
|
7356d655da
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
05c0347d90
|
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
|
5e47f8c33a
|
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
|
38eb4bd2b6
|
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
|
2119a1513e
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
|
2012-02-14 15:54:46 -06:00 |
|
Steve Harris
|
7a28b5ea62
|
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
|
944e59e989
|
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
|
3973ed2360
|
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
|
97000f0738
|
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
|
daeda3f898
|
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
|
100b4c4ba0
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 32b8f723ebf64d97636705911c0b7b22a9cd2148
|
2012-02-14 12:59:42 -06:00 |
|
David Gillingham
|
bb1ac9959b
|
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
|
cb16a5256a
|
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
|
67562b0674
|
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
|
da7d13d933
|
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
|
34d9122f14
|
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
|
ebbbd0bafc
|
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
|
7ca62dc7d6
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
0a141d49d0
|
Issue #202 - fix deploy-install.
Former-commit-id: e591702f5c924e5e1ad2e335861867626a24fc2e
|
2012-02-09 11:28:22 -06:00 |
|
Ben Steffensmeier
|
5cdcd5a261
|
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
|
8a57a8ce05
|
Issue #202 - fix deploy-install.
Former-commit-id: e8f28b51b70eccdf19de2075a6c5c7efb9ccedda
|
2012-02-09 10:41:46 -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 |
|
Steve Harris
|
37ca28aae8
|
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: ea128d2f4d9b676df50ef0d6727ff4f938f1c265
|
2012-02-09 08:53:53 -06:00 |
|
Ben Steffensmeier
|
863fa0f635
|
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: b7b3a581e8291313833b20da308f5adc5a234f26
|
2012-02-08 16:29:02 -06:00 |
|
Steve Harris
|
4eef9c3c20
|
Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: e019344c6f96c6db35ede5985779eab537df523c
|
2012-02-08 09:09:28 -06:00 |
|
Lee Venable
|
9cc539f8a4
|
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: bc6f1a41c0dee1c2030d1a2c90d337ddef20b36e
|
2012-02-08 09:06:55 -06:00 |
|
Lee Venable
|
a97a61c74c
|
Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge
Former-commit-id: 0693cb12fa60f15dbea2e38347a811b7964ed8fc
|
2012-02-08 09:06:46 -06:00 |
|
Matt Nash
|
e52a1315b2
|
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: ac489b3dc676f7f202991906e0b004baa074dfe0
|
2012-02-08 08:53:19 -06:00 |
|
Matt Nash
|
f7652d25e3
|
Issue #26 fix gage color for hydro to refresh
Former-commit-id: 1a8d135e07c56e8ac202c01e7aa866290b28b0a4
|
2012-02-07 16:49:34 -06:00 |
|
Mike Duff
|
60de2210f5
|
Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds
error
Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7
Former-commit-id: 967c9d38fe967ab02cf620201c4fd9915f7ba3fc
|
2012-02-07 16:46:36 -06:00 |
|
Max Schenkelberg
|
9535ae2d0e
|
Issue #206 fixed dialog context deactivation bug
Former-commit-id: b2b66e7483065e9677d8bd34f19b514c7914ef8c
|
2012-02-07 16:45:59 -06:00 |
|
Steve Harris
|
64295a4ab4
|
Merge "Issue #16 - data/manual now uses subdirectories (2)" into 9-Wes2Bridge
Former-commit-id: bad345b999d31c31ff34669b8664afb8f907460f
|
2012-02-07 16:36:34 -06:00 |
|
Mike Duff
|
97d5923be9
|
Issue #16 - data/manual now uses subdirectories (2)
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: 627d7e59756a5cb27a450d8839e62a9bb9995a56
|
2012-02-07 16:30:13 -06:00 |
|