mjames-upc
|
8617546c0d
|
build updates: removed date-defined directories from various spec files. we now organize static files without version defintions. also increment UPC build to 14.4.1
Former-commit-id: d7731b8dd0
|
2015-01-26 12:20:06 -07:00 |
|
Ana Rivera
|
44072b0866
|
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
Former-commit-id: 7fede56575 [formerly f565ef4315] [formerly 171a38175c] [formerly 7fede56575 [formerly f565ef4315] [formerly 171a38175c] [formerly dee10b3f6f [formerly 171a38175c [formerly 6c72e1864ad5843c4ac42a558b589777af047c77]]]]
Former-commit-id: dee10b3f6f
Former-commit-id: b981134585 [formerly 0b7f2e3dd7] [formerly 73d372382464f0d95ca76f6725272dcc04255859 [formerly 7f3230cab2]]
Former-commit-id: 9984a75c46df5d906292ef893c7c7a38eac6de4b [formerly 4b2580bacc]
Former-commit-id: be37ebdc3e
|
2015-01-26 19:04:54 +00:00 |
|
mjames-upc
|
37f9e0cffb
|
topo RPM spec file updated to use existing topographic files. new topo files are not being proivided by NWS in the source code repos.
Former-commit-id: 9f0e4437e3
|
2015-01-26 12:04:24 -07:00 |
|
Ana Rivera
|
854a203107
|
Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]]
Former-commit-id: 7c25945fd9
Former-commit-id: cecf9e2ef6 [formerly d6630d8f35] [formerly 0612a8075112c53ca561737244fdc42031bbb44c [formerly eae1bd317d]]
Former-commit-id: bb15a8f43d38e1956b090806df98b75978f14292 [formerly cd2841195b]
Former-commit-id: aa04bff454
|
2015-01-26 18:45:26 +00:00 |
|
Shawn.Hooper
|
4669314ed9
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: ee48ce9e68 [formerly e6c4f29036] [formerly 568b7c801a] [formerly ee48ce9e68 [formerly e6c4f29036] [formerly 568b7c801a] [formerly e84a037b2e [formerly 568b7c801a [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]]]
Former-commit-id: e84a037b2e
Former-commit-id: 7b6c631780 [formerly 9cc09ab18e] [formerly 0a8001cae9c65d8820ca558d173024196b8d92be [formerly 735893aab0]]
Former-commit-id: 5f80eb11138952b36683d3184c8f43ef25421f01 [formerly bbaebe4fc0]
Former-commit-id: a5b70920fd
|
2015-01-26 11:22:49 -05:00 |
|
Nate Jensen
|
2e2869bf7b
|
Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 6de7f4d2c8 [formerly 7e8d355f62] [formerly 63189329a1] [formerly 6de7f4d2c8 [formerly 7e8d355f62] [formerly 63189329a1] [formerly c4598baf19 [formerly 63189329a1 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]]]
Former-commit-id: c4598baf19
Former-commit-id: 7c77a1877e [formerly 4672329a75] [formerly 4cd9a8b2e97217fb2f5ad101996cb66bf394e504 [formerly dead055dca]]
Former-commit-id: 37411debd3ddda5a3b867db46ce99859bbea3cad [formerly 4d96b2a212]
Former-commit-id: df3d12c6c4
|
2015-01-26 09:10:36 -06:00 |
|
steve.naples
|
16afd1cbfd
|
ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 8d7fdfae67 [formerly 6811eb83a7] [formerly 6488242165] [formerly 8d7fdfae67 [formerly 6811eb83a7] [formerly 6488242165] [formerly 540ea64498 [formerly 6488242165 [formerly 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3]]]]
Former-commit-id: 540ea64498
Former-commit-id: cd5a0b8843 [formerly 7287103c0d] [formerly 6c3edfceb91b218447b84c049d8cf0c0e0d47e2e [formerly b2b9d3905d]]
Former-commit-id: 1a5cda28c5d25a3b402a8593b82f6fe749b9470b [formerly df1504f781]
Former-commit-id: 5734b0f998
|
2015-01-23 20:40:48 +00:00 |
|
Nate Jensen
|
6b23bfa212
|
Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 415e2d4035 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: f620816ff6 [formerly 60227bcce2] [formerly fa9b8bec1651fe83a3d02c9e7afad132bb18e9fd [formerly c991d85bfd]]
Former-commit-id: c508c91675b2a9810f26c1958ae01de48b1b1c59 [formerly 9f82d7af10]
Former-commit-id: 5db9791b67
|
2015-01-23 12:57:24 -06:00 |
|
AWIPS User
|
8d947f3af8
|
Merge branch 'upc' of github.com:Unidata/awips2 into upc
Former-commit-id: c4e6ea09dc
|
2015-01-23 11:22:42 -07:00 |
|
AWIPS User
|
047d3e358a
|
debugging createRbd to find where it's setting GeoPolitical as single resource for all panes other than first
Former-commit-id: f98f1dfa7b
|
2015-01-23 11:22:24 -07:00 |
|
Steve Harris
|
936834331d
|
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]]
Former-commit-id: 0f05c53a53
Former-commit-id: c6bb3f9f17 [formerly 5fda208a17] [formerly fd646e3ab88985355fb86128bc69473ecf242072 [formerly 033d0fc742]]
Former-commit-id: 10bac022834ddaeda42626dd3c8c191014cda5e8 [formerly c3d3d5f424]
Former-commit-id: fcdd2faaf1
|
2015-01-23 09:08:06 -06:00 |
|
Ana Rivera
|
5c27319de8
|
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 5cde6832a1 [formerly de1b989253] [formerly 705f02f2be] [formerly 5cde6832a1 [formerly de1b989253] [formerly 705f02f2be] [formerly 44fa40c0cc [formerly 705f02f2be [formerly 653472d785f4af6fef8f2edd93c2e538806096ab]]]]
Former-commit-id: 44fa40c0cc
Former-commit-id: 275832ced4 [formerly 87f986052e] [formerly e4fe3b35e0ee2240d735a1102d99f91917fd313f [formerly d8f7ae400c]]
Former-commit-id: b7f388c6dd53acf218a640b10e856104eced3381 [formerly f254d7d626]
Former-commit-id: c3ce42f75b
|
2015-01-23 14:21:22 +00:00 |
|
Richard Peter
|
20a83b566c
|
Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
Former-commit-id: 8b7354bcc9 [formerly 4e80bdbd9e] [formerly cc69519ce9] [formerly 8b7354bcc9 [formerly 4e80bdbd9e] [formerly cc69519ce9] [formerly d7f79b859b [formerly cc69519ce9 [formerly 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5]]]]
Former-commit-id: d7f79b859b
Former-commit-id: 8f772da403 [formerly dcf2085324] [formerly 656961d6839a397efdb34f2186e3d7e6e51db637 [formerly 9d1f4ee011]]
Former-commit-id: 9090ba82409ce8998a767318458cc407d02d5b58 [formerly 85aa9fb637]
Former-commit-id: c9f7f32c39
|
2015-01-22 19:13:09 -06:00 |
|
mjames-upc
|
4975269b01
|
mute updateAreaGui() and unmute selectUngroupedGrp() for Bundle loader
Former-commit-id: 54148bdaab
|
2015-01-22 17:15:44 -07:00 |
|
Mark Peters
|
eaabf1281f
|
Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: e668bf77ff [formerly 30229a25f2] [formerly db69f5a0bc] [formerly e668bf77ff [formerly 30229a25f2] [formerly db69f5a0bc] [formerly 7a69f354d9 [formerly db69f5a0bc [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]]]
Former-commit-id: 7a69f354d9
Former-commit-id: 5e30a9a2b6 [formerly a176434c41] [formerly 07d7a446e738af0ab58692a612f9120d7eb946e5 [formerly 32dbdc345f]]
Former-commit-id: 31efce86df88c8f1123b2acdeb12548a1dbbff0b [formerly c6fd704642]
Former-commit-id: 841bf0150c
|
2015-01-22 18:05:40 -06:00 |
|
Daniel.Huffman
|
73102ace30
|
ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: 6fb4fb0a86 [formerly f4ac238888] [formerly 845998cbfa] [formerly 6fb4fb0a86 [formerly f4ac238888] [formerly 845998cbfa] [formerly a25fa81a0f [formerly 845998cbfa [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]]]]
Former-commit-id: a25fa81a0f
Former-commit-id: 4016a67784 [formerly c5a37c5e9c] [formerly 2ecdbdf6e033350398bbc752412af08a872eb9a3 [formerly 1fe93bcfa4]]
Former-commit-id: ea10d3102950fc8fe0eea40cf7c696cca16e24e7 [formerly ce963e91fa]
Former-commit-id: 8367208ad3
|
2015-01-22 21:13:04 +00:00 |
|
Shawn.Hooper
|
5975cc78ca
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 161ca595a2 [formerly 095a22f5e3] [formerly 314a8497f8] [formerly 161ca595a2 [formerly 095a22f5e3] [formerly 314a8497f8] [formerly 37c89530a6 [formerly 314a8497f8 [formerly 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6]]]]
Former-commit-id: 37c89530a6
Former-commit-id: 180e03947e [formerly dfd04fec4a] [formerly fd4c49437203ca206a956862d2067c327b748371 [formerly c012f464c9]]
Former-commit-id: 6c3eda46fc47f09791dc040f396679c86dc34dc8 [formerly 03fd6d11c5]
Former-commit-id: eefc3bd57d
|
2015-01-22 16:05:52 -05:00 |
|
Shawn.Hooper
|
9f0698b631
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: eefaa49d44 [formerly 7839dab5e6] [formerly 0bc501bd4c] [formerly eefaa49d44 [formerly 7839dab5e6] [formerly 0bc501bd4c] [formerly a757b55446 [formerly 0bc501bd4c [formerly d53c809149da23fcae51138cc45c57aecd641794]]]]
Former-commit-id: a757b55446
Former-commit-id: ef1b152502 [formerly e110ee143a] [formerly 846a085e02ef123cf22a20cfcdcee3365bcca4dd [formerly 6cf71bae0e]]
Former-commit-id: 58d82a3f83ab66bcc80a9c33364bdb69623a3f39 [formerly 953b71a3f8]
Former-commit-id: c1555d3133
|
2015-01-22 16:05:41 -05:00 |
|
Dave Hladky
|
6985032d53
|
Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: 41b0ae02d4 [formerly 5fd928ec4c] [formerly c1127b066f] [formerly 41b0ae02d4 [formerly 5fd928ec4c] [formerly c1127b066f] [formerly a15e67385a [formerly c1127b066f [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]]]
Former-commit-id: a15e67385a
Former-commit-id: 2f08dfbf3e [formerly f3f75d02dc] [formerly 0bf5d5a434338e257aeafca2d123106930c0f48c [formerly 92fbbea65a]]
Former-commit-id: 0c2236b2083d3ee6b73a340e89ad9ac1eee9dcd0 [formerly 60efde53e6]
Former-commit-id: 9af205777f
|
2015-01-22 13:22:18 -06:00 |
|
AWIPS User
|
4a6eab4f2f
|
Bundle loader edits: default max panes now 3x3.
Former-commit-id: 81d22738a6
|
2015-01-22 09:52:38 -07:00 |
|
AWIPS User
|
146780be35
|
OverlayMenu clean up for exception thrown after resource removed from resourceList
Former-commit-id: 4011a95084
|
2015-01-22 09:51:13 -07:00 |
|
Ana Rivera
|
9904690cc4
|
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 74d095524e [formerly 4f8900fd23] [formerly 7b47ffe362] [formerly 74d095524e [formerly 4f8900fd23] [formerly 7b47ffe362] [formerly 18b9d5d163 [formerly 7b47ffe362 [formerly 8a66266d3ffa236343f14089d7e7b32c1060f9ea]]]]
Former-commit-id: 18b9d5d163
Former-commit-id: 5ebc861896 [formerly fc805be80c] [formerly 996ed4f3c67f394d4bacbdbf1c0b919a2dd71997 [formerly fd0aa2624d]]
Former-commit-id: c89c384293baa5eba7cd2e962a8ab24136efe30f [formerly c63a8aa667]
Former-commit-id: 77a8e4a612
|
2015-01-22 16:11:44 +00:00 |
|
AWIPS User
|
8dba3b3d67
|
NCP overlay menu reconfig to allow toggle/unload. Muted a number of NC-specific overlay resources.
Former-commit-id: 018a9434dc
|
2015-01-21 18:57:43 -07:00 |
|
mjames-upc
|
5ebdb88a2e
|
resourceMapName added to OVERLAY JAXB files, mods made to NCP overlay menu and action classes to allow load/unload and checkbox toggle.
Former-commit-id: 7319647733
|
2015-01-21 16:13:06 -07:00 |
|
Shawn.Hooper
|
fc4473c08a
|
ASM #17054 - Disable MRMS Menu in 14.3.1
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0
Former-commit-id: 6ce0645ce9 [formerly 9e83601505] [formerly bd5dfed072] [formerly 6ce0645ce9 [formerly 9e83601505] [formerly bd5dfed072] [formerly d0b7b06d97 [formerly bd5dfed072 [formerly 7f6638dd595b99d6592c58af42f898e0f1b2a02a]]]]
Former-commit-id: d0b7b06d97
Former-commit-id: e0efc469ad [formerly 6f389bd80c] [formerly 6cc36c12fc5dfa04a527ad1dbc3c03b38b5d90d3 [formerly dcf95652a7]]
Former-commit-id: bac7039cc7209620970b4b851faefea252d74872 [formerly ac799987e3]
Former-commit-id: 0a224087c8
|
2015-01-21 12:44:47 -05:00 |
|
Juliya Dynina
|
34f6597f89
|
Merge "ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's" into asm_14.3.1
Former-commit-id: 7860814fa2 [formerly a72a325521] [formerly 64d09c6982] [formerly 7860814fa2 [formerly a72a325521] [formerly 64d09c6982] [formerly 7dfa9e281b [formerly 64d09c6982 [formerly 61f9feec5bf02baefbef740cc16cbc90688242ad]]]]
Former-commit-id: 7dfa9e281b
Former-commit-id: f161352329 [formerly 91e868e9fc] [formerly b3502b003d1c26fc9c159990b4c3fbbbe0b5fb30 [formerly 2c3d52ed49]]
Former-commit-id: 5fa7f2dcd57b5a3f0295c55ef3edde80fb1e8ce3 [formerly 6363ad547e]
Former-commit-id: 190629173a
|
2015-01-21 09:08:36 -05:00 |
|
mjames-upc
|
6d2d4dd2c5
|
didn't get very far with this
Former-commit-id: 641da409b6
|
2015-01-20 17:07:58 -07:00 |
|
Qinglu.Lin
|
635359c75a
|
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: fe02279038 [formerly 761fc43aad] [formerly 94ee166aa1] [formerly fe02279038 [formerly 761fc43aad] [formerly 94ee166aa1] [formerly 30b5bc6a62 [formerly 94ee166aa1 [formerly d4e1fca39f82eb39fc911c091eb579a785a6cef9]]]]
Former-commit-id: 30b5bc6a62
Former-commit-id: bd61990f6d [formerly 2158f4d56b] [formerly 77629661f93a8b4db08c266b9e172fdcfbe7a3fe [formerly b85e72b5f8]]
Former-commit-id: c04dc62d08584f97f2852e80121a26f50869ed9f [formerly 1b6728d236]
Former-commit-id: 4d81846dd1
|
2015-01-20 16:20:58 -05:00 |
|
AWIPS User
|
76ddb73953
|
Commit for working OverlayMap toggle, which is horribly slow due to recreating each ResourcePair
Former-commit-id: 8ed349b0c3
|
2015-01-20 12:20:22 -07:00 |
|
Nate Jensen
|
c44537ed72
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 3bcd3a5d40 [formerly 7a10bd5620] [formerly bfcb36eeac] [formerly 3bcd3a5d40 [formerly 7a10bd5620] [formerly bfcb36eeac] [formerly ac9d787a26 [formerly bfcb36eeac [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]]
Former-commit-id: ac9d787a26
Former-commit-id: a19eef1d8a [formerly 74e207f306] [formerly 95e99af7a1db07abbf85ec2b55d69d333cf1a06f [formerly 0b9a5965a0]]
Former-commit-id: 4aceaa5766a0ba388f2e6d517429b5c1cb19738e [formerly 86868080c3]
Former-commit-id: 1915c27938
|
2015-01-20 11:52:37 -06:00 |
|
mjames-upc
|
d739b481b5
|
reolved overlayName in perspective plugin. still dealing with getName vs. ResourceName inconsistency
Former-commit-id: 9e685ac587
|
2015-01-16 15:38:34 -07:00 |
|
mjames-upc
|
b773f9b88d
|
maps update, new parameter added to overlay and perspective plugin.xml files
Former-commit-id: 1c37f8cb6a
|
2015-01-16 13:40:21 -07:00 |
|
AWIPS User
|
51d493ee35
|
title bar string change CAVE -> AWIPS II
Former-commit-id: 55f0ac0a20
|
2015-01-16 10:25:42 -07:00 |
|
AWIPS User
|
b9b2cf08fc
|
overlay menu now toggling but still setChecked() is not taking because of simple vs full resource definition name
Former-commit-id: 68a3592fad
|
2015-01-16 10:25:28 -07:00 |
|
Fay.Liang
|
23addf144c
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: d79eeafee0 [formerly 09d7176332] [formerly 7c3be2689c] [formerly d79eeafee0 [formerly 09d7176332] [formerly 7c3be2689c] [formerly 7ef58758ec [formerly 7c3be2689c [formerly 3f4dada7ef6880e8f6b07f208aeee8ce407e606c]]]]
Former-commit-id: 7ef58758ec
Former-commit-id: eccd4b3bb8 [formerly 446ee6238d] [formerly ae5ed6798a7ffcdba4042a8e3d4584b8c751ee9e [formerly 001ac4294c]]
Former-commit-id: e3181834e1a5054b86330527f74510d2c9b15105 [formerly 3b69dd0a2f]
Former-commit-id: 8b4e19c264
|
2015-01-16 09:00:03 -05:00 |
|
Michael Gamazaychikov
|
e90088526c
|
ASM #17035 - TextWS locks up when running spell checker.
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3
Former-commit-id: f838759303 [formerly 3465706d3b] [formerly a0ad2f7136] [formerly f838759303 [formerly 3465706d3b] [formerly a0ad2f7136] [formerly 544437c762 [formerly a0ad2f7136 [formerly 1843d3a64ff42d0533016fd4bb126dd0c86f3f22]]]]
Former-commit-id: 544437c762
Former-commit-id: 9e20dd22bc [formerly e92486e70a] [formerly 03fe18824ae9ef528c9d3aa8c57d40196d705e7a [formerly 3947479184]]
Former-commit-id: 4b60bd45c192ab440eadcd363acf6a5e8815c9bb [formerly 96f46b2770]
Former-commit-id: 7a28ba150f
|
2015-01-15 16:18:10 -05:00 |
|
Fay.Liang
|
28a8630080
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 6a1b668c97 [formerly 532d0ea85d] [formerly b5f51ea049] [formerly 6a1b668c97 [formerly 532d0ea85d] [formerly b5f51ea049] [formerly 2ccab30e31 [formerly b5f51ea049 [formerly f1ca6cef3bba0914aadbd4308511a9a96baaa9e5]]]]
Former-commit-id: 2ccab30e31
Former-commit-id: 575fdaee40 [formerly 3eb3d287c0] [formerly 71a5f727bfdce5f7b50c038c79561037499592b3 [formerly 8285e6445d]]
Former-commit-id: 373a746ad25262ebf91e816d765a92fe157043a4 [formerly fce9647a3d]
Former-commit-id: 4ef7a23776
|
2015-01-15 15:01:08 -05:00 |
|
Steve Harris
|
00a41ac010
|
Merge branch 'master_14.3.1' (14.3.1-42) into omaha_14.3.1
Former-commit-id: 8da4cdf621 [formerly 084a13971d] [formerly a3bbb0ec69] [formerly 8da4cdf621 [formerly 084a13971d] [formerly a3bbb0ec69] [formerly a8de59017f [formerly a3bbb0ec69 [formerly 089467110734e982ec8c7916a48159828e03e75e]]]]
Former-commit-id: a8de59017f
Former-commit-id: d54e110596 [formerly b84ddf693e] [formerly bb99f107c22de05f806f580b787fd4247ca784af [formerly 9bf5fc1570]]
Former-commit-id: cee3e125ef5aafad8d2148fb506a60a7b29584a1 [formerly fb42c03797]
Former-commit-id: d0636548e3
|
2015-01-15 13:27:21 -06:00 |
|
Nate Jensen
|
c0e89fe9af
|
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
Former-commit-id: f61a9a4031 [formerly 0d1414e56b] [formerly 16d862700a] [formerly f61a9a4031 [formerly 0d1414e56b] [formerly 16d862700a] [formerly 865852c20c [formerly 16d862700a [formerly 6557237cd4cea3300292e1612622547c23bdde2c]]]]
Former-commit-id: 865852c20c
Former-commit-id: f4480e9b07 [formerly 99dae46c58] [formerly f9632910c023c0b2d09e1ac6a5a170a88843bf03 [formerly c06e1c0adb]]
Former-commit-id: ca4f55456c03a217c21ae74e5e52351e5ae12314 [formerly 95bdbef8c4]
Former-commit-id: 84379b24e2
|
2015-01-15 13:07:10 -06:00 |
|
Evan Polster
|
d16a96587a
|
VLab Issue #5963. Ensemble Tool Feature; fixes #5963
Change-Id: I9f3c44fd80990b2ec60556d55fabade01eb4512f
Former-commit-id: e325c1fcc1 [formerly e99c17a46a] [formerly f361182baa] [formerly e325c1fcc1 [formerly e99c17a46a] [formerly f361182baa] [formerly 0d40df0d52 [formerly f361182baa [formerly 28d2f4220fa6ef06f4fd1b729607c14b5d9534ac]]]]
Former-commit-id: 0d40df0d52
Former-commit-id: b640c8ce13 [formerly 3d7a989840] [formerly b617f76665d147a35888daa179514d0a728a00ba [formerly 3d1ffb059a]]
Former-commit-id: 12a308daad4090221c2f0ec042081ee0509577fd [formerly bb72452645]
Former-commit-id: 0e16f1df15
|
2015-01-15 18:52:41 +00:00 |
|
David Lovely
|
dddc0c9e67
|
Omaha #3957 Removed trailing slash in Spec for QPID.
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: ffbd986a80 [formerly 1f59c0cd21] [formerly 1cfc27241f] [formerly ffbd986a80 [formerly 1f59c0cd21] [formerly 1cfc27241f] [formerly cf4077e8cd [formerly 1cfc27241f [formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]]]]
Former-commit-id: cf4077e8cd
Former-commit-id: d1897052f4 [formerly af5df71b4c] [formerly 7149ce1ab0dab5dc5ff07ad554d8fb7c73497b9a [formerly f7565da27d]]
Former-commit-id: 01b165a2474f9317de4614ec574298ddd54381b9 [formerly 3babe6269f]
Former-commit-id: 62425dfbb3
|
2015-01-15 08:16:18 -06:00 |
|
mjames-upc
|
c0d15f0c8c
|
OveralyMap toggle added, still throwing errors. CreateRbdControl Replace button action fixed for group removal.
Former-commit-id: 164b32b54b
|
2015-01-14 17:25:12 -07:00 |
|
David Lovely
|
ffe9e6a027
|
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 46093ce896 [formerly 2771afe7f4] [formerly 63c3631559] [formerly 46093ce896 [formerly 2771afe7f4] [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 63c3631559 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: cb81f4322d [formerly 0fa33b0e84] [formerly 3887066e9acf5bcc504692fb690047a9c7d85c77 [formerly f75e17f79e]]
Former-commit-id: 2cbd5b7fba4be5ea1be867bdd5680394153dd6a0 [formerly 49e435ede3]
Former-commit-id: 55fbb2ad86
|
2015-01-14 14:40:36 -06:00 |
|
Nate Jensen
|
c59dfca9cc
|
Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
Former-commit-id: 3c53cb0fe7 [formerly 956845266c] [formerly bdb58ec755] [formerly 3c53cb0fe7 [formerly 956845266c] [formerly bdb58ec755] [formerly 7c61d2c06d [formerly bdb58ec755 [formerly fa93fe561ae1ad49979ab657b4a537dc7731af8e]]]]
Former-commit-id: 7c61d2c06d
Former-commit-id: 1e47902d87 [formerly fa79e80782] [formerly 9bc5273cc25fd33471a9c6370f9bb759460886bf [formerly 4abf2a8a6c]]
Former-commit-id: a9845d89c493e6e77fcdc9ddeca8f8442e9b6811 [formerly 4837ead714]
Former-commit-id: b86874003f
|
2015-01-14 14:05:18 -06:00 |
|
AWIPS User
|
5e82ac8bcc
|
NCP overlay maps, work in progress
Former-commit-id: 504b513696
|
2015-01-14 12:06:24 -07:00 |
|
Brian Clements
|
8ae1e07cff
|
Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions
Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7
Former-commit-id: 38aa18a7e0 [formerly 17ccb3ab66] [formerly 1c2d8e01d0] [formerly 38aa18a7e0 [formerly 17ccb3ab66] [formerly 1c2d8e01d0] [formerly 8cc1aa9f33 [formerly 1c2d8e01d0 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]]]
Former-commit-id: 8cc1aa9f33
Former-commit-id: 33bff8c047 [formerly ba13ccb6f0] [formerly c9bad25f0e0bc3619a4fc5e17fdff45892307a53 [formerly 9a87cf77c5]]
Former-commit-id: 12c0265674271e2a5c6840f97cac1f49816d7a87 [formerly 61b3b6389e]
Former-commit-id: 0f521bee60
|
2015-01-14 13:00:25 -06:00 |
|
AWIPS User
|
d92063e1a4
|
CONUS mercator area file added to NCP localization and menu
Former-commit-id: fffd35fa7f
|
2015-01-14 11:02:02 -07:00 |
|
AWIPS User
|
3e239fa143
|
Merge branch 'upc' of github.com:Unidata/awips2 into upc
Former-commit-id: 784989f461
|
2015-01-14 11:00:33 -07:00 |
|
AWIPS User
|
d58d2338ac
|
NCP gui updates post merge ncep_14.4.1->upc dev
Former-commit-id: ba2513e89f
|
2015-01-14 10:59:55 -07:00 |
|
Greg Armendariz
|
1408154892
|
Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
Former-commit-id: 5e8275c249 [formerly 6bdaf0b924] [formerly 6c7e615de5] [formerly 5e8275c249 [formerly 6bdaf0b924] [formerly 6c7e615de5] [formerly 0431783330 [formerly 6c7e615de5 [formerly 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c]]]]
Former-commit-id: 0431783330
Former-commit-id: 37317346ca [formerly afe39c3dd6] [formerly 8b473ced856efdd5b45e4fb63e4bc182021ff577 [formerly fff75342eb]]
Former-commit-id: c441899dcfcba06add4edc5696368ccdb04ea756 [formerly 89c4169e18]
Former-commit-id: c7552ebaf9
|
2015-01-14 11:33:29 -06:00 |
|