David Gillingham
b9fe617d57
Omaha #3885 : Fix build.
...
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f
Former-commit-id: ce395804bdc86e1ea485794a0af3f931c83f3cfa
2014-12-04 17:00:00 -06:00
Ron Anderson
d7e0d21d27
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: 401356d7917aaf84c5ea5c8f92ca32c270d5790a
2014-12-04 15:44:46 -06:00
Ron Anderson
d19865d5d1
Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
...
Former-commit-id: 518b6de2a22f8ce80ee90f16fb8bf387e428909f
2014-12-04 13:55:24 -06:00
Nate Jensen
47b8be5b09
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
...
Former-commit-id: 84412d1185073ed35278a40150b04845c8a98de3
2014-12-04 13:24:19 -06:00
Roger Ferrel
462e0d85c0
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
2014-12-04 12:52:22 -06:00
Nathan Bowler
3e7a1993e3
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: 4c64044de959e709cd00da40826b916a579c44fe
2014-12-04 13:24:04 -05:00
Nate Jensen
cc41245a73
Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
...
Former-commit-id: 96183baeadd2dcfdc4a1dd0e9199b728f49209bf
2014-12-04 11:28:01 -06:00
Mark Peters
bd3ed3935c
Omaha #3709 Support foreground/background colors by user for group chats without shared display
...
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: 73d8510ef265b47d2d45f36be3609ef8f35ece12
2014-12-04 10:37:53 -06:00
Ron Anderson
5169e7181f
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: 16e32018de233fb128a7518415b84e032074932f
2014-12-04 10:01:18 -06:00
Richard Peter
cdb38349fb
Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
...
Former-commit-id: b9afcd679acd000742ad31944b234118b6973946
2014-12-04 09:45:48 -06:00
Nate Jensen
0ffdb0ff98
Omaha #3549 fix developer deploy
...
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd
Former-commit-id: a713b9c70f48995fa52fc76a4d6db8712e3257e7
2014-12-04 09:05:54 -06:00
Nate Jensen
7fed5d8e25
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 0a84cfa53c5565f3bf598b21aa5a7d71bc012543
2014-12-04 09:00:45 -06:00
Nate Jensen
a8cfb57aef
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec
Former-commit-id: 355f20818dc20b86de630e29cb18647c5878f118
2014-12-03 18:00:03 -06:00
Nate Jensen
19d14b6107
Omaha #3549 remove dead code
...
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 70209fbc92c5459dab007224e1f5783a5bb08fd0
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
65431db2c9
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 58946bb4ff319ac5c4c84e63268ec1149c9cede0
2014-12-03 17:14:42 -06:00
Lee Venable
3acfa2eda5
Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
...
Former-commit-id: ab453bf60d663e731dcf273aeabf07472a061d90
2014-12-03 16:49:48 -06:00
Nate Jensen
ac98f9730c
Omaha #3549 remove dead code
...
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: b597b4e3151d4e91b3e1db1a02135d33014850d8
2014-12-03 16:21:10 -06:00
Nate Jensen
ec28d2f1a0
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Nate Jensen
e78c319329
Omaha #3549 fix frozen time sizing
...
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141
Former-commit-id: 5d4601f7c15323a9f926a325656843e5092e23bb
2014-12-03 14:29:52 -06:00
Nate Jensen
55817ea845
Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
...
Former-commit-id: 306c64193d02d065bba1c792e13aa34bafb6e9c3
2014-12-03 14:14:36 -06:00
Dave Hladky
3c2f18f454
Omaha #3831 Alleviate memory usage in Template creation
...
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2
Former-commit-id: dd40b635fa20789be1f4a8502530e00f264c7966
2014-12-03 12:39:04 -06:00
Lee Venable
18e8976193
Merge "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." into omaha_14.4.1
...
Former-commit-id: d4e460721777642fed02c3bdd8cc49964ba2b4ba
2014-12-02 17:49:54 -06:00
Bryan Kowal
79500123f1
Merge "Omaha #3216 - Increment pypies release number" into omaha_14.4.1
...
Former-commit-id: 633b166d5986db5a8ddcd8ff801d5db6a7af203f
2014-12-02 15:45:37 -06:00
Nate Jensen
8bf1cdc69f
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 0d05a028c3137cf7b1b289e403e58c006ada7d3c
2014-12-02 15:25:58 -06:00
Greg Armendariz
7ac9281ba6
Omaha #3216 - Increment pypies release number
...
Former-commit-id: 0497a64f539e716089736597385ff9ff3d18e5c0
2014-12-02 14:45:04 -06:00
Ron Anderson
45ab0cd4d0
Merge "Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time." into omaha_14.4.1
...
Former-commit-id: 91529770985ffc634cc06383b07a5b292b8a9051
2014-12-02 12:34:23 -06:00
Nate Jensen
370a090480
Merge "Omaha #3709 Support foreground/background colors by site for nws-collaborate room" into omaha_14.4.1
...
Former-commit-id: f2751d48244d29af3f047d49da5ae117ce14a86b
2014-12-02 12:08:22 -06:00
Ron Anderson
4efd17db74
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
...
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: e656ec3ccf20ae4a9eae23040e1a08d7032ee42a
2014-12-02 11:45:05 -06:00
Mark Peters
a558047f95
Omaha #3709 Support foreground/background colors by site for nws-collaborate room
...
Change-Id: Id090446cf3ee5e9755039c228a0924fa3756add0
Former-commit-id: 999feecc3880c10f5d19a2829d7552fa49595bd5
2014-12-02 11:24:01 -06:00
Slav Korolev
8763f67abf
Omaha #3841 - Updated the dialogs for adding and editing a new zone/station.
...
Former-commit-id: 5a7e13b6a6db5ca766da3ad957c12077470359e7
2014-12-02 09:09:05 -05:00
Nate Jensen
faf88fc3cb
Omaha #3549 remove dead code
...
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8
Former-commit-id: b594cd797b675120634454ffffccbb785fd917ae
2014-12-01 15:23:48 -06:00
Nate Jensen
584297e2aa
Omaha #3300 undo bad product file that merged from pda branch
...
Change-Id: I5425e002fcdbc78db66644dd04022767fae0acbd
Former-commit-id: 6155a8f3d541ee05d4d2f99cdd211e521d4ed19b
2014-12-01 12:19:14 -06:00
Richard Peter
6d046826dc
Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
...
Former-commit-id: e7056504ae5758e2b4abbdef9cec7b2467d49add
2014-11-26 10:13:40 -06:00
Roger Ferrel
c4cf624d04
Omaha #3870 Updated table to include missing elements.
...
Former-commit-id: 7569e4f2b962d22453b7414ea882f2383cec9ade
2014-11-25 14:31:05 -06:00
Roger Ferrel
9b986c7cf8
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
...
Former-commit-id: 56833ab1b84e50c6ca4150d3c90501448233313b
2014-11-25 10:01:30 -06:00
Bryan Kowal
eb52d1b333
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: 2dafcfc4e0350654c30eb077329711259bf12d1f
2014-11-24 16:20:34 -06:00
Nate Jensen
737fa5c716
Merge "Omaha #3709 Collaboration chat colors for PeerToPeerView" into omaha_14.4.1
...
Former-commit-id: 68880c0426392a15fc1d05a423c381856b032634
2014-11-21 14:59:08 -06:00
Mark Peters
0332e4e693
Omaha #3709 Collaboration chat colors for PeerToPeerView
...
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08
Former-commit-id: 341b54d6d23f08499345b8972a77acc9e2ca8c8b
2014-11-21 12:57:08 -06:00
Mark Peters
5bff597f00
Omaha #3768 Add localization to build.properties in uf.viz.aviation.advisory
...
Change-Id: I96afa121509b7e70fbb0113843924737330366a5
Former-commit-id: 42faaabd5fb640add67bd1c68898e87af670db3e
2014-11-20 17:50:52 -06:00
Greg Armendariz
e3c69ea595
Merge "Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build" into omaha_14.4.1
...
Former-commit-id: 0982fa7fb3657e11a2dfe3a17e51cafedd9cef21
2014-11-19 13:08:28 -06:00
Ron Anderson
1823bd4801
Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1
...
Former-commit-id: e572e5586d80623e8c6453404dc94691bfd5014d
2014-11-18 18:43:41 -06:00
Mark Peters
bcff3fc981
Omaha #3300 Merge fixes for volume browser menus
...
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43
Former-commit-id: 1694a064c9496599532e9348a5eb89e558862e60
2014-11-18 16:03:42 -06:00
Nate Jensen
95d510849a
Omaha #3549 improve performance of DataStoreResource processing of
...
requests
Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755
Former-commit-id: bab091169dff1383a3b78ea4b94ec67d446e5f80
2014-11-18 15:22:09 -06:00
Greg Armendariz
ad5e3134e4
Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
...
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b
Former-commit-id: 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e
2014-11-18 13:48:19 -06:00
Steve Harris
e1106f77eb
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: 9c77ee7c19b87501983acf88279205644e1692f2
2014-11-17 14:31:43 -06:00
Nathan Bowler
1b201a0777
Omaha #3599 Fix typo in get_args() call.
...
Change-Id: I7ad64eb987c0162ae4f31b76cbc386d06daf2a91
Former-commit-id: 3916cf0e8b708bb0a6a5fde3208d1d0a77878a90
2014-11-17 11:05:23 -05:00
Fay.Liang
82f427924a
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 3b21d69375ceb9c07377082c5e46a094742406a0
2014-11-14 16:24:25 -05:00
Lee Venable
f198da3f4d
Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
...
Former-commit-id: b6d35ac4e3aa430de7057a16f9d5516584833150
2014-11-14 11:14:16 -06:00
Lee Venable
d28ecb61cf
Merge "Omaha #3650 - Added confirmation box for unsaved changes in the dialog." into omaha_14.4.1
...
Former-commit-id: 8632472592ff0dc8611e528cb774d6b1586fea58
2014-11-13 14:47:58 -06:00
Nate Jensen
4d5fb1f014
Merge "Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references" into omaha_14.4.1
...
Former-commit-id: a532e9607d5e8fee053ef3bbfdc5c517ac481544
2014-11-13 14:40:41 -06:00