Nate Jensen
|
70561d721a
|
Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: bcc0d1c4f9516e90205d4c140ede99910d1af3b9
|
2014-10-10 11:47:32 -05:00 |
|
Richard Peter
|
e7fbc0c012
|
Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: d3fa6c45ca179e5196af8078ae45ccb4a883804e
|
2014-10-10 11:13:12 -05:00 |
|
Nathan Bowler
|
36d77f1098
|
Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2
Former-commit-id: 97555449ae12eab272ef3307297b89145b97363b
|
2014-10-10 12:05:16 -04:00 |
|
Benjamin Phillippe
|
825aa0d5b2
|
Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: f7c7fe2f7b845563335559839a832b26c2ad2b2a
|
2014-10-10 10:59:16 -05:00 |
|
Nathan Bowler
|
104b47daa2
|
Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80
Former-commit-id: d6793fc17662a0ea0d5814524f4e641e1524ebde
|
2014-10-10 11:33:07 -04:00 |
|
Brian.Dyke
|
f85eb2d0ac
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 344f436cfabfa5c1d0aa552467be7a6f9656a1ec
|
2014-10-10 11:01:01 -04:00 |
|
David Friedman
|
40f7e8df44
|
ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a
Former-commit-id: f187f262a28e0ee9df2b75eff7d1f5382a729ac3
|
2014-10-10 14:18:54 +00:00 |
|
Nate Jensen
|
afb64bc4bb
|
Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e
Former-commit-id: 4a5b66b00fbb53b4fcb4340366347ae4b08e6992
|
2014-10-10 09:01:29 -05:00 |
|
Nate Jensen
|
3cc3b38539
|
Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc
|
2014-10-09 18:30:33 -05:00 |
|
Nate Jensen
|
13f4746613
|
Merge "Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml." into omaha_14.4.1
Former-commit-id: 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e
|
2014-10-09 15:32:38 -05:00 |
|
Mark Peters
|
cf1bff0d02
|
Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27
Former-commit-id: 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea
|
2014-10-09 15:30:23 -05:00 |
|
Mark Peters
|
087dabe3bb
|
Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513
Former-commit-id: e0330ab61d027ee3b8512230b64000bb7f3d71f1
|
2014-10-09 11:17:53 -05:00 |
|
Richard Peter
|
ed2bd7a261
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 5977e37b7368487867aca1cfdd362943633f92eb
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
119b2bff17
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: 6bc42c58541363bee9be1607b1bdf2aca6f5a000
|
2014-10-09 11:04:49 -05:00 |
|
Nate Jensen
|
f6601e4ee1
|
Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 05a008ed69414e3977998cca45516a736181d5b6
|
2014-10-09 09:38:27 -05:00 |
|
Nate Jensen
|
0d33e661f2
|
Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 5ae10ba1a54ec5b20d1569d6c78c2762015c35de
|
2014-10-09 09:02:36 -05:00 |
|
Brian Clements
|
87964cb500
|
Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: 919c816ba7af2082b9dcb0308128fa1b228475d2
|
2014-10-09 08:38:45 -05:00 |
|
Brian Clements
|
8a4cda892f
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 771e06df242b0fe7b4eec1e7c3099dfd316182ce
|
2014-10-08 16:47:10 -05:00 |
|
Robert Blum
|
9bef0b91f8
|
Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008
Former-commit-id: 8c609041f3cabc11588d282b0a91b514a569073a
|
2014-10-08 13:05:23 -05:00 |
|
Ben Steffensmeier
|
b7c0eb89ad
|
Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: e0ec387c62e64a19a4d598578f18ee17686f312a
|
2014-10-08 12:21:03 -05:00 |
|
Richard Peter
|
e8bc97501b
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: 157588d388b9033424ddc46a22d74ccc302eea85
|
2014-10-08 12:02:17 -05:00 |
|
Juliya Dynina
|
240917cf96
|
Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 7a0da7440a3e5e1696cc676dc3405d2aaa95252b
|
2014-10-08 12:00:39 -05:00 |
|
Nate Jensen
|
4e582d0bde
|
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 87f49d9bcc07d2178a535fc934d02cab36063894
|
2014-10-08 11:36:44 -05:00 |
|
Nate Jensen
|
aa9567ccbe
|
Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: 617994f10079a9b905f37c1bf1c1b83e6a210e61
|
2014-10-07 17:18:51 -05:00 |
|
Richard Peter
|
a4bfd2d28b
|
Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: 110499cec453532545431a6fa05057f47af66ed2
|
2014-10-07 16:32:48 -05:00 |
|
Richard Peter
|
1adac05f5a
|
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5
|
2014-10-07 15:13:11 -05:00 |
|
Nathan Bowler
|
1fd0ece81a
|
Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0
Former-commit-id: 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583
|
2014-10-07 15:23:38 -04:00 |
|
Sean Webb
|
c3f3140c4f
|
Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: 986a78cef3d8814e04035b00545a289171c7cc8a
|
2014-10-07 14:04:58 -05:00 |
|
Kevin.Johnson
|
355274e7ac
|
ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae
Former-commit-id: 0982ab6536679921a6afdc85166fe57e92aeac63
|
2014-10-07 14:55:41 -04:00 |
|
Nate Jensen
|
70521e80f8
|
Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: a75ecea2121d1c030a7acb4ba50095a6d2769c01
|
2014-10-07 13:54:08 -05:00 |
|
Nate Jensen
|
11f460f876
|
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: cdeea610953d82fe2b380341b3059b15b6ecd1ff
|
2014-10-07 13:53:43 -05:00 |
|
Nate Jensen
|
c066e8264d
|
Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: 60155e8f96ba20204c6049206ef35a840f64a767
|
2014-10-07 13:53:33 -05:00 |
|
Nate Jensen
|
1e16abcfcd
|
Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 747f8fc91e2ff977724f634b6e610c96150cb4ad
|
2014-10-07 13:52:36 -05:00 |
|
Nathan Bowler
|
ab2e0edb82
|
Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9
Former-commit-id: e57506f274da8a2d917c6cf061e789e50993b5c3
|
2014-10-07 14:40:49 -04:00 |
|
Steve Harris
|
ad4393bea3
|
Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java
Former-commit-id: 6bb7a7312a22a9585d2f5981d873751879082cb1
|
2014-10-07 13:35:58 -05:00 |
|
Brian Clements
|
66705190b5
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: ccd1d646a175e6a2493def2fb3a22d7109e225a7
|
2014-10-07 13:28:34 -05:00 |
|
Mark Peters
|
3464751716
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 5f22815ea1ca5a1fbd010f642afe6a83778f6f58
|
2014-10-07 11:42:44 -05:00 |
|
Brian Clements
|
773619f741
|
Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: a758b7aff6b30194a3180fddffcefa5d019f2ee5
|
2014-10-07 10:43:47 -05:00 |
|
Brian Clements
|
f39ffcc63f
|
Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: a69773742e571a334ef1fd000ff8311805f9c737
|
2014-10-07 08:37:47 -05:00 |
|
Ben Steffensmeier
|
6a2b2efb1a
|
Omaha #3702 register database plugin to fxa database.
Former-commit-id: 7fa6925c27330262dd0a70afcb77c589718cf1f7
|
2014-10-06 20:00:19 -05:00 |
|
Nate Jensen
|
ef6da2a181
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 03ed17c8994b00ea37c1c591760c9b7c452dfcde
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
446e0bcdf6
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 9dac0fcf997feeecdd8c581ae8fd72581c32d095
|
2014-10-06 15:41:42 -05:00 |
|
Roger Ferrel
|
dfbf07f377
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: be87967bf65bc07af5f89c13bf4cfd8eff9b4db6
|
2014-10-06 15:34:30 -05:00 |
|
Qinglu.Lin
|
636f054077
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892
Former-commit-id: 7124fd252f130417a9dcdac148480058d6eb0aba
|
2014-10-06 16:05:26 -04:00 |
|
Michael Gamazaychikov
|
f0b644d92e
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463
|
2014-10-06 15:32:10 -04:00 |
|
Steve Harris
|
39c5e9c314
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
87d80afd0b
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 45140e7bd5ac2dcc51351d74dc87119aeac98f3b
|
2014-10-06 11:37:54 -05:00 |
|
Darrel Kingfield
|
8113b2ba69
|
VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: 48565726c39ea8139d4a3dfd505732cee2d32b16
|
2014-10-06 10:01:36 -05:00 |
|
Nate Jensen
|
28545083c5
|
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: ded3f476047f92d48891613e4c0b78d20858f1ff
|
2014-10-06 09:08:03 -05:00 |
|
Nate Jensen
|
baec32be20
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: 73be758f4ae461539c4a622cf52b7bc73705fc50
|
2014-10-06 09:07:38 -05:00 |
|