Bryan Kowal
f528e10391
Merge branch '11-Collaboration' into development
...
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e117e495d669e310839bc9ff8e1e8207b03491b
2012-06-18 11:16:28 -05:00
Steve Harris
092efd6072
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: f98354aae305ad227eaf3b36e4393b8aefc80f02
2012-05-09 13:19:47 -05:00
Steve Harris
27bc369818
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
2012-05-09 13:14:00 -05:00
David Gillingham
c28bfaddee
Issue #562 : Rename QPFRecord getters and setters to match Java-naming
...
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: fe6ec52b4cf64d410f3de609b06cf9666a5936bc
2012-04-27 12:43:04 -05:00
Steve Harris
67a5a68300
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Matt Nash
3c2fcc59d0
Issue #429 working telestration collaboration capabilities
...
Former-commit-id: f1c9552a757e7d194e31ed9786cb358c53e631b7
2012-04-04 11:23:34 -05:00
Max Schenkelberg
9535ae2d0e
Issue #206 fixed dialog context deactivation bug
...
Former-commit-id: b2b66e7483065e9677d8bd34f19b514c7914ef8c
2012-02-07 16:45:59 -06:00
Max Schenkelberg
370e20f0ae
Issue #206 - Fixed loading and disposing bugs in tear off menus
...
Issue #206 Fixed bugs in maps menu and other dynamically created menus
Former-commit-id: 875c90104e80d95798956330e24b59d83ef52942
2012-02-07 16:12:19 -06:00
Matt Nash
542049e455
Issue #26 tear off menu changes to fix issues
...
Former-commit-id: 30c43cbcd4500c5754261b420f5c9b031bd63014
2012-02-03 13:13:15 -06:00
Max Schenkelberg
f131667c9e
Issue #29 Fixed issue with radar menu dispose
...
Former-commit-id: 279c4037f9f6fbefe53bc12cbf82017daa3399d2
2012-02-02 16:53:53 -06:00
Matt Nash
c966b7d8fd
Issue #26 radio buttons hopefully gerrit doesn't screw this up
...
Change-Id: I5ebc3356f83b3f5eb213cb659badd5ae93694d11
Former-commit-id: c03b20a3c52a7570133a972a8c915bffd167f733
2012-02-02 15:32:33 -06:00
Max Schenkelberg
84ead088ca
Issue #206 Fixed issue with local radar menu items getting disposed
...
Former-commit-id: 07b72ce297ec52811439d03b4e753f5959eeb532
2012-02-02 14:24:19 -06:00
Matt Nash
4ee3ccb133
Issue #26 fix the issue with the checkboxes out of sync
...
Change-Id: Ibeb05ddfc4a495d3d56a9d3c6bcc64c3494e3d32
Former-commit-id: b1032a5a6bf24fcc4a0cf48ad6f2955adcaf0480
2012-02-01 17:32:51 -06:00
Matt Nash
54d27a840f
Merge "Issue #206 Made tear off menu dialog activate contexts for perspective" into 10-Tech_Blocked
...
Former-commit-id: 1ca26738cc10a37119b939a405987198245a4d65
2012-02-01 17:13:10 -06:00
Max Schenkelberg
5f8d30bb43
Issue #206 Made tear off menu dialog activate contexts for perspective
...
Former-commit-id: 56103eb133de5325d62bb3453b2353e5d5e23ddd
2012-02-01 17:03:20 -06:00
Matt Nash
75d6af1ab9
Issue #206 radio buttons ready to update when menu is clicked
...
Change-Id: I8218e920bb3221e986d4698771d3199398cb655f
Former-commit-id: cda41b60a0189c5320fa8a1236a936910f1e98d4
2012-02-01 14:07:50 -06:00
Matt Nash
5094c1ec1c
Issue #206 radio buttons only select one at a time
...
Former-commit-id: 38de69ea29c429a2295518fb9d8c1707efe1d3c4
2012-01-27 11:50:34 -06:00
Matt Nash
047e9e132f
Issue #208 removing check boxes so they will not be out of sync
...
Former-commit-id: 3eff5c38fe6a20aa3c0dd02e84a5f1a0e6340ef4
2012-01-27 08:10:04 -06:00
Matt Nash
cf203980a9
Issue #26 removing the svn files from the repo
...
Former-commit-id: 77197fdc91d5ece9c15f31e9203998d1ef510c7c
2012-01-25 17:17:46 -06:00
Matt Nash
cf4e1f764e
Issue #26 add tear off code to git baseline
...
Former-commit-id: dedac216cfa51bd413f7c4d1f7db5ee8ce665866
2012-01-25 12:50:31 -06:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
