Commit graph

7393 commits

Author SHA1 Message Date
David Gillingham
26b92860af Omaha #3885: Fix build.
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f

Former-commit-id: 9c7eff77f6 [formerly ce395804bdc86e1ea485794a0af3f931c83f3cfa]
Former-commit-id: b9fe617d57
2014-12-04 17:00:00 -06:00
Ron Anderson
c4d27803cc Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: e0b9900a50 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]
Former-commit-id: d7e0d21d27
2014-12-04 15:44:46 -06:00
Ron Anderson
95df807187 Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
Former-commit-id: 1a26141b89 [formerly 518b6de2a22f8ce80ee90f16fb8bf387e428909f]
Former-commit-id: d19865d5d1
2014-12-04 13:55:24 -06:00
Nate Jensen
8f0375f71e Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
Former-commit-id: 13bd914319 [formerly 84412d1185073ed35278a40150b04845c8a98de3]
Former-commit-id: 47b8be5b09
2014-12-04 13:24:19 -06:00
Roger Ferrel
24c969a249 Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a

Former-commit-id: 597fdb8280 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]
Former-commit-id: 462e0d85c0
2014-12-04 12:52:22 -06:00
Nathan Bowler
a5bc553461 Omaha #3848 Fix cancelling geotiff import.
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463

Former-commit-id: e1af24d84e [formerly 4c64044de959e709cd00da40826b916a579c44fe]
Former-commit-id: 3e7a1993e3
2014-12-04 13:24:04 -05:00
Nate Jensen
7fe0fc4cb9 Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
Former-commit-id: d4ce4aab6b [formerly 96183baeadd2dcfdc4a1dd0e9199b728f49209bf]
Former-commit-id: cc41245a73
2014-12-04 11:28:01 -06:00
Mark Peters
1b30658214 Omaha #3709 Support foreground/background colors by user for group chats without shared display
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa

Former-commit-id: 7ae71cf1dc [formerly 73d8510ef265b47d2d45f36be3609ef8f35ece12]
Former-commit-id: bd3ed3935c
2014-12-04 10:37:53 -06:00
Ron Anderson
fd25fe9efc Omaha #3885: Merge VTEC route and request changes from VLab.
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: 2417d5a2a7 [formerly 16e32018de233fb128a7518415b84e032074932f]
Former-commit-id: 5169e7181f
2014-12-04 10:01:18 -06:00
Richard Peter
e7b3f59131 Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
Former-commit-id: d03177a68a [formerly b9afcd679acd000742ad31944b234118b6973946]
Former-commit-id: cdb38349fb
2014-12-04 09:45:48 -06:00
Nate Jensen
36d8702286 Omaha #3549 fix developer deploy
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd

Former-commit-id: 99fa52c311 [formerly a713b9c70f48995fa52fc76a4d6db8712e3257e7]
Former-commit-id: 0ffdb0ff98
2014-12-04 09:05:54 -06:00
Nate Jensen
c4ffdbc7e8 Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 68973ea94c [formerly 0a84cfa53c5565f3bf598b21aa5a7d71bc012543]
Former-commit-id: 7fed5d8e25
2014-12-04 09:00:45 -06:00
Nate Jensen
62dda63dab Omaha #3549 remove jdt prefs for faster builds
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec

Former-commit-id: 19cfdd12f4 [formerly 355f20818dc20b86de630e29cb18647c5878f118]
Former-commit-id: a8cfb57aef
2014-12-03 18:00:03 -06:00
Nate Jensen
cb745b34f3 Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2

Former-commit-id: 25e09348c0 [formerly 70209fbc92c5459dab007224e1f5783a5bb08fd0]
Former-commit-id: 19d14b6107
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
8c69731c75 Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 47d1ae9825 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]
Former-commit-id: 65431db2c9
2014-12-03 17:14:42 -06:00
Lee Venable
8cb91f471b Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
Former-commit-id: 5ab799b56f [formerly ab453bf60d663e731dcf273aeabf07472a061d90]
Former-commit-id: 3acfa2eda5
2014-12-03 16:49:48 -06:00
Nate Jensen
a651246f08 Omaha #3549 remove dead code
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6

Former-commit-id: 1b4db26cd8 [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]
Former-commit-id: ac98f9730c
2014-12-03 16:21:10 -06:00
Nate Jensen
6c1391e938 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]
Former-commit-id: ec28d2f1a0
2014-12-03 15:47:10 -06:00
Nate Jensen
5b7fd51d75 Omaha #3549 fix frozen time sizing
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141

Former-commit-id: d26ba30c88 [formerly 5d4601f7c15323a9f926a325656843e5092e23bb]
Former-commit-id: e78c319329
2014-12-03 14:29:52 -06:00
Nate Jensen
bb05069c21 Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
Former-commit-id: 3b0fdec2e5 [formerly 306c64193d02d065bba1c792e13aa34bafb6e9c3]
Former-commit-id: 55817ea845
2014-12-03 14:14:36 -06:00
Dave Hladky
53d1b4a0c3 Omaha #3831 Alleviate memory usage in Template creation
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2

Former-commit-id: 45ebc9cd05 [formerly dd40b635fa20789be1f4a8502530e00f264c7966]
Former-commit-id: 3c2f18f454
2014-12-03 12:39:04 -06:00
Lee Venable
d43c20b408 Merge "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." into omaha_14.4.1
Former-commit-id: 7aba701fdd [formerly d4e460721777642fed02c3bdd8cc49964ba2b4ba]
Former-commit-id: 18e8976193
2014-12-02 17:49:54 -06:00
Bryan Kowal
a75f02722e Merge "Omaha #3216 - Increment pypies release number" into omaha_14.4.1
Former-commit-id: 59e79603c9 [formerly 633b166d5986db5a8ddcd8ff801d5db6a7af203f]
Former-commit-id: 79500123f1
2014-12-02 15:45:37 -06:00
Nate Jensen
22d6b8ce65 Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 0211262227 [formerly 0d05a028c3137cf7b1b289e403e58c006ada7d3c]
Former-commit-id: 8bf1cdc69f
2014-12-02 15:25:58 -06:00
Greg Armendariz
0650a941b1 Omaha #3216 - Increment pypies release number
Former-commit-id: 44af2c4ff1 [formerly 0497a64f539e716089736597385ff9ff3d18e5c0]
Former-commit-id: 7ac9281ba6
2014-12-02 14:45:04 -06:00
Ron Anderson
5ae2cc1ab2 Merge "Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time." into omaha_14.4.1
Former-commit-id: 3abd487317 [formerly 91529770985ffc634cc06383b07a5b292b8a9051]
Former-commit-id: 45ab0cd4d0
2014-12-02 12:34:23 -06:00
Nate Jensen
a3827ad7bd Merge "Omaha #3709 Support foreground/background colors by site for nws-collaborate room" into omaha_14.4.1
Former-commit-id: 99b30457c5 [formerly f2751d48244d29af3f047d49da5ae117ce14a86b]
Former-commit-id: 370a090480
2014-12-02 12:08:22 -06:00
Ron Anderson
f6e374db79 Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae

Former-commit-id: ebeb4440ef [formerly e656ec3ccf20ae4a9eae23040e1a08d7032ee42a]
Former-commit-id: 4efd17db74
2014-12-02 11:45:05 -06:00
Mark Peters
3a10a13053 Omaha #3709 Support foreground/background colors by site for nws-collaborate room
Change-Id: Id090446cf3ee5e9755039c228a0924fa3756add0

Former-commit-id: 5ad0cde96b [formerly 999feecc3880c10f5d19a2829d7552fa49595bd5]
Former-commit-id: a558047f95
2014-12-02 11:24:01 -06:00
Slav Korolev
f20361a507 Omaha #3841 - Updated the dialogs for adding and editing a new zone/station.
Former-commit-id: dc1722a8b7 [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7]
Former-commit-id: 8763f67abf
2014-12-02 09:09:05 -05:00
Nate Jensen
a4a3cc6deb Omaha #3549 remove dead code
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8

Former-commit-id: 731cf6fdbe [formerly b594cd797b675120634454ffffccbb785fd917ae]
Former-commit-id: faf88fc3cb
2014-12-01 15:23:48 -06:00
Nate Jensen
fa378abf2a Omaha #3300 undo bad product file that merged from pda branch
Change-Id: I5425e002fcdbc78db66644dd04022767fae0acbd

Former-commit-id: ad8aadf385 [formerly 6155a8f3d541ee05d4d2f99cdd211e521d4ed19b]
Former-commit-id: 584297e2aa
2014-12-01 12:19:14 -06:00
Richard Peter
1a88edfa4f Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
Former-commit-id: 6759ffa76c [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]
Former-commit-id: 6d046826dc
2014-11-26 10:13:40 -06:00
Roger Ferrel
0ae4219196 Omaha #3870 Updated table to include missing elements.
Former-commit-id: fedc4aae8a [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]
Former-commit-id: c4cf624d04
2014-11-25 14:31:05 -06:00
Roger Ferrel
da25f4588d Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]
Former-commit-id: 9b986c7cf8
2014-11-25 10:01:30 -06:00
Bryan Kowal
b1bf38f922 Omaha #3695 - PostgreSQL will always provide version 3.3.6 of geos. Version 3.3.6
of geos is the only version that our current version of postgis will see. Even
when geos 3.3.7 and 3.3.6 are on the path during compilation, postgis will still
be compiled with a dynamic link to both versions of the library even though
there was not a 3.3.6 available during compilation.


Former-commit-id: 700eefe0ee [formerly 2dafcfc4e0350654c30eb077329711259bf12d1f]
Former-commit-id: eb52d1b333
2014-11-24 16:20:34 -06:00
Nate Jensen
42caba5dc9 Merge "Omaha #3709 Collaboration chat colors for PeerToPeerView" into omaha_14.4.1
Former-commit-id: 2f4b6deaee [formerly 68880c0426392a15fc1d05a423c381856b032634]
Former-commit-id: 737fa5c716
2014-11-21 14:59:08 -06:00
Mark Peters
10179bb1f4 Omaha #3709 Collaboration chat colors for PeerToPeerView
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08

Former-commit-id: 3d43e87374 [formerly 341b54d6d23f08499345b8972a77acc9e2ca8c8b]
Former-commit-id: 0332e4e693
2014-11-21 12:57:08 -06:00
Mark Peters
34e3301c73 Omaha #3768 Add localization to build.properties in uf.viz.aviation.advisory
Change-Id: I96afa121509b7e70fbb0113843924737330366a5

Former-commit-id: 55e6a1d8a2 [formerly 42faaabd5fb640add67bd1c68898e87af670db3e]
Former-commit-id: 5bff597f00
2014-11-20 17:50:52 -06:00
Greg Armendariz
a945c99cfc Merge "Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build" into omaha_14.4.1
Former-commit-id: aa32e3088a [formerly 0982fa7fb3657e11a2dfe3a17e51cafedd9cef21]
Former-commit-id: e3c69ea595
2014-11-19 13:08:28 -06:00
Ron Anderson
81ea897d8e Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1
Former-commit-id: 0610c71e2a [formerly e572e5586d80623e8c6453404dc94691bfd5014d]
Former-commit-id: 1823bd4801
2014-11-18 18:43:41 -06:00
Mark Peters
b98bcbdb35 Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43

Former-commit-id: 666e8d4332 [formerly 1694a064c9496599532e9348a5eb89e558862e60]
Former-commit-id: bcff3fc981
2014-11-18 16:03:42 -06:00
Nate Jensen
5d6dae89f2 Omaha #3549 improve performance of DataStoreResource processing of
requests

Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755

Former-commit-id: 089292dbd0 [formerly bab091169dff1383a3b78ea4b94ec67d446e5f80]
Former-commit-id: 95d510849a
2014-11-18 15:22:09 -06:00
Greg Armendariz
d3295027c2 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: d7af478037 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]
Former-commit-id: ad5e3134e4
2014-11-18 13:48:19 -06:00
Steve Harris
bab60d0d89 Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 1d18722dca [formerly 9c77ee7c19b87501983acf88279205644e1692f2]
Former-commit-id: e1106f77eb
2014-11-17 14:31:43 -06:00
Nathan Bowler
3f4cf3b971 Omaha #3599 Fix typo in get_args() call.
Change-Id: I7ad64eb987c0162ae4f31b76cbc386d06daf2a91

Former-commit-id: 595ea9686a [formerly 3916cf0e8b708bb0a6a5fde3208d1d0a77878a90]
Former-commit-id: 1b201a0777
2014-11-17 11:05:23 -05:00
Fay.Liang
99f1259dda Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: d666aca2b4 [formerly 3b21d69375ceb9c07377082c5e46a094742406a0]
Former-commit-id: 82f427924a
2014-11-14 16:24:25 -05:00
Lee Venable
2bcf529bd9 Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
Former-commit-id: 9fde70a354 [formerly b6d35ac4e3aa430de7057a16f9d5516584833150]
Former-commit-id: f198da3f4d
2014-11-14 11:14:16 -06:00
Lee Venable
8c05a42e49 Merge "Omaha #3650 - Added confirmation box for unsaved changes in the dialog." into omaha_14.4.1
Former-commit-id: d0b2cb955c [formerly 8632472592ff0dc8611e528cb774d6b1586fea58]
Former-commit-id: d28ecb61cf
2014-11-13 14:47:58 -06:00
Nate Jensen
8864443af8 Merge "Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references" into omaha_14.4.1
Former-commit-id: 69505bc376 [formerly a532e9607d5e8fee053ef3bbfdc5c517ac481544]
Former-commit-id: 4d5fb1f014
2014-11-13 14:40:41 -06:00