Brad Gonzales
b428cf44ca
Issue #2821 Removed qpid 0.7 from the baseline.
...
Amend: Removed build.sh script that builds 0.7 and 0.18. changed rpms.sh to call 0.18 build.sh script.
Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf
Former-commit-id: f87d4ccf82
[formerly a007ffabf9
] [formerly f87d4ccf82
[formerly a007ffabf9
] [formerly 50209c2084
[formerly 5ea4e87d10d335d85547b147228244892772a98f]]]
Former-commit-id: 50209c2084
Former-commit-id: b9affa3c02
[formerly bf3a9ef7fe
]
Former-commit-id: 6f32b5cc59
2014-02-28 10:15:18 -06:00
Nate Jensen
4e66e5bcc5
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
...
Former-commit-id: b40f5477b4
[formerly 63244f840f
] [formerly b40f5477b4
[formerly 63244f840f
] [formerly 908d308825
[formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: fb68c4c07f
[formerly 92527f1ffa
]
Former-commit-id: f0bb217f04
2014-02-28 09:53:27 -06:00
Richard Peter
1103fb5eff
Merge "Issue #2838 Archive binary feeder creation." into development
...
Former-commit-id: 944ea7936c
[formerly 952669fc38
] [formerly 944ea7936c
[formerly 952669fc38
] [formerly 475557d4c8
[formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]
Former-commit-id: 475557d4c8
Former-commit-id: 67a6ef4bd8
[formerly 1d51a87e86
]
Former-commit-id: db1e7f8f48
2014-02-27 17:36:56 -06:00
Nate Jensen
d286ba624c
Merge "Issue #2823 deploy install now defaults to x86_64." into development
...
Former-commit-id: 82817c2cbd
[formerly f7b4c75f13
] [formerly 82817c2cbd
[formerly f7b4c75f13
] [formerly d7a8ddbb83
[formerly 75be0d86a588209ff572362f098095beb0b618d2]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: c439ecb2a4
[formerly 35ea5b9eb2
]
Former-commit-id: 8b7fecdd99
2014-02-27 16:44:26 -06:00
Brad Gonzales
562245f2af
Issue #2823 deploy install now defaults to x86_64.
...
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc
Former-commit-id: 73ed932660
[formerly 2135663934
] [formerly 73ed932660
[formerly 2135663934
] [formerly 45160326aa
[formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]
Former-commit-id: 45160326aa
Former-commit-id: 003f028176
[formerly 90e6558083
]
Former-commit-id: b6dbc7f605
2014-02-27 16:34:53 -06:00
Richard Peter
5fab51d41b
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 7bd6a07913
[formerly 0e25ae35c1
] [formerly 7bd6a07913
[formerly 0e25ae35c1
] [formerly 1c150e6e8b
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5
[formerly f13c86bc3e
]
Former-commit-id: 9b3f8f9649
2014-02-27 15:18:26 -06:00
Richard Peter
68eade49a2
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: c267c5a08f
[formerly 86d42ed603
] [formerly c267c5a08f
[formerly 86d42ed603
] [formerly 862069dfd3
[formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 237ada7b8b
[formerly c0d495d9c3
]
Former-commit-id: 9489565efb
2014-02-27 13:46:47 -06:00
Richard Peter
8d35f1ce5f
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: a23c8f2c27
[formerly 729d608a15
] [formerly a23c8f2c27
[formerly 729d608a15
] [formerly d54fee5dae
[formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 67093287a0
[formerly 229437773b
]
Former-commit-id: 9ca22fce7f
2014-02-27 13:20:49 -06:00
Steve Harris
40e335fdf7
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 182c16067c
[formerly 5218a4d1e6
] [formerly 182c16067c
[formerly 5218a4d1e6
] [formerly 99f53876d7
[formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]
Former-commit-id: 99f53876d7
Former-commit-id: b8afc0e5f7
[formerly 0d9abc724c
]
Former-commit-id: 1c547c6a96
2014-02-27 10:02:43 -06:00
Nate Jensen
445fd40303
Merge "Issue #2312 Fix file dialog input on export image dialog." into development
...
Former-commit-id: 414cc002b1
[formerly 71d494eb34
] [formerly 414cc002b1
[formerly 71d494eb34
] [formerly d1ec11d932
[formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]
Former-commit-id: d1ec11d932
Former-commit-id: 80ef0dc055
[formerly 9a39867de4
]
Former-commit-id: ee788777ad
2014-02-27 09:10:07 -06:00
Roger Ferrel
1b29ee087f
Issue #2838 Archive binary feeder creation.
...
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c
Former-commit-id: ac03675880
[formerly 9b7715e5e0
] [formerly ac03675880
[formerly 9b7715e5e0
] [formerly 995d962a66
[formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]]
Former-commit-id: 995d962a66
Former-commit-id: dae52ad3a0
[formerly 03843090fa
]
Former-commit-id: 40369d124f
2014-02-27 07:45:40 -06:00
Lee Venable
54fa6c12b3
Issue #2795 - added code to check for null images.
...
Former-commit-id: 5546b537cf
[formerly 0c7395d423
] [formerly 5546b537cf
[formerly 0c7395d423
] [formerly 49530206f4
[formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 35f6f35186
[formerly facc67e6b5
]
Former-commit-id: 3932c3f02f
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
0dd62678f2
Issue #2711 Use level factory more.
...
Former-commit-id: 1069ef8d67
[formerly d7a3ae4fdb
] [formerly 1069ef8d67
[formerly d7a3ae4fdb
] [formerly 3da086b71f
[formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 29f9a87085
[formerly f45646ae91
]
Former-commit-id: 3a5f655ea4
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
5fd6a533b8
Issue #2312 Fix file dialog input on export image dialog.
...
Former-commit-id: 2fd8351874
[formerly e1dc75f97a
] [formerly 2fd8351874
[formerly e1dc75f97a
] [formerly 6d0a78e233
[formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 058652febe
[formerly 2d11421854
]
Former-commit-id: 542c8ae3a1
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
d899433612
Issue #2703 Fix GFE time matching in iscMode.
...
Former-commit-id: 2425b9665c
[formerly d8bfdd1a7e
] [formerly 2425b9665c
[formerly d8bfdd1a7e
] [formerly 07bc9f075f
[formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 0fde78c595
[formerly 804cbb48e6
]
Former-commit-id: 6843396c78
2014-02-26 14:45:19 -06:00
Lee Venable
8d49130542
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: bb4b034375
[formerly 94cede8153
] [formerly bb4b034375
[formerly 94cede8153
] [formerly e0ee93bab3
[formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 91d419662c
[formerly e0fbc02307
]
Former-commit-id: 316ba53e74
2014-02-26 13:21:58 -06:00
Lee Venable
19e67bdb0c
Merge "Issue #2652 . Fixed issue with edex-text-ingest log." into development
...
Former-commit-id: f58481dc6a
[formerly 72f71bc000
] [formerly f58481dc6a
[formerly 72f71bc000
] [formerly 34191dc3dc
[formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]]
Former-commit-id: 34191dc3dc
Former-commit-id: f2db331c8e
[formerly b4b6cb655e
]
Former-commit-id: 23c2014393
2014-02-25 15:53:14 -06:00
Brad Gonzales
d1ef377ec0
Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
...
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz. Updated the component.spec to the new version number.
Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3
Former-commit-id: 40a653867a
[formerly 4ccfe4f3c0
] [formerly 40a653867a
[formerly 4ccfe4f3c0
] [formerly cf9c22ac99
[formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]
Former-commit-id: cf9c22ac99
Former-commit-id: 1df77529c3
[formerly a24cbaf683
]
Former-commit-id: 3780b24792
2014-02-25 14:42:59 -06:00
Slav Korolev
9dd91d63c1
Issue #2652 . Fixed issue with edex-text-ingest log.
...
Former-commit-id: a34b1196b7
[formerly 5087a0154d
] [formerly a34b1196b7
[formerly 5087a0154d
] [formerly bfa84e65ec
[formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]
Former-commit-id: bfa84e65ec
Former-commit-id: 0566c86a6c
[formerly 40b4bf6e8e
]
Former-commit-id: 5e494af996
2014-02-25 15:23:22 -05:00
Richard Peter
e28b3bb5b9
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
...
Former-commit-id: 90b48e0393
[formerly 3735cd3ffe
] [formerly 90b48e0393
[formerly 3735cd3ffe
] [formerly b4e48698ed
[formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: f803d557c2
[formerly 66b271a550
]
Former-commit-id: e78e5a15b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
aa2d8b76a1
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: b6e2ce4b74
[formerly 783afb1585
] [formerly b6e2ce4b74
[formerly 783afb1585
] [formerly 8b2b50baaf
[formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: f57f472f6a
[formerly 5ce1939d01
]
Former-commit-id: f4513d0e64
2014-02-25 09:22:08 -06:00
Brian Clements
1001ef1ec2
Issue #2751 fixed webDAV path issue
...
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded
Former-commit-id: 3f0e9d7a77
[formerly eef242194a
] [formerly 3f0e9d7a77
[formerly eef242194a
] [formerly 3d365a4cd2
[formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 1f5d296314
[formerly 473fcda0cf
]
Former-commit-id: a102e927b1
2014-02-25 09:17:36 -06:00
Nate Jensen
caaffabda3
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 8ef957d2f0
[formerly 279f05a1d5
] [formerly 8ef957d2f0
[formerly 279f05a1d5
] [formerly 060eafc272
[formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 2f58408036
[formerly a5477ea272
]
Former-commit-id: d9411eb382
2014-02-24 16:17:20 -06:00
Nate Jensen
78c8f1a62c
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: 230b8bf117
[formerly 8a00a419a1
] [formerly 230b8bf117
[formerly 8a00a419a1
] [formerly f353c44cc0
[formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: a97f5b5ff7
[formerly 74329bcb89
]
Former-commit-id: 02d2f0c713
2014-02-24 15:35:13 -06:00
Brian.Dyke
0bcf7c89b8
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 363403fb34
[formerly 2faab606e5
] [formerly 363403fb34
[formerly 2faab606e5
] [formerly 1a8a0b703e
[formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4
[formerly 227131e5f1
]
Former-commit-id: 38829b9014
2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 45ccac0859
[formerly 4364e7497c
] [formerly 45ccac0859
[formerly 4364e7497c
] [formerly 2db5f26840
[formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8
[formerly 3b2ea2d6ac
]
Former-commit-id: f2b0cc20e8
2014-02-24 13:46:48 -06:00
Nate Jensen
da2a363550
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
...
Former-commit-id: 98a6101cd3
[formerly 2111109ce2
] [formerly 98a6101cd3
[formerly 2111109ce2
] [formerly b1586f8603
[formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: d6e9cb73f5
[formerly bf8bb95f51
]
Former-commit-id: 6979321635
2014-02-24 13:25:35 -06:00
Brian Clements
48cfc3c933
Issue #2751 fixed leader transfer infinite loop, added event validation
...
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed
Former-commit-id: 9217ba24c5
[formerly 3f362519aa
] [formerly 9217ba24c5
[formerly 3f362519aa
] [formerly 386e9cc96a
[formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 73cb7b7313
[formerly b9c9be4c4f
]
Former-commit-id: 4abf737852
2014-02-24 13:19:07 -06:00
Dave Hladky
e030ac65b2
Issue #2469 Fixed default rules implementation
...
Former-commit-id: f9c6a396f0
[formerly 1d256bfcee
] [formerly f9c6a396f0
[formerly 1d256bfcee
] [formerly 45413d0db4
[formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: dc97eb7890
[formerly ff5a5961db
]
Former-commit-id: 8a924bcc2c
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
831bb0b021
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: f7c48b24bb
[formerly 9e5f7d90a0
] [formerly f7c48b24bb
[formerly 9e5f7d90a0
] [formerly f8cc0e3d95
[formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 3c7e578000
[formerly a510abdb22
]
Former-commit-id: 358e7d3b1d
2014-02-24 10:27:30 -06:00
Ben Steffensmeier
07ffe9f711
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 780dc19fac
[formerly 70ae372303
] [formerly 780dc19fac
[formerly 70ae372303
] [formerly e08d4f77c3
[formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: 7aca322faa
[formerly a6bf896593
]
Former-commit-id: 7e29aa25a9
2014-02-21 17:37:19 -06:00
Dave Hladky
c4e70210fd
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 542ba7e504
[formerly c4bed432da
] [formerly 542ba7e504
[formerly c4bed432da
] [formerly 49f6c31256
[formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: 3b9f80d03e
[formerly 445b55f796
]
Former-commit-id: c545368839
2014-02-21 16:01:20 -06:00
Richard Peter
972f6a61d6
Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
...
Former-commit-id: 66d3fce57d
[formerly e923639fb1
] [formerly 66d3fce57d
[formerly e923639fb1
] [formerly 58a3aac09d
[formerly d76c2325618af08be1f20ebec0b2463a49a9b03f]]]
Former-commit-id: 58a3aac09d
Former-commit-id: 9ba35d60bd
[formerly 5937649085
]
Former-commit-id: 0951bec15c
2014-02-21 11:26:26 -06:00
Nate Jensen
34a56bc0ce
Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
...
Former-commit-id: c1f4fbfbd4
[formerly 9a3f60a216
] [formerly c1f4fbfbd4
[formerly 9a3f60a216
] [formerly dd00fd1445
[formerly 4399b11d3958de1cf8cce2bc66085aa43efb6519]]]
Former-commit-id: dd00fd1445
Former-commit-id: 62596de046
[formerly 7b1cf570f4
]
Former-commit-id: d75023418b
2014-02-20 17:55:35 -06:00
Brad Gonzales
7dddf974b8
Issue #2828 Added purge cron to Central SBN Simulator.
...
Amend: Removed comment accidentally merged from other branch.
Moved logging to outer loop and log count of purged files for each dir.
Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6
Former-commit-id: 290a381715
[formerly 12e22752c2
] [formerly 290a381715
[formerly 12e22752c2
] [formerly bd25ec4cd9
[formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: bef4e8ee53
[formerly 08c4d1afea
]
Former-commit-id: 675477ed66
2014-02-20 16:31:16 -06:00
Mike Duff
692830c5c9
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: a96a833f51
[formerly ed5cb91406
] [formerly a96a833f51
[formerly ed5cb91406
] [formerly a7b1e79d2d
[formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: f98eec12b9
[formerly d90f4495c2
]
Former-commit-id: 5014499431
2014-02-20 15:09:10 -06:00
Brian.Dyke
176c56b8ea
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
...
Former-commit-id: 5f3ca0a3f4
[formerly 2f79cc486e
] [formerly 5f3ca0a3f4
[formerly 2f79cc486e
] [formerly 916f657e04
[formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]
Former-commit-id: 916f657e04
Former-commit-id: 9ce06f52c4
[formerly e36ae1dd7f
]
Former-commit-id: f89f664f50
2014-02-20 15:50:50 -05:00
Ron Anderson
42048983ce
Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
...
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405
Former-commit-id: e4aeaa79f1
[formerly 6a7e4a147d
] [formerly e4aeaa79f1
[formerly 6a7e4a147d
] [formerly 6ccf6a56e7
[formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: 1dcaf2b790
[formerly d63ad1b1de
]
Former-commit-id: 2eb6cb45e3
2014-02-20 12:32:31 -06:00
Brian Clements
1d2406e180
Issue #2751 collab menu icons, fixed NPE
...
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog
Former-commit-id: a2bdfa25cc
[formerly aaa2de20f4
] [formerly a2bdfa25cc
[formerly aaa2de20f4
] [formerly 89a48c3f6b
[formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 04697836b8
[formerly 4b7ba54dc3
]
Former-commit-id: e3973b9fc7
2014-02-20 11:50:54 -06:00
Brian Clements
9b0fd74f5b
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: a8ff1effc1
[formerly c3cadff705
] [formerly a8ff1effc1
[formerly c3cadff705
] [formerly ab72938246
[formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: 9d00fe2bab
[formerly d9ac2c0037
]
Former-commit-id: d218686d1f
2014-02-20 11:10:14 -06:00
Nate Jensen
3955f66213
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 6ef26a636c
[formerly 32bd9fd635
] [formerly 6ef26a636c
[formerly 32bd9fd635
] [formerly 0f81b80467
[formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7
[formerly 9f33e97c1b
]
Former-commit-id: 1f5f895dcf
2014-02-20 10:53:21 -06:00
Ron Anderson
a5c6428787
Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
...
Former-commit-id: 810ad594a1
[formerly c13942140a
] [formerly 810ad594a1
[formerly c13942140a
] [formerly 6f4a63000d
[formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]
Former-commit-id: 6f4a63000d
Former-commit-id: ee5658f9d9
[formerly c07544b904
]
Former-commit-id: 32b8cc8a8e
2014-02-20 09:55:56 -06:00
Ron Anderson
30d9fec3ae
Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
...
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7
Former-commit-id: 2bfa521e7d
[formerly 6b6aa14e59
] [formerly 2bfa521e7d
[formerly 6b6aa14e59
] [formerly 08a1be844d
[formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]
Former-commit-id: 08a1be844d
Former-commit-id: 0ee3625c50
[formerly 1571b9a8eb
]
Former-commit-id: 7897be61e2
2014-02-20 09:34:18 -06:00
Nate Jensen
4628b0c67c
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: 4563e38db2
[formerly 3078b69273
] [formerly 4563e38db2
[formerly 3078b69273
] [formerly 5856957c57
[formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: c936a659a5
[formerly 5412b72c57
]
Former-commit-id: 9e261c9c22
2014-02-19 17:22:00 -06:00
Nate Jensen
1db1ae5a38
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: 3782880dac
[formerly 9011e1b31e
] [formerly 3782880dac
[formerly 9011e1b31e
] [formerly 6e59175ce4
[formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9394879520
[formerly b1e2788958
]
Former-commit-id: 8f73511086
2014-02-19 17:18:24 -06:00
Nate Jensen
dbdcfa8e41
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: a241472c34
[formerly df376abcb7
] [formerly a241472c34
[formerly df376abcb7
] [formerly f99cf7df47
[formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: d3ec0da1bb
[formerly 8b152a8027
]
Former-commit-id: dafb323edb
2014-02-19 16:19:27 -06:00
Ron Anderson
331803d94a
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: 8703c43937
[formerly 98d2417f94
] [formerly 8703c43937
[formerly 98d2417f94
] [formerly b8c00d8ead
[formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: b9904edc3a
[formerly 7e7f0abfdc
]
Former-commit-id: db9cc1e6b5
2014-02-19 15:39:56 -06:00
Mike Duff
401973b39e
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: e2a6251a6b
[formerly 663ea8decd
] [formerly e2a6251a6b
[formerly 663ea8decd
] [formerly 95fcee385a
[formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 89c4a3e04b
[formerly 3100a71f34
]
Former-commit-id: 92d356f4f0
2014-02-19 15:26:14 -06:00
Mike Duff
0494f646ab
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 48a0b34b5f
[formerly 682c6af456
] [formerly 48a0b34b5f
[formerly 682c6af456
] [formerly 183657fb33
[formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 8be2622f85
[formerly 86fce9d547
]
Former-commit-id: 06b243a7fd
2014-02-19 15:20:29 -06:00
Nate Jensen
659bc630be
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: b4ac186728
[formerly 4b4cca776f
] [formerly b4ac186728
[formerly 4b4cca776f
] [formerly c72e2be969
[formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]
Former-commit-id: c72e2be969
Former-commit-id: 5ef747c703
[formerly 7099b45023
]
Former-commit-id: 696937bfcc
2014-02-19 14:52:24 -06:00