Ron Anderson
c4d27803cc
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: e0b9900a50d7e0d21d27
2014-12-04 15:44:46 -06:00
Nate Jensen
8f0375f71e
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
...
Former-commit-id: 13bd91431947b8be5b09
2014-12-04 13:24:19 -06:00
Nathan Bowler
a5bc553461
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: e1af24d84e3e7a1993e3
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: d4ce4aab6bcc41245a73
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: 7ae71cf1dcbd3ed3935c
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: 2417d5a2a75169e7181f
2014-12-04 10:01:18 -06:00
Nate Jensen
c4ffdbc7e8
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 68973ea94c7fed5d8e25
2014-12-04 09:00:45 -06:00
Nate Jensen
cb745b34f3
Omaha #3549 remove dead code
...
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 25e09348c019d14b6107
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: 47d1ae982565431db2c9
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: 5ab799b56f3acfa2eda5
2014-12-03 16:49:48 -06:00
Nate Jensen
a651246f08
Omaha #3549 remove dead code
...
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: 1b4db26cd8ac98f9730c
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: 8dbe6abbe4ec28d2f1a0
2014-12-03 15:47:10 -06:00
Nate Jensen
5b7fd51d75
Omaha #3549 fix frozen time sizing
...
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141
Former-commit-id: d26ba30c88e78c319329
2014-12-03 14:29:52 -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: 7aba701fdd18e8976193
2014-12-02 17:49:54 -06:00
Nate Jensen
22d6b8ce65
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 02112622278bf1cdc69f
2014-12-02 15:25:58 -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: 3abd48731745ab0cd4d0
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: 99b30457c5370a090480
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: ebeb4440ef4efd17db74
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: 5ad0cde96ba558047f95
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: dc1722a8b78763f67abf
2014-12-02 09:09:05 -05:00
Nate Jensen
a4a3cc6deb
Omaha #3549 remove dead code
...
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8
Former-commit-id: 731cf6fdbefaf88fc3cb
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: ad8aadf385584297e2aa
2014-12-01 12:19:14 -06:00
Roger Ferrel
da25f4588d
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
...
Former-commit-id: 0df840602e9b986c7cf8
2014-11-25 10:01:30 -06:00
Nate Jensen
42caba5dc9
Merge "Omaha #3709 Collaboration chat colors for PeerToPeerView" into omaha_14.4.1
...
Former-commit-id: 2f4b6deaee737fa5c716
2014-11-21 14:59:08 -06:00
Mark Peters
10179bb1f4
Omaha #3709 Collaboration chat colors for PeerToPeerView
...
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08
Former-commit-id: 3d43e873740332e4e693
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: 55e6a1d8a25bff597f00
2014-11-20 17:50:52 -06:00
Ron Anderson
81ea897d8e
Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1
...
Former-commit-id: 0610c71e2a1823bd4801
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: 666e8d4332bcff3fc981
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: 089292dbd095d510849a
2014-11-18 15:22:09 -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: 1d18722dcae1106f77eb
2014-11-17 14:31:43 -06: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: d666aca2b482f427924a
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: 9fde70a354f198da3f4d
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: d0b2cb955cd28ecb61cf
2014-11-13 14:47:58 -06:00
Nate Jensen
f6e9759779
Merge "Omaha #3705 fixed collaboration public room empty participants list problem" into omaha_14.4.1
...
Former-commit-id: 3e2e3761de3d945c4772
2014-11-13 09:45:21 -06:00
Slav Korolev
60511bf4bc
Omaha #3650 - Added confirmation box for unsaved changes in the dialog.
...
Former-commit-id: dac55d1f4987a369bc98
2014-11-13 10:33:58 -05:00
Ben Steffensmeier
094dae6108
Omaha #3810 Make D2D nsharp more thread safe.
...
Former-commit-id: 0021311cb2376f566451
2014-11-12 14:48:08 -06:00
Roger Ferrel
1d6bec894e
Omaha #3401 Enter events to upper case verification added.
...
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 8cde49f98e334d738c79
2014-11-12 10:50:43 -06:00
Brian Clements
e4ee934545
Omaha #3705 fixed collaboration public room empty participants list problem
...
Change-Id: I25e35b6f5dc1266191c04131b69c840ccd76363e
Former-commit-id: a8cc3b8f084089f14d57
2014-11-12 10:38:15 -06:00
Roger Ferrel
6494c71a41
Omaha #3727 Place HFR and HiResW entries in sub-menus.
...
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e
Former-commit-id: 739b25379228041de97e
2014-11-11 16:10:48 -06:00
Slav Korolev
ec877476d9
Omaha #3741 - Updated procedures for calculation of a center for zone and station.
...
Former-commit-id: 6343f04511a873fe7b5c
2014-11-11 14:56:21 -05:00
Dave Hladky
019739d738
Issue #3026 Fixed null metaData lookups in resource.
...
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb
Former-commit-id: 39db26fb1d3052a38081
2014-11-11 10:18:47 -06:00
Steve Harris
a8a97501ac
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 9de825c332a16abe1b8b
2014-11-10 08:42:01 -06:00
Nate Jensen
58306dab17
Merge "Omaha #3760 Derived parameter definitions should be split to appropriate plugins" into omaha_14.4.1
...
Former-commit-id: caa74b3938d5f3bc859e
2014-11-07 13:35:57 -06:00
Mark Peters
9d6ddb5cec
Omaha #3760 Derived parameter definitions should be split to appropriate plugins
...
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611
Former-commit-id: 54139d0b0c2ee1a9b31f
2014-11-07 12:09:04 -06:00
Lee Venable
bac800fb79
Merge "Omaha #3667 - Corrected functionality of dialog." into omaha_14.4.1
...
Former-commit-id: 6e70e2edd7b9ae93b31d
2014-11-07 12:07:12 -06:00
Brian.Dyke
1cef274675
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 7e87bf7ac43dff476497
2014-11-07 12:55:38 -05:00
Richard Peter
2f5db5008b
Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
...
Former-commit-id: 8328d538cd4bdb77ea6a
2014-11-07 10:01:32 -06:00
Richard Peter
4608c2ff2c
Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
...
Former-commit-id: f1499db1c3b92033924b
2014-11-07 09:50:34 -06:00
Nate Jensen
62f1088e05
Omaha #3356 fix thin client startup when localization caching is
...
disabled
Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478
Former-commit-id: 9c79b4851f6173ea452d
2014-11-06 16:48:11 -06:00
Slav Korolev
45c9b0560a
Omaha #3667 - Corrected functionality of dialog.
...
Former-commit-id: 9f0b1a68e6fbb9e62cfc
2014-11-06 15:24:12 -05:00
