Steve Harris
|
2ffbfd0181
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: ef21df5086 [formerly 07bf1f770d] [formerly ebf5e8360e [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]
Former-commit-id: ebf5e8360e
Former-commit-id: 5bc52de24a
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
b12f5e5d75
|
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: d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
b41e5f2415
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: a2fd2cf6fa [formerly 6a064cb78b] [formerly d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: d02529fef4
Former-commit-id: d133454b27
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
dd911bed4d
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
b609a6fd60
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e3535054ff [formerly 62c587b841] [formerly c825bd03a2 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]
Former-commit-id: c825bd03a2
Former-commit-id: 0fab56e0f1
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
cc8c6597a2
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
8a71854fe1
|
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: d4b76c1057 [formerly 4276fc2fe8] [formerly 9f1b7a613a [formerly 1ec51accade835c1133eac9222131f9186985053]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 38ccaf882b
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
1ac6b36d1f
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
|
2012-02-17 10:55:02 -06:00 |
|
Ben Steffensmeier
|
ea93dcd939
|
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 38993f5a5a [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: d4e7df98a9
|
2012-02-16 16:36:56 -06:00 |
|
Steve Harris
|
840c858697
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c26a22cfb7 [formerly e2989d1a9f] [formerly 64ddef69b6 [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]
Former-commit-id: 64ddef69b6
Former-commit-id: ff45f4eaab
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
9a8dd201c5
|
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: c20df8b229 [formerly bdb08a9f4c] [formerly 642ad4e9b0 [formerly 712f278a25a67d3d05375213b4d5bc8e7743aaa9]]
Former-commit-id: 642ad4e9b0
Former-commit-id: 051e8faf55
|
2012-02-16 14:00:33 -06:00 |
|
Bryan Kowal
|
e4da2bcb9c
|
Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: 2ce7c520b3 [formerly c8dba08a9d] [formerly 4888756560 [formerly d3affc909e299af8826d16bc02754fc61754e287]]
Former-commit-id: 4888756560
Former-commit-id: 71fe94b322
|
2012-02-16 12:51:24 -06:00 |
|
Ben Steffensmeier
|
7de650c868
|
Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 0104e1970d [formerly 28c7e6bc22] [formerly 8cf7360e3b [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]
Former-commit-id: 8cf7360e3b
Former-commit-id: b819bfa8e9
|
2012-02-15 17:10:34 -06:00 |
|
Steve Harris
|
a2850d9280
|
Merge commit 'awips2_OB12.1.1_Omaha'
Former-commit-id: 296ce23f5f [formerly 2783331dd6] [formerly 1909537682 [formerly b1bce76fd8170d05e57624f969e5293c1257c533]]
Former-commit-id: 1909537682
Former-commit-id: 3c3eebfd0e
|
2012-02-15 15:45:23 -06:00 |
|
Steve Harris
|
96c7c9acf8
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 5e2b2ddc22 [formerly 64b3ba9d2b] [formerly 09c3e613e5 [formerly 7b981a7bb3e35d9147bf686150e5ed91e5b22d79]]
Former-commit-id: 09c3e613e5
Former-commit-id: 17c9ad4c0c
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
4e6af98f5b
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 68a5ebc0ad [formerly 272ba87883] [formerly c1129dbd00 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]
Former-commit-id: c1129dbd00
Former-commit-id: ad402655f4
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
a85a777232
|
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: 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: 23cc9689de
Former-commit-id: a2e3aabc60
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
de85613a99
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 1707b98721
Former-commit-id: db1e3b1215
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
780b0c9592
|
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: d84f7061f7 [formerly 05c0347d90] [formerly 86a0e3f5ee [formerly f83e2bd22a74e9604fb878a899d9a2df5fbb28eb]]
Former-commit-id: 86a0e3f5ee
Former-commit-id: 72466ef0ca
|
2012-02-15 14:26:22 -06:00 |
|
Steve Harris
|
98b223d08e
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]
Former-commit-id: a91b01bfbe
Former-commit-id: 39b13d7102
|
2012-02-15 12:54:54 -06:00 |
|
Bryan Kowal
|
134b8f2915
|
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: 2fabaff1d9 [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]
Former-commit-id: 521756e57e
Former-commit-id: 1c023403e2
|
2012-02-15 10:31:58 -06:00 |
|
Steve Harris
|
d23d12d596
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 46dda7b8bd [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: cb3371ee28
|
2012-02-14 15:54:46 -06:00 |
|
Steve Harris
|
77d083d6fa
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 7911304736 [formerly 7a28b5ea62] [formerly 708348e9e4 [formerly 70f1516d0cc4dcd62214453974f1e65dd57d1ddd]]
Former-commit-id: 708348e9e4
Former-commit-id: 6c719e6fc2
|
2012-02-14 15:47:32 -06:00 |
|
Ben Steffensmeier
|
993f2aafa4
|
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: 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]
Former-commit-id: f65d86a06a
Former-commit-id: d00572c122
|
2012-02-14 15:46:11 -06:00 |
|
Steve Harris
|
0b936af499
|
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: 1d7daf3576 [formerly 3973ed2360] [formerly 376650ce9d [formerly e8e020e3bd86ffcd918366990d605acee8bd6a80]]
Former-commit-id: 376650ce9d
Former-commit-id: b847ef442c
|
2012-02-14 15:41:54 -06:00 |
|
Ben Steffensmeier
|
ed952e100a
|
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 8561802d14 [formerly 97000f0738] [formerly b080ab8f6c [formerly 78deeca92b5916c7c57b1f866e9be2e11992c13d]]
Former-commit-id: b080ab8f6c
Former-commit-id: 2e49f3b6aa
|
2012-02-14 15:39:50 -06:00 |
|
Nate Jensen
|
b0819f7828
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 27c3458b5e [formerly daeda3f898] [formerly dd7d200f7f [formerly 1135f27699b49795352ae5b1b31ac9fe06c564b6]]
Former-commit-id: dd7d200f7f
Former-commit-id: c49691bc7b
|
2012-02-14 13:06:27 -06:00 |
|
Ben Steffensmeier
|
132f023a06
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: e2141b574e [formerly 100b4c4ba0] [formerly 2995d2b29b [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]]
Former-commit-id: 2995d2b29b
Former-commit-id: 7914496c96
|
2012-02-14 12:59:42 -06:00 |
|
David Gillingham
|
3e42bc7d2d
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: 535821e5b8 [formerly bb1ac9959b] [formerly 061966f243 [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: 061966f243
Former-commit-id: 9f416558fa
|
2012-02-13 16:09:36 -06:00 |
|
Greg Armendariz
|
22b4dd70e8
|
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: fd72f98fc2 [formerly cb16a5256a] [formerly e3dda29720 [formerly 41ed9251ca6ef83a6de3362c52acaa21dd00da3d]]
Former-commit-id: e3dda29720
Former-commit-id: 7ce17e1234
|
2012-02-13 15:02:29 -06:00 |
|
Bryan Kowal
|
0bf4fecb62
|
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: c78e988d55 [formerly 67562b0674] [formerly 4faf9831ed [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]
Former-commit-id: 4faf9831ed
Former-commit-id: eb91bb964e
|
2012-02-13 13:57:10 -06:00 |
|
Nate Jensen
|
ce7e58062c
|
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: 364cd8f5fc [formerly da7d13d933] [formerly 06327646d9 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]
Former-commit-id: 06327646d9
Former-commit-id: dd8500b081
|
2012-02-13 11:40:36 -06:00 |
|
Bryan Kowal
|
ef4218bdb0
|
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 8e552ca56f [formerly 34d9122f14] [formerly c77b9558e1 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]
Former-commit-id: c77b9558e1
Former-commit-id: 2c3f67d470
|
2012-02-13 10:08:15 -06:00 |
|
Ben Steffensmeier
|
99557a2a0f
|
Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: 6e95175ba2 [formerly ebbbd0bafc] [formerly f7985bff7b [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]
Former-commit-id: f7985bff7b
Former-commit-id: a9e13fac26
|
2012-02-10 12:13:34 -06:00 |
|
Bryan Kowal
|
88b67b4977
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: a19dd6ff33 [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 26243249e27ee347933748aa53e9436e32751d9c]]
Former-commit-id: 1855bbcbee
Former-commit-id: 27c4557e0a
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
49f5a054e0
|
Issue #202 - fix deploy-install.
Former-commit-id: 8d76a78c47 [formerly 0a141d49d0] [formerly 23f61e0945 [formerly e591702f5c924e5e1ad2e335861867626a24fc2e]]
Former-commit-id: 23f61e0945
Former-commit-id: e85ed4a172
|
2012-02-09 11:28:22 -06:00 |
|
Ben Steffensmeier
|
9d442083a1
|
Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 08e8343d98 [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 512e0f1bd5
|
2012-02-09 10:54:02 -06:00 |
|
Bryan Kowal
|
8219ef7ce6
|
Issue #202 - fix deploy-install.
Former-commit-id: 0953a705b3 [formerly 8a57a8ce05] [formerly 3060ca85cc [formerly e8f28b51b70eccdf19de2075a6c5c7efb9ccedda]]
Former-commit-id: 3060ca85cc
Former-commit-id: b26d700ef4
|
2012-02-09 10:41:46 -06:00 |
|
Steve Harris
|
93e856457b
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 695e2979c3 [formerly 1002555dbd] [formerly f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]
Former-commit-id: f693b6d0a7
Former-commit-id: f650243958
|
2012-02-09 08:54:18 -06:00 |
|
Steve Harris
|
be7c691383
|
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: e3b4b09cbe [formerly 37ca28aae8] [formerly d7e8c7fc26 [formerly ea128d2f4d9b676df50ef0d6727ff4f938f1c265]]
Former-commit-id: d7e8c7fc26
Former-commit-id: 4b3c90acde
|
2012-02-09 08:53:53 -06:00 |
|
Ben Steffensmeier
|
b09c00244e
|
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: ddd5ee68ad [formerly 863fa0f635] [formerly 3f60daa9c7 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]]
Former-commit-id: 3f60daa9c7
Former-commit-id: d49939ddb2
|
2012-02-08 16:29:02 -06:00 |
|
Steve Harris
|
c2603de1b8
|
Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: ece695a374 [formerly 4eef9c3c20] [formerly 35cc62582b [formerly e019344c6f96c6db35ede5985779eab537df523c]]
Former-commit-id: 35cc62582b
Former-commit-id: a6b95a2e81
|
2012-02-08 09:09:28 -06:00 |
|
Lee Venable
|
724db373e9
|
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: 65cf18fcbe [formerly 9cc539f8a4] [formerly db74c784d6 [formerly bc6f1a41c0dee1c2030d1a2c90d337ddef20b36e]]
Former-commit-id: db74c784d6
Former-commit-id: 74cd5a6f0b
|
2012-02-08 09:06:55 -06:00 |
|
Lee Venable
|
34af1403bb
|
Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge
Former-commit-id: 868c1517c1 [formerly a97a61c74c] [formerly 225aadb85b [formerly 0693cb12fa60f15dbea2e38347a811b7964ed8fc]]
Former-commit-id: 225aadb85b
Former-commit-id: ead1c644fd
|
2012-02-08 09:06:46 -06:00 |
|
Matt Nash
|
6e11115195
|
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: ce5baf0632 [formerly e52a1315b2] [formerly 25b9659dc7 [formerly ac489b3dc676f7f202991906e0b004baa074dfe0]]
Former-commit-id: 25b9659dc7
Former-commit-id: 5c10b1d587
|
2012-02-08 08:53:19 -06:00 |
|
Matt Nash
|
d3433544ab
|
Issue #26 fix gage color for hydro to refresh
Former-commit-id: c4fee978d7 [formerly f7652d25e3] [formerly bb4f690393 [formerly 1a8d135e07c56e8ac202c01e7aa866290b28b0a4]]
Former-commit-id: bb4f690393
Former-commit-id: 82089434e5
|
2012-02-07 16:49:34 -06:00 |
|
Mike Duff
|
2300b2e6c7
|
Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds
error
Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7
Former-commit-id: 504fdc8cf8 [formerly 60de2210f5] [formerly d8d84fbe2e [formerly 967c9d38fe967ab02cf620201c4fd9915f7ba3fc]]
Former-commit-id: d8d84fbe2e
Former-commit-id: 846110bac4
|
2012-02-07 16:46:36 -06:00 |
|
Max Schenkelberg
|
0c4a9cf58a
|
Issue #206 fixed dialog context deactivation bug
Former-commit-id: d5369932fd [formerly 9535ae2d0e] [formerly fe59c3e8d8 [formerly b2b66e7483065e9677d8bd34f19b514c7914ef8c]]
Former-commit-id: fe59c3e8d8
Former-commit-id: 9a7efcaae8
|
2012-02-07 16:45:59 -06:00 |
|
Steve Harris
|
8384400190
|
Merge "Issue #16 - data/manual now uses subdirectories (2)" into 9-Wes2Bridge
Former-commit-id: 0d5ce3a848 [formerly 64295a4ab4] [formerly 127aee04f8 [formerly bad345b999d31c31ff34669b8664afb8f907460f]]
Former-commit-id: 127aee04f8
Former-commit-id: 2f928d6d77
|
2012-02-07 16:36:34 -06:00 |
|
Mike Duff
|
edaff0b763
|
Issue #16 - data/manual now uses subdirectories (2)
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: d3f58a0bf6 [formerly 97d5923be9] [formerly f194c39a7f [formerly 627d7e59756a5cb27a450d8839e62a9bb9995a56]]
Former-commit-id: f194c39a7f
Former-commit-id: 122937e1b2
|
2012-02-07 16:30:13 -06:00 |
|