Commit graph

13 commits

Author SHA1 Message Date
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
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
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
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
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
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
Ben Steffensmeier
0873a518c6 Issue #235 Ability to screen capture or print multiple frames at once.
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7

Former-commit-id: e904dadb5e [formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]
Former-commit-id: c74dae631e
2012-02-07 15:33:23 -06:00
Matt Nash
ef18b8c47f Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
Former-commit-id: f4c5d7f94b [formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]
Former-commit-id: 28e3da498e
2012-02-07 11:45:28 -06:00
Matt Nash
3b247ad783 Issue #206 radio buttons only select one at a time
Former-commit-id: 5094c1ec1c [formerly 38de69ea29c429a2295518fb9d8c1707efe1d3c4]
Former-commit-id: c8365fa660
2012-01-27 11:50:34 -06:00
Ben Steffensmeier
0e27eeebf6 Issue #199 Do not endFrame for panes which are not drawn. This prevents
gl from swapping buffers which leads to a flicker on intel graphics
cards.

Former-commit-id: 6cbe5bbf71 [formerly 05ac4ac87d5371cabc91d82322b2c9728373e8b1]
Former-commit-id: 0f906ac4d5
2012-01-26 15:20:56 -06:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00