Ron Anderson
38a1d957aa
Issue #2961 Code clean up. Issue was fixed under #2703
...
Added listener to redo time matching when ISC mode changes
Change-Id: Ic2a883c6255a81cac1316d268225fb6078921cb1
Former-commit-id: 82062553f0
[formerly 51ffcd7ce8
] [formerly f4b31b336a
] [formerly 82062553f0
[formerly 51ffcd7ce8
] [formerly f4b31b336a
] [formerly efb27793f4
[formerly f4b31b336a
[formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]]
Former-commit-id: efb27793f4
Former-commit-id: 8463514df0
[formerly c1e5e2fd18
] [formerly 3dc1bbaea04ff0ad7927eabe00966a8cca040dc6 [formerly bfed3dc521
]]
Former-commit-id: 35f76f0c3fa6a795124c70b69a2554a6171126b2 [formerly 6385c81420
]
Former-commit-id: dfcdaadbe2
2014-04-02 16:55:02 -05:00
Nate Jensen
51502f7db5
Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
...
Former-commit-id: 72c8f1d844
[formerly c0704488cc
] [formerly 6b20d38b1a
] [formerly 72c8f1d844
[formerly c0704488cc
] [formerly 6b20d38b1a
] [formerly 579d2416cb
[formerly 6b20d38b1a
[formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]]
Former-commit-id: 579d2416cb
Former-commit-id: 5821a0e0e0
[formerly d5d42f2f6b
] [formerly b937a5eaf68a15c6804ca9d1bfabddacdd99ff79 [formerly 19560ebc7c
]]
Former-commit-id: bf3a7ac4f9e4177a919e5423eb8d193e349a283a [formerly 62f1451e50
]
Former-commit-id: 691c4411fc
2014-04-02 11:23:02 -05:00
Mike Duff
a5a38133ca
Issue #2632 - Remove user from list on sign-off. Fixed check for available
...
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe
Former-commit-id: ac9678dc6e
[formerly 2a9b434883
] [formerly 538261f6d5
] [formerly ac9678dc6e
[formerly 2a9b434883
] [formerly 538261f6d5
] [formerly d5df936431
[formerly 538261f6d5
[formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]]
Former-commit-id: d5df936431
Former-commit-id: 378909ad2c
[formerly 7aa5cebfb0
] [formerly 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aa
]]
Former-commit-id: 326f3902389d6b4cb29f450dd9b92a133b682aa9 [formerly 0aea45197a
]
Former-commit-id: ce774c07a8
2014-04-02 10:08:45 -05:00
Nate Jensen
693d919d5b
Merge "Issue #2938 - Fix site/role change logic for messages" into development
...
Former-commit-id: 4ec98ab846
[formerly 654d5abb57
] [formerly 6637623c4f
] [formerly 4ec98ab846
[formerly 654d5abb57
] [formerly 6637623c4f
] [formerly eab75cab11
[formerly 6637623c4f
[formerly 8fe6aa419874d54755836fa44e252d53b32b7f8c]]]]
Former-commit-id: eab75cab11
Former-commit-id: 2b7a95598e
[formerly 4494674310
] [formerly 2db9cd45dbb0b28cc1547e80c8c6e446eb551909 [formerly a9e2e856d6
]]
Former-commit-id: 37c3665743b2e2fea0303e9315db212f7f0fd1f6 [formerly 09f9090d3d
]
Former-commit-id: 7cfff411fb
2014-04-02 09:55:19 -05:00
Nate Jensen
ec99d06e8a
Merge "Issue #2952 - Change MPE fieldgen to use thriftSrv" into development
...
Former-commit-id: 6e7b3d21a1
[formerly 8040bcd68d
] [formerly 0b25f77fe8
] [formerly 6e7b3d21a1
[formerly 8040bcd68d
] [formerly 0b25f77fe8
] [formerly 862d1de6c4
[formerly 0b25f77fe8
[formerly 8efaad8250215b687ae9286358cdd30148cdc366]]]]
Former-commit-id: 862d1de6c4
Former-commit-id: 427ded7bcf
[formerly e1a62c357f
] [formerly aa40824139fb68908b53530f21471f11b8574ff6 [formerly 2534fb0ab1
]]
Former-commit-id: ba614ffc66271bad6ea9aa0bbd26d6d7c66e8869 [formerly f7baa0ee4b
]
Former-commit-id: c6a43bacfd
2014-04-02 09:54:53 -05:00
Mike Duff
5d31ddb1ca
Issue #2938 - Fix site/role change logic for messages
...
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500
Former-commit-id: 656966669d
[formerly 66181ca3a5
] [formerly 8967ddd94a
] [formerly 656966669d
[formerly 66181ca3a5
] [formerly 8967ddd94a
] [formerly 169ad502de
[formerly 8967ddd94a
[formerly 9ffc540c21245b308334040234be03d78a501656]]]]
Former-commit-id: 169ad502de
Former-commit-id: fe8961bb24
[formerly 3686e50328
] [formerly f6d2ebf70d78eeca18274f66c05c2ad2791f600b [formerly f117f575eb
]]
Former-commit-id: 4d6d18da98db131b315736ebe9f687afb4224c68 [formerly 54d17b375f
]
Former-commit-id: cc53c1ac23
2014-04-02 08:12:53 -05:00
Lee Venable
12711070be
Issue #2979 - added dispose check to runAsync call.
...
Former-commit-id: fed1709f40
[formerly 6a5754b403
] [formerly c0d95865f2
] [formerly fed1709f40
[formerly 6a5754b403
] [formerly c0d95865f2
] [formerly 4a81165239
[formerly c0d95865f2
[formerly d590cbe1508e1dfc1557e558a4a55aa7388e1d40]]]]
Former-commit-id: 4a81165239
Former-commit-id: 1574e8a3b0
[formerly 3cf97272ca
] [formerly e418656bdca96cb73e044ab17808764c7423d8c0 [formerly d97d0bc29d
]]
Former-commit-id: 52c3d49dd15aee47a78d707f3244ef8d9e6f9054 [formerly ae40345134
]
Former-commit-id: dc378fc213
2014-04-01 16:36:22 -05:00
Lee Venable
6504ca5274
Issue #2976 - added SWT widget dispose check in runAsync call.
...
Former-commit-id: 9187c4ccf4
[formerly 311337f5fc
] [formerly 64905717e2
] [formerly 9187c4ccf4
[formerly 311337f5fc
] [formerly 64905717e2
] [formerly e6c9f4870e
[formerly 64905717e2
[formerly 8617d57ea899877ba3f0149059a439d5dc60c5a2]]]]
Former-commit-id: e6c9f4870e
Former-commit-id: 961c8cf1fa
[formerly 1eed6a7ec6
] [formerly 98b1ee3341a955bdfd361a9c85746fc1e941720d [formerly d4279a4390
]]
Former-commit-id: 7dd30e6ee6bd30daa9a0a8e1e297f21196aa3374 [formerly 4a04c52a3f
]
Former-commit-id: d67cf5faee
2014-04-01 11:19:41 -05:00
Nate Jensen
82b6359359
Merge "Issue #2937 Separate room logging into a subdirectory to separate room logs from other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory for dependency jars so that symbolic links are not needed in order to build. Fixes for Archive log access and search." into development
...
Former-commit-id: abc7cd02ff
[formerly 449b28f4b9
] [formerly 700269993a
] [formerly abc7cd02ff
[formerly 449b28f4b9
] [formerly 700269993a
] [formerly a373345f6e
[formerly 700269993a
[formerly 4bcf4eac3618baa1d92c57b5984ff72ebf8d3dbc]]]]
Former-commit-id: a373345f6e
Former-commit-id: 43896bf040
[formerly 008f7693c9
] [formerly b059d767e05b95533bb39256f2380c2f1f0573f0 [formerly 93ca04828d
]]
Former-commit-id: b85886c8c094af6edab0711fd632353b155e1c00 [formerly 8e3eb67f21
]
Former-commit-id: 470bc1e14c
2014-04-01 10:01:35 -05:00
Richard Peter
d33e5c19a6
Merge "Issue #2791 Fix streamlines that were broken in conversion to data source." into development
...
Former-commit-id: 472d4a213f
[formerly 584c8d2fc3
] [formerly 609e574825
] [formerly 472d4a213f
[formerly 584c8d2fc3
] [formerly 609e574825
] [formerly e0af16feed
[formerly 609e574825
[formerly 045e498e5d6a47bc35fc7d26b8d8b431dcd4b492]]]]
Former-commit-id: e0af16feed
Former-commit-id: cbd9ce9df3
[formerly 088b1ebcc0
] [formerly 0b26cd285b56f196e8054113c3a18f6c2f904098 [formerly 42d745e515
]]
Former-commit-id: b4807b261f95692bc1ddf8cb553d69e7f21499d6 [formerly 2e5f76bf21
]
Former-commit-id: 39bfdd51e8
2014-04-01 09:38:23 -05:00
Nate Jensen
69dfc13be9
Merge "Issue #2899 - Improve error messages." into development
...
Former-commit-id: 65f7ef9290
[formerly 651b40e423
] [formerly fe56feaa74
] [formerly 65f7ef9290
[formerly 651b40e423
] [formerly fe56feaa74
] [formerly b9aae5b0f2
[formerly fe56feaa74
[formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]]]]
Former-commit-id: b9aae5b0f2
Former-commit-id: a6497bb55d
[formerly addd8031b1
] [formerly 253abdca80717dff3140bda2f1a2de3138cf2346 [formerly b5461e0ddb
]]
Former-commit-id: a13593d31c7ddd509c49b38021ad9b5c0148a63c [formerly 71598c15ac
]
Former-commit-id: 37738c66af
2014-04-01 08:46:25 -05:00
Lee Venable
420f016ce3
Issue #2970 - added SWT dispose checks to runAsync methods.
...
Former-commit-id: bd8d4feea2
[formerly 91c1cc0e2a
] [formerly 64f5da88ff
] [formerly bd8d4feea2
[formerly 91c1cc0e2a
] [formerly 64f5da88ff
] [formerly 4714913a8c
[formerly 64f5da88ff
[formerly b07ebb73405c3421c6afa3e45db57162a7ca622b]]]]
Former-commit-id: 4714913a8c
Former-commit-id: 2cea1633be
[formerly b95ff2aa5c
] [formerly 399d430b6568ed3139d21a7f38ca7481ea493a92 [formerly 198785dc0c
]]
Former-commit-id: 7927179f7a36deb8cf780601cf1f82e254b59140 [formerly a6f051fe39
]
Former-commit-id: fa8e70f496
2014-03-31 16:06:59 -05:00
Mike Duff
7d72dbb7b7
Issue #2899 - Improve error messages.
...
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c
Former-commit-id: b1aae9256c
[formerly dc81b79eca
] [formerly bcdfd5a0c9
] [formerly b1aae9256c
[formerly dc81b79eca
] [formerly bcdfd5a0c9
] [formerly d6ce901a3a
[formerly bcdfd5a0c9
[formerly e83da0adee12900da03cb4b273a90d13fc5fc327]]]]
Former-commit-id: d6ce901a3a
Former-commit-id: 2b67428bb8
[formerly be5eeafeb7
] [formerly d9ffb6af27ebcb9dc33b400820eb8e9b7a36691a [formerly 6453a46d96
]]
Former-commit-id: caeedf26817e21885f4777c70ac99b1ff9d095d5 [formerly 3c5c496b81
]
Former-commit-id: d664eb9199
2014-03-31 16:01:44 -05:00
Mike Duff
ab5fbf6116
Issue #2952 - Change MPE fieldgen to use thriftSrv
...
Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3
Former-commit-id: 5d44d7d470
[formerly d1a705822c
] [formerly 2cb92e6039
] [formerly 5d44d7d470
[formerly d1a705822c
] [formerly 2cb92e6039
] [formerly 235080c256
[formerly 2cb92e6039
[formerly 182b9f69c72332e73cdda26ebbebedb4abc059b0]]]]
Former-commit-id: 235080c256
Former-commit-id: f753a3bb03
[formerly 7bb2c5535a
] [formerly c7fdcb88f6d17b73071e2cd4f40334515c7187d6 [formerly b4f0f5c5b0
]]
Former-commit-id: 542c7ee1b81bfc43f2f04c099d8dbc0cc0be2386 [formerly fca3f85dca
]
Former-commit-id: 579bc71968
2014-03-31 15:08:33 -05:00
Brad Gonzales
2637e3c237
Issue #2937 Separate room logging into a subdirectory to separate room logs from
...
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build. Fixes for Archive log access
and search.
Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174
Former-commit-id: 85911a9d01
[formerly d4659c48a6
] [formerly 404faeeca0
] [formerly 85911a9d01
[formerly d4659c48a6
] [formerly 404faeeca0
] [formerly 15e1b7a7f6
[formerly 404faeeca0
[formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: c12c4cf7e2
[formerly 1c685a9eb6
] [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5 [formerly 2f56fd3c9d
]]
Former-commit-id: 742e4cc46d2a1218def59e841a9507b8581e81ce [formerly 4940c40a7f
]
Former-commit-id: 5506e9362a
2014-03-31 11:45:22 -05:00
Mike Duff
ef58a05e3f
Issue #2689 - Add input values to log statement on LL to HRAP conversion failure.
...
Fix error in HRAP overlay resource.
Change-Id: If6fcb23a839323e4541e8ff28c0d702bf3066273
Former-commit-id: 43f7e3307a
[formerly d5c3ddcef8
] [formerly be9cf109b1
] [formerly 43f7e3307a
[formerly d5c3ddcef8
] [formerly be9cf109b1
] [formerly 5f1f931c64
[formerly be9cf109b1
[formerly ee88ab32961525d74a227cccec615c0610dc9525]]]]
Former-commit-id: 5f1f931c64
Former-commit-id: 5dd6bad115
[formerly c518a6710b
] [formerly e1dad5245b047c7e36a1a34a412afe2bccff0886 [formerly da5a3bf858
]]
Former-commit-id: 939b0eca2c26d276830d997fe69b66abdf13e62b [formerly a007cb795c
]
Former-commit-id: b0a9b09f16
2014-03-31 11:35:06 -05:00
Lee Venable
2644d48fc0
Issue #2960 - added checks for SashForm weights
...
Former-commit-id: 0b8d762f4b
[formerly bdb18ea85b
] [formerly 19dd95ba24
] [formerly 0b8d762f4b
[formerly bdb18ea85b
] [formerly 19dd95ba24
] [formerly 3018ff1f5f
[formerly 19dd95ba24
[formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 5ffe5c01f6
[formerly f7e1ee666b
] [formerly 8994df39c007e35516677413a4a7d0c0f74e7bc6 [formerly 1504b3532e
]]
Former-commit-id: 8b5260355b4e750a39f73f261eadbf55b49f4555 [formerly 5bbb65637e
]
Former-commit-id: d1928c95d9
2014-03-28 15:30:11 -05:00
Nate Jensen
22028c8e80
Merge "Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions" into development
...
Former-commit-id: 95710fff2a
[formerly a69165b4db
] [formerly e7882b1409
] [formerly 95710fff2a
[formerly a69165b4db
] [formerly e7882b1409
] [formerly 5af9c9113c
[formerly e7882b1409
[formerly 723d44e31b8aad30428a3c1fd024b05555b4e9af]]]]
Former-commit-id: 5af9c9113c
Former-commit-id: b9a24788bc
[formerly 219be3e2e3
] [formerly 1196279dfcb99aa5ff7ca86319c6b157a1e5fc53 [formerly ca19d00b1d
]]
Former-commit-id: 04399542fb3cd59e9e4877f1d6c9c41c32332ddd [formerly 582aa4c699
]
Former-commit-id: 6d34715e21
2014-03-27 17:25:55 -05:00
Mike Duff
db4d8b76f0
Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
...
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b
Former-commit-id: 5476afd095
[formerly d2eed9891a
] [formerly d803986440
] [formerly 5476afd095
[formerly d2eed9891a
] [formerly d803986440
] [formerly 98b5fd762e
[formerly d803986440
[formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]]
Former-commit-id: 98b5fd762e
Former-commit-id: cd626d0555
[formerly f92754f752
] [formerly 7b61ae882d35a9231f7bff856832af42ae2f309a [formerly b1d74f855e
]]
Former-commit-id: 7aadfd7a15d93ff37cbf9b952a4c1868beb41dee [formerly 531e66cbb6
]
Former-commit-id: 5e0e640336
2014-03-27 16:31:30 -05:00
Roger Ferrel
0d00028dbb
Issue #2879 Code clean up.
...
Former-commit-id: 131f48b094
[formerly 4a306121bd
] [formerly dd09032119
] [formerly 131f48b094
[formerly 4a306121bd
] [formerly dd09032119
] [formerly f6fe26d3de
[formerly dd09032119
[formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]]
Former-commit-id: f6fe26d3de
Former-commit-id: 84af47197e
[formerly ba38afeeb9
] [formerly 6ccd977daf48d3ec39f823e632c44c3cf519092d [formerly 867d85e17d
]]
Former-commit-id: 93ba9785644a1a92fd98cf1c11a27afb2927fe88 [formerly d44c677b5a
]
Former-commit-id: 17fe559a70
2014-03-27 16:17:02 -05:00
Roger Ferrel
d0d2da8c96
Issue #2879 Loading case no longer changes start/end time.
...
Former-commit-id: db88893eac
[formerly 6e2d462052
] [formerly 2f9c62bd0c
] [formerly db88893eac
[formerly 6e2d462052
] [formerly 2f9c62bd0c
] [formerly b78a05658d
[formerly 2f9c62bd0c
[formerly 60275732b2abcecf671a8338c8f87334baad3702]]]]
Former-commit-id: b78a05658d
Former-commit-id: 7a33681851
[formerly 394e8fcbcf
] [formerly c545ff124a95b3a99150b9de93f0f583ad152243 [formerly 16ade55cb6
]]
Former-commit-id: 57445f1cdff14fed91c5451d70a4254ed882e1b8 [formerly 9c1dc3c8ab
]
Former-commit-id: c907b28a02
2014-03-27 15:52:31 -05:00
Ben Steffensmeier
225ee343a4
Issue #2791 Fix streamlines that were broken in conversion to data source.
...
Former-commit-id: 288621fd9c
[formerly 4289b416c0
] [formerly b4c30292f8
] [formerly 288621fd9c
[formerly 4289b416c0
] [formerly b4c30292f8
] [formerly 3c6fa3bfc8
[formerly b4c30292f8
[formerly 644ceb3fb7a4f01f74a0259043b23e4d01ce16c0]]]]
Former-commit-id: 3c6fa3bfc8
Former-commit-id: 0efa412e99
[formerly 83d17a138e
] [formerly a8575e0c50ea7854743176738e8faefc64b768b6 [formerly 2589749b76
]]
Former-commit-id: ebabe04a6177553af86c870b0d009dcae5a7b594 [formerly f7ecee99ff
]
Former-commit-id: 7e0fc8bda5
2014-03-27 15:09:00 -05:00
Ron Anderson
350eb0a1ca
Merge "Issue #2664 Added support for non-WGS84 shape files" into development
...
Former-commit-id: e7ec80c0ca
[formerly a97734c786
] [formerly 21e3eeca05
] [formerly e7ec80c0ca
[formerly a97734c786
] [formerly 21e3eeca05
] [formerly 86c0fe78f2
[formerly 21e3eeca05
[formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 6264fd681d
[formerly 374f012e85
] [formerly 277e90770a5c5453a1ebffc7aa107e33b2fb38a6 [formerly c318aa6547
]]
Former-commit-id: ad44818ed2b68b4354be44e373ce58805e068972 [formerly 8eb249f866
]
Former-commit-id: 93d29b05a9
2014-03-27 14:35:34 -05:00
Ron Anderson
646c62a8ba
Issue #2664 Added support for non-WGS84 shape files
...
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951
Former-commit-id: b08d5dfe21
[formerly c9e456983b
] [formerly 1b39ed7771
] [formerly b08d5dfe21
[formerly c9e456983b
] [formerly 1b39ed7771
] [formerly 4c6cddc7d4
[formerly 1b39ed7771
[formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: fb564d8275
[formerly 527399107f
] [formerly 4fef82c9075c140b26c17875dcbc2c745ae87cba [formerly 65d4400471
]]
Former-commit-id: 3c3058cdbd32ff8cd85f2b3669d54013ea5c1764 [formerly 8f6c261d0d
]
Former-commit-id: b92df6757a
2014-03-27 13:04:44 -05:00
Bryan Kowal
81409b58ad
Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development
...
Former-commit-id: b55006b39a
[formerly 5b563bf870
] [formerly e0d15b8e29
] [formerly b55006b39a
[formerly 5b563bf870
] [formerly e0d15b8e29
] [formerly faa7604827
[formerly e0d15b8e29
[formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]]
Former-commit-id: faa7604827
Former-commit-id: fad5502b49
[formerly 5ce208ec73
] [formerly 55c97eebe8665cd8a5690127e9024a4759ccbf78 [formerly 7d68836b88
]]
Former-commit-id: bf823af8b5dc1647aa95c10de14343ce893dff72 [formerly 01a7d32bc1
]
Former-commit-id: a64288b37d
2014-03-27 09:25:14 -05:00
Steve Harris
64b4a6a719
Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
...
Former-commit-id: 883244fa2e
[formerly 29f4f53d27
] [formerly a70710b467
] [formerly 883244fa2e
[formerly 29f4f53d27
] [formerly a70710b467
] [formerly 656ae897c1
[formerly a70710b467
[formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]]
Former-commit-id: 656ae897c1
Former-commit-id: 4cc478e83b
[formerly b99ed0cce6
] [formerly c89d11e09dd409255cf1e5daff026439aa00fab2 [formerly b1d31f21bc
]]
Former-commit-id: 1efcd8cc307635929ab51dd088d4ae8d0cac33f0 [formerly 2d6dde4ac6
]
Former-commit-id: d9af02b1d2
2014-03-26 16:19:26 -05:00
Steve Harris
1b2aaf6387
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: ef7ebd22b4
[formerly d940427408
] [formerly 53f91fdeea
] [formerly ef7ebd22b4
[formerly d940427408
] [formerly 53f91fdeea
] [formerly e5910b6c60
[formerly 53f91fdeea
[formerly b0b18895aa445ee9b29674443529558b2141c042]]]]
Former-commit-id: e5910b6c60
Former-commit-id: 46efda0c29
[formerly 9d4f24da7b
] [formerly 81756753feb5c4701663ee447ac1a92dcfa9676d [formerly 1b9ebbddcc
]]
Former-commit-id: 5fea27f243c9eecb35421417c3ad89c087bf92ae [formerly 7a7a9cc18e
]
Former-commit-id: 76def67552
2014-03-26 16:13:59 -05:00
Bryan Kowal
7cf013ef34
Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
...
Former-commit-id: d455d71216
[formerly 911c0a99c9
] [formerly a554dc8c20
] [formerly d455d71216
[formerly 911c0a99c9
] [formerly a554dc8c20
] [formerly 286051cbb9
[formerly a554dc8c20
[formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]]
Former-commit-id: 286051cbb9
Former-commit-id: 718bbc47f4
[formerly f0f10e2544
] [formerly 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242
]]
Former-commit-id: ce22ec280d942b3e0262be01d99c367f30ddd085 [formerly f5c1cf750b
]
Former-commit-id: 6dc3ae2214
2014-03-26 14:57:46 -05:00
Bryan Kowal
76ff65b153
Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
...
Former-commit-id: 3821e13dcd
[formerly 3f06c30135
] [formerly 386e85fce9
] [formerly 3821e13dcd
[formerly 3f06c30135
] [formerly 386e85fce9
] [formerly 6df224e171
[formerly 386e85fce9
[formerly c28104c670e68296662a2d81def52d1122a7ef98]]]]
Former-commit-id: 6df224e171
Former-commit-id: 1a1c33b8c8
[formerly d8b088392b
] [formerly b1fdb0c4cb169ca5eddb0cdb3e8bfdb6ee9a3dbb [formerly 70fdc03a5c
]]
Former-commit-id: b381d3bffe26ed16cde6f061a49487c72c515ad4 [formerly 7a451cd404
]
Former-commit-id: ccff1985f9
2014-03-26 09:19:05 -05:00
Brian.Dyke
dc35ed8fe1
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: 642cdfe2e6
[formerly 027cca8673
] [formerly 7cc471a9c9
] [formerly 642cdfe2e6
[formerly 027cca8673
] [formerly 7cc471a9c9
] [formerly a0e7cb624a
[formerly 7cc471a9c9
[formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 6476c4fb85
[formerly 412a7eb2c2
] [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226
]]
Former-commit-id: 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376 [formerly c19fc33493
]
Former-commit-id: e7aea77979
2014-03-25 15:41:58 -04:00
Ron Anderson
743af9ff6e
Merge "Issue #2874 Initial implementation of RTOFS data." into development
...
Former-commit-id: 1715102f26
[formerly c8b2da72ee
] [formerly 1cad7c8ea7
] [formerly 1715102f26
[formerly c8b2da72ee
] [formerly 1cad7c8ea7
] [formerly fdbb505679
[formerly 1cad7c8ea7
[formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]]
Former-commit-id: fdbb505679
Former-commit-id: ac0f8c1339
[formerly b154755f33
] [formerly 1ac36120a099b3b2a502909144590734aecf5303 [formerly bbbf19c72e
]]
Former-commit-id: 3c82c84f59dde146d2dc5bd1f90dd7c031a5fdf9 [formerly e7e9cf1e36
]
Former-commit-id: d843d14130
2014-03-25 13:20:02 -05:00
Richard Peter
623c22dc31
Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
...
Former-commit-id: 4188281e8b
[formerly c37a55b552
] [formerly 3e2f280091
] [formerly 4188281e8b
[formerly c37a55b552
] [formerly 3e2f280091
] [formerly 3221310454
[formerly 3e2f280091
[formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]]
Former-commit-id: 3221310454
Former-commit-id: e5dc574b44
[formerly 457e51a4ee
] [formerly dd67ae29188f830e505220cad6a9914b86728cf8 [formerly 6ebd2444ef
]]
Former-commit-id: 9e25d318570ed325f8c438ef3e7becc22eb1ed13 [formerly 4a3238b071
]
Former-commit-id: f8765902f3
2014-03-25 13:11:36 -05:00
Nate Jensen
64be4dae2d
Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
...
Former-commit-id: d1ca7d7c75
[formerly c7dc0baeb9
] [formerly 38e3305e60
] [formerly d1ca7d7c75
[formerly c7dc0baeb9
] [formerly 38e3305e60
] [formerly 4861f92ef6
[formerly 38e3305e60
[formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 0a9da8ca6c
[formerly 307cdc15c1
] [formerly f289ec627b5f30e10b3a962e1f08f3e13492e4e2 [formerly 7c581cb5d7
]]
Former-commit-id: 2b59d9930948c459e8f6edef62cf78dc6f8d5fda [formerly 015dc45eba
]
Former-commit-id: a36bdb3b99
2014-03-25 13:11:29 -05:00
Bryan Kowal
55d6a3d893
Issue #2851 - 64-bit gridslice library for Windows
...
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly
Former-commit-id: 4e4f55eb6c
[formerly 065e1dac5e
] [formerly 37a6b85483
] [formerly 4e4f55eb6c
[formerly 065e1dac5e
] [formerly 37a6b85483
] [formerly 53d1b8bcbb
[formerly 37a6b85483
[formerly 687a060d44c88723de7f775925536adb9f71a257]]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 5e07b5f00d
[formerly 77601dbb9f
] [formerly e2ae36264143a5a4e9f00cb98512d5d27750943e [formerly dcaac3d61d
]]
Former-commit-id: c95efa5e24ae795fb1c31d13c054b1b9f956a07a [formerly 95f181f95f
]
Former-commit-id: 6a9e1fec9c
2014-03-25 13:03:44 -05:00
Brian.Dyke
fbba012c20
OB_14.1.1-25 baseline
...
Former-commit-id: c66bac30c7
[formerly c085bc6879
] [formerly c67833407c
] [formerly c66bac30c7
[formerly c085bc6879
] [formerly c67833407c
] [formerly 074abeb0fa
[formerly c67833407c
[formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 5b848e5480
[formerly 95ada25b65
] [formerly ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4
]]
Former-commit-id: 01adcc7557cfbd24c6477e8cc858ba353ef8328c [formerly 05ab17425c
]
Former-commit-id: 2ba9b8825b
2014-03-25 13:55:54 -04:00
Mike Duff
e83edec2f9
Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
...
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b
Former-commit-id: e0fc16c612
[formerly 1eefb7be44
] [formerly 0bfdcdcbe0
] [formerly e0fc16c612
[formerly 1eefb7be44
] [formerly 0bfdcdcbe0
] [formerly befb72d65e
[formerly 0bfdcdcbe0
[formerly b69a8729347de1f0a8ab855f778559085c6de741]]]]
Former-commit-id: befb72d65e
Former-commit-id: 78523a861c
[formerly f0f10d8061
] [formerly 81e6f193a12ca5c960bf6c6512fb2a5e76dbdeec [formerly c13b5959e9
]]
Former-commit-id: 8ee7955908dabc55180cbe5783a7c2c0b5910e15 [formerly 8f0a23c91b
]
Former-commit-id: a86684f034
2014-03-25 12:13:29 -05:00
Nate Jensen
6a4a03ce29
Merge "Issue #2935 fix refresh issue" into development
...
Former-commit-id: 61653d8e45
[formerly 07c97d0fda
] [formerly 4fe0db7411
] [formerly 61653d8e45
[formerly 07c97d0fda
] [formerly 4fe0db7411
] [formerly 21d448c0bc
[formerly 4fe0db7411
[formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]]
Former-commit-id: 21d448c0bc
Former-commit-id: c4eb2113d8
[formerly 33c20da77f
] [formerly 428b0f96016670efcf89eef5a265277ea2a064c3 [formerly c726dd0589
]]
Former-commit-id: 2e7d76cf33686af3c2657509f0c3685de39f22ed [formerly ead4e7833c
]
Former-commit-id: 2d08cd2ec7
2014-03-25 11:25:38 -05:00
Mike Duff
3b224f6ac9
Issue #2938 - Show status message for site/role changes, but not return from away
...
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2
Former-commit-id: 1d0edcc2c6
[formerly 758fdca514
] [formerly 1e42d8a30d
] [formerly 1d0edcc2c6
[formerly 758fdca514
] [formerly 1e42d8a30d
] [formerly a06f058ea9
[formerly 1e42d8a30d
[formerly 666a354d6f676b899bd14371517bce9de88192d2]]]]
Former-commit-id: a06f058ea9
Former-commit-id: 47402575c0
[formerly 81ac35a1b8
] [formerly 6fb4c8dc2286133134b00c03341141f90a3454df [formerly d497c533e6
]]
Former-commit-id: 2740eb49374c5a2de83bcfcf6da18c01c8648899 [formerly 97c4e48255
]
Former-commit-id: 7705874ea3
2014-03-25 11:18:09 -05:00
Nate Jensen
d085d6bfcb
Issue #2935 fix refresh issue
...
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994
Former-commit-id: c6474ef98e
[formerly d1f080fd05
] [formerly 68f9181340
] [formerly c6474ef98e
[formerly d1f080fd05
] [formerly 68f9181340
] [formerly 7b586ebd67
[formerly 68f9181340
[formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 19b2056aaf
[formerly 447b1a36bb
] [formerly 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0 [formerly 0cad1fa167
]]
Former-commit-id: 48d96d20b890321c6bbe7e22129e08fa04053556 [formerly a5b0c8b432
]
Former-commit-id: 8e3b78ba6a
2014-03-25 10:24:11 -05:00
Nate Jensen
fcfad86ab1
Merge "Issue #2954 - Handle missing scale files at cave startup." into development
...
Former-commit-id: 8f104b014a
[formerly e64401eedf
] [formerly d11a2dd96b
] [formerly 8f104b014a
[formerly e64401eedf
] [formerly d11a2dd96b
] [formerly 9e2a9022ae
[formerly d11a2dd96b
[formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: eba1575cf9
[formerly 476e4df3ff
] [formerly 57178504bc6c5c5d7cb61e70d2bca941f07ed2d2 [formerly 68298da133
]]
Former-commit-id: 37eea3fb44b429aaa5481204be0f99fed1786785 [formerly 82f9b6a092
]
Former-commit-id: ef30c5f9c8
2014-03-25 08:37:55 -05:00
Mike Duff
44321505fb
Issue #2954 - Handle missing scale files at cave startup.
...
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: a3bf92988a
[formerly 39cb0ac9e3
] [formerly 372e9dc80f
] [formerly a3bf92988a
[formerly 39cb0ac9e3
] [formerly 372e9dc80f
] [formerly 9334bc2b00
[formerly 372e9dc80f
[formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]]]]
Former-commit-id: 9334bc2b00
Former-commit-id: f2c11bd688
[formerly fb0073c74b
] [formerly 8d4152bf8316554ef4fe24d94ae4d45059ccf75e [formerly 6de201d3f8
]]
Former-commit-id: 57ca440faa2e175864b84fff01d646ec63369f80 [formerly 9c80493102
]
Former-commit-id: e33813eef9
2014-03-24 16:38:38 -05:00
Lee Venable
908e23a804
Issue #2951 - added dispose checks for runAsync calls.
...
Former-commit-id: 0198c5ff1e
[formerly 4afcc659a2
] [formerly f5c4414c72
] [formerly 0198c5ff1e
[formerly 4afcc659a2
] [formerly f5c4414c72
] [formerly c2d52987f8
[formerly f5c4414c72
[formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]]]]
Former-commit-id: c2d52987f8
Former-commit-id: b230e78880
[formerly 2575b680d1
] [formerly de469ece47bd6a50ae9f194c5d5c29cdb7e661df [formerly d0ec74f4b7
]]
Former-commit-id: ab6d5df188fcb6a58d51b75c086c49ce9d5f2aab [formerly 464ae77609
]
Former-commit-id: edcb08e4fe
2014-03-24 16:14:49 -05:00
Nate Jensen
ffd0b3727f
Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development
...
Former-commit-id: 0d8f4f9894
[formerly 0fa5b14762
] [formerly 5df9be36da
] [formerly 0d8f4f9894
[formerly 0fa5b14762
] [formerly 5df9be36da
] [formerly a47c32f4b9
[formerly 5df9be36da
[formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]]]]
Former-commit-id: a47c32f4b9
Former-commit-id: d915d24263
[formerly b0616edf0e
] [formerly 22a246ea5d586e8a71193286dc6d684e75f9915d [formerly 2d97ef8631
]]
Former-commit-id: c707e51b08d00c66e2bc5c25b3fa0f29b2afc422 [formerly 92bf5f5075
]
Former-commit-id: d207333ed5
2014-03-24 15:59:20 -05:00
Mike Duff
e9dae1a861
Issue #2936 - Remove the join alert from the nws collaboration feed
...
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840
Former-commit-id: 0fd2a2a426
[formerly eacc161ee4
] [formerly fd31ea7fa5
] [formerly 0fd2a2a426
[formerly eacc161ee4
] [formerly fd31ea7fa5
] [formerly ca27ceac1f
[formerly fd31ea7fa5
[formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]]
Former-commit-id: ca27ceac1f
Former-commit-id: dd804a13ff
[formerly 86fc8d74d5
] [formerly 26a0a3d7ea325414e2b4fd69c1a38bcc0d1f1c56 [formerly fc7a71889c
]]
Former-commit-id: aaf5ab7ad0f3fc0cc724c92a5e30b5288b163eed [formerly a1661a5389
]
Former-commit-id: 9075ec61a0
2014-03-24 14:59:33 -05:00
Nate Jensen
6897e58b4e
Issue #2868 plot delegate python now uses PythonCoordinatorJob API,
...
Refactored plot data request, image creation, and sample
threading
Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918
Former-commit-id: 85b411bca3
[formerly 2418c9bdfe
] [formerly fe33896e7e
] [formerly 85b411bca3
[formerly 2418c9bdfe
] [formerly fe33896e7e
] [formerly c4beb293b9
[formerly fe33896e7e
[formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]]
Former-commit-id: c4beb293b9
Former-commit-id: df01318647
[formerly 0acb4621f9
] [formerly 3d803664963a310bbf45fe46e8f20c9255a3b529 [formerly 774091461c
]]
Former-commit-id: c0e78be8fc6eca4dfac050feb6b22af3fded1f5c [formerly 96339798b5
]
Former-commit-id: 5b6683bd56
2014-03-24 14:59:31 -05:00
Lee Venable
c3fc029557
Issue #1426 - fixed arrow buttons and simplified the code.
...
Former-commit-id: ae20115f26
[formerly 75504da2bc
] [formerly 702ebe6881
] [formerly ae20115f26
[formerly 75504da2bc
] [formerly 702ebe6881
] [formerly 4c80552979
[formerly 702ebe6881
[formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]]]]
Former-commit-id: 4c80552979
Former-commit-id: df75b3fdf3
[formerly 5b0f8f631f
] [formerly 62fef10759c19715b0dfa7dbcac04f2cc05c70d1 [formerly 18de63886c
]]
Former-commit-id: 80dd1ca1ac8d916b7fabf27c7599e3118b0bf72c [formerly 3af5936abd
]
Former-commit-id: ca68a98f36
2014-03-24 14:08:49 -05:00
Ben Steffensmeier
1aa51a118b
Issue #2874 Initial implementation of RTOFS data.
...
Former-commit-id: 9e2e500040
[formerly 1c18e800b3
] [formerly 55046a8e1e
] [formerly 9e2e500040
[formerly 1c18e800b3
] [formerly 55046a8e1e
] [formerly 12ed72b0c0
[formerly 55046a8e1e
[formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 26558fad1e
[formerly aadc22091e
] [formerly 17445664d752b4ffa0186bdce951baaffefd1f21 [formerly ab8293c6a1
]]
Former-commit-id: b8e1bca2fe93a3c4fa125052086c7d64a243b406 [formerly d20a1a6f54
]
Former-commit-id: 77d809f66a
2014-03-24 11:10:18 -05:00
Brian.Dyke
91da395a71
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 674036b172
[formerly 50e5f4f78d
] [formerly 06ee9a6384
] [formerly 674036b172
[formerly 50e5f4f78d
] [formerly 06ee9a6384
] [formerly 07b2e04d7a
[formerly 06ee9a6384
[formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 402035e7f9
[formerly d97b88f433
] [formerly 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7
]]
Former-commit-id: 2c253da743c15a00910b72d8aac49c5cbb6f5609 [formerly f540c6fb2d
]
Former-commit-id: aea0544eec
2014-03-24 07:01:29 -04:00
Lee Venable
d08f39f428
Issue #2925 - Fixed NPE found during testing.
...
Former-commit-id: a700d23f6d
[formerly cc7d240cfd
] [formerly c29981fa99
] [formerly a700d23f6d
[formerly cc7d240cfd
] [formerly c29981fa99
] [formerly 5b73c516d3
[formerly c29981fa99
[formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 1fb169f1ce
[formerly 05a4c4e31b
] [formerly 0052d9d30c35dc39dd69aece42fc59a0f471c58f [formerly f08d4a827f
]]
Former-commit-id: 275c2d56eebfcd30f92e3347955172f87a580714 [formerly 2384cc90c0
]
Former-commit-id: f160e66a85
2014-03-21 12:42:13 -05:00
Brian.Dyke
1f96787564
OB_14.1.1-24 baseline
...
Former-commit-id: 8366e88db1
[formerly 37e9d48d45
] [formerly 37b6368268
] [formerly 8366e88db1
[formerly 37e9d48d45
] [formerly 37b6368268
] [formerly face1ebeeb
[formerly 37b6368268
[formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]]
Former-commit-id: face1ebeeb
Former-commit-id: 49f7c81de1
[formerly cfa058a345
] [formerly 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93
]]
Former-commit-id: bd70e5cfe36861d8349138232ac519963886caa3 [formerly 2fda566cfb
]
Former-commit-id: 7aeb9af309
2014-03-21 12:43:50 -04:00