xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5645 commits 31 branches 40 tags 3.8 GiB
Commit graph

3125 commits

Author SHA1 Message Date
Ron Anderson
dfcdaadbe2 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: 51ffcd7ce8 [formerly f4b31b336a] [formerly 51ffcd7ce8 [formerly f4b31b336a] [formerly efb27793f4 [formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]
Former-commit-id: efb27793f4
Former-commit-id: c1e5e2fd18 [formerly bfed3dc521]
Former-commit-id: 6385c81420
 2014-04-02 16:55:02 -05:00
Dave Hladky
fedb08a7eb Issue #2889 user who issued change now shows in notification center 
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc

Former-commit-id: 2d18b657a8 [formerly 1671baaf10] [formerly 2d18b657a8 [formerly 1671baaf10] [formerly 9479219b73 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]
Former-commit-id: 9479219b73
Former-commit-id: 86287bb5df [formerly f26450c40d]
Former-commit-id: 577b6402da
 2014-04-02 14:06:25 -05:00
Nate Jensen
691c4411fc Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development 
Former-commit-id: c0704488cc [formerly 6b20d38b1a] [formerly c0704488cc [formerly 6b20d38b1a] [formerly 579d2416cb [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]
Former-commit-id: 579d2416cb
Former-commit-id: d5d42f2f6b [formerly 19560ebc7c]
Former-commit-id: 62f1451e50
 2014-04-02 11:23:02 -05:00
Mike Duff
ce774c07a8 Issue #2632 - Remove user from list on sign-off. Fixed check for available 
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: 2a9b434883 [formerly 538261f6d5] [formerly 2a9b434883 [formerly 538261f6d5] [formerly d5df936431 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]
Former-commit-id: d5df936431
Former-commit-id: 7aa5cebfb0 [formerly 92f1a3a9aa]
Former-commit-id: 0aea45197a
 2014-04-02 10:08:45 -05:00
Nate Jensen
7cfff411fb Merge "Issue #2938 - Fix site/role change logic for messages" into development 
Former-commit-id: 654d5abb57 [formerly 6637623c4f] [formerly 654d5abb57 [formerly 6637623c4f] [formerly eab75cab11 [formerly 8fe6aa419874d54755836fa44e252d53b32b7f8c]]]
Former-commit-id: eab75cab11
Former-commit-id: 4494674310 [formerly a9e2e856d6]
Former-commit-id: 09f9090d3d
 2014-04-02 09:55:19 -05:00
Nate Jensen
c6a43bacfd Merge "Issue #2952 - Change MPE fieldgen to use thriftSrv" into development 
Former-commit-id: 8040bcd68d [formerly 0b25f77fe8] [formerly 8040bcd68d [formerly 0b25f77fe8] [formerly 862d1de6c4 [formerly 8efaad8250215b687ae9286358cdd30148cdc366]]]
Former-commit-id: 862d1de6c4
Former-commit-id: e1a62c357f [formerly 2534fb0ab1]
Former-commit-id: f7baa0ee4b
 2014-04-02 09:54:53 -05:00
Ron Anderson
0033d7d3ef Issue #2969 Fixed error when Topo parm is unloaded. 
Fixed check state of Topography menu item.

Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b

Former-commit-id: 346984b8ab [formerly 11fbd86558] [formerly 346984b8ab [formerly 11fbd86558] [formerly d556055299 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: 3ac3d5de1b [formerly ac7c5460f6]
Former-commit-id: 4e88052beb
 2014-04-02 09:07:22 -05:00
Mike Duff
cc53c1ac23 Issue #2938 - Fix site/role change logic for messages 
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 66181ca3a5 [formerly 8967ddd94a] [formerly 66181ca3a5 [formerly 8967ddd94a] [formerly 169ad502de [formerly 9ffc540c21245b308334040234be03d78a501656]]]
Former-commit-id: 169ad502de
Former-commit-id: 3686e50328 [formerly f117f575eb]
Former-commit-id: 54d17b375f
 2014-04-02 08:12:53 -05:00
Lee Venable
dc378fc213 Issue #2979 - added dispose check to runAsync call. 
Former-commit-id: 6a5754b403 [formerly c0d95865f2] [formerly 6a5754b403 [formerly c0d95865f2] [formerly 4a81165239 [formerly d590cbe1508e1dfc1557e558a4a55aa7388e1d40]]]
Former-commit-id: 4a81165239
Former-commit-id: 3cf97272ca [formerly d97d0bc29d]
Former-commit-id: ae40345134
 2014-04-01 16:36:22 -05:00
Brian.Dyke
c2a3ec6f04 Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2 
Former-commit-id: 3186434368 [formerly 6e515eb334] [formerly 3186434368 [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: d163d9d190 [formerly c013460db1]
Former-commit-id: 5345add58d
 2014-04-01 14:29:33 -04:00
Lee Venable
d67cf5faee Issue #2976 - added SWT widget dispose check in runAsync call. 
Former-commit-id: 311337f5fc [formerly 64905717e2] [formerly 311337f5fc [formerly 64905717e2] [formerly e6c9f4870e [formerly 8617d57ea899877ba3f0149059a439d5dc60c5a2]]]
Former-commit-id: e6c9f4870e
Former-commit-id: 1eed6a7ec6 [formerly d4279a4390]
Former-commit-id: 4a04c52a3f
 2014-04-01 11:19:41 -05:00
Nate Jensen
470bc1e14c 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: 449b28f4b9 [formerly 700269993a] [formerly 449b28f4b9 [formerly 700269993a] [formerly a373345f6e [formerly 4bcf4eac3618baa1d92c57b5984ff72ebf8d3dbc]]]
Former-commit-id: a373345f6e
Former-commit-id: 008f7693c9 [formerly 93ca04828d]
Former-commit-id: 8e3eb67f21
 2014-04-01 10:01:35 -05:00
Richard Peter
39bfdd51e8 Merge "Issue #2791 Fix streamlines that were broken in conversion to data source." into development 
Former-commit-id: 584c8d2fc3 [formerly 609e574825] [formerly 584c8d2fc3 [formerly 609e574825] [formerly e0af16feed [formerly 045e498e5d6a47bc35fc7d26b8d8b431dcd4b492]]]
Former-commit-id: e0af16feed
Former-commit-id: 088b1ebcc0 [formerly 42d745e515]
Former-commit-id: 2e5f76bf21
 2014-04-01 09:38:23 -05:00
Nate Jensen
37738c66af Merge "Issue #2899 - Improve error messages." into development 
Former-commit-id: 651b40e423 [formerly fe56feaa74] [formerly 651b40e423 [formerly fe56feaa74] [formerly b9aae5b0f2 [formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]]]
Former-commit-id: b9aae5b0f2
Former-commit-id: addd8031b1 [formerly b5461e0ddb]
Former-commit-id: 71598c15ac
 2014-04-01 08:46:25 -05:00
Lee Venable
fa8e70f496 Issue #2970 - added SWT dispose checks to runAsync methods. 
Former-commit-id: 91c1cc0e2a [formerly 64f5da88ff] [formerly 91c1cc0e2a [formerly 64f5da88ff] [formerly 4714913a8c [formerly b07ebb73405c3421c6afa3e45db57162a7ca622b]]]
Former-commit-id: 4714913a8c
Former-commit-id: b95ff2aa5c [formerly 198785dc0c]
Former-commit-id: a6f051fe39
 2014-03-31 16:06:59 -05:00
Mike Duff
d664eb9199 Issue #2899 - Improve error messages. 
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

Former-commit-id: dc81b79eca [formerly bcdfd5a0c9] [formerly dc81b79eca [formerly bcdfd5a0c9] [formerly d6ce901a3a [formerly e83da0adee12900da03cb4b273a90d13fc5fc327]]]
Former-commit-id: d6ce901a3a
Former-commit-id: be5eeafeb7 [formerly 6453a46d96]
Former-commit-id: 3c5c496b81
 2014-03-31 16:01:44 -05:00
Mike Duff
579bc71968 Issue #2952 - Change MPE fieldgen to use thriftSrv 
Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3

Former-commit-id: d1a705822c [formerly 2cb92e6039] [formerly d1a705822c [formerly 2cb92e6039] [formerly 235080c256 [formerly 182b9f69c72332e73cdda26ebbebedb4abc059b0]]]
Former-commit-id: 235080c256
Former-commit-id: 7bb2c5535a [formerly b4f0f5c5b0]
Former-commit-id: fca3f85dca
 2014-03-31 15:08:33 -05:00
Brad Gonzales
5506e9362a 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: d4659c48a6 [formerly 404faeeca0] [formerly d4659c48a6 [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: 1c685a9eb6 [formerly 2f56fd3c9d]
Former-commit-id: 4940c40a7f
 2014-03-31 11:45:22 -05:00
Mike Duff
b0a9b09f16 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: d5c3ddcef8 [formerly be9cf109b1] [formerly d5c3ddcef8 [formerly be9cf109b1] [formerly 5f1f931c64 [formerly ee88ab32961525d74a227cccec615c0610dc9525]]]
Former-commit-id: 5f1f931c64
Former-commit-id: c518a6710b [formerly da5a3bf858]
Former-commit-id: a007cb795c
 2014-03-31 11:35:06 -05:00
Lee Venable
d1928c95d9 Issue #2960 - added checks for SashForm weights 
Former-commit-id: bdb18ea85b [formerly 19dd95ba24] [formerly bdb18ea85b [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: f7e1ee666b [formerly 1504b3532e]
Former-commit-id: 5bbb65637e
 2014-03-28 15:30:11 -05:00
Nate Jensen
6d34715e21 Merge "Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions" into development 
Former-commit-id: a69165b4db [formerly e7882b1409] [formerly a69165b4db [formerly e7882b1409] [formerly 5af9c9113c [formerly 723d44e31b8aad30428a3c1fd024b05555b4e9af]]]
Former-commit-id: 5af9c9113c
Former-commit-id: 219be3e2e3 [formerly ca19d00b1d]
Former-commit-id: 582aa4c699
 2014-03-27 17:25:55 -05:00
Mike Duff
5e0e640336 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions 
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: d2eed9891a [formerly d803986440] [formerly d2eed9891a [formerly d803986440] [formerly 98b5fd762e [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]
Former-commit-id: 98b5fd762e
Former-commit-id: f92754f752 [formerly b1d74f855e]
Former-commit-id: 531e66cbb6
 2014-03-27 16:31:30 -05:00
Roger Ferrel
17fe559a70 Issue #2879 Code clean up. 
Former-commit-id: 4a306121bd [formerly dd09032119] [formerly 4a306121bd [formerly dd09032119] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]
Former-commit-id: f6fe26d3de
Former-commit-id: ba38afeeb9 [formerly 867d85e17d]
Former-commit-id: d44c677b5a
 2014-03-27 16:17:02 -05:00
Roger Ferrel
c907b28a02 Issue #2879 Loading case no longer changes start/end time. 
Former-commit-id: 6e2d462052 [formerly 2f9c62bd0c] [formerly 6e2d462052 [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]
Former-commit-id: b78a05658d
Former-commit-id: 394e8fcbcf [formerly 16ade55cb6]
Former-commit-id: 9c1dc3c8ab
 2014-03-27 15:52:31 -05:00
Ben Steffensmeier
7e0fc8bda5 Issue #2791 Fix streamlines that were broken in conversion to data source. 
Former-commit-id: 4289b416c0 [formerly b4c30292f8] [formerly 4289b416c0 [formerly b4c30292f8] [formerly 3c6fa3bfc8 [formerly 644ceb3fb7a4f01f74a0259043b23e4d01ce16c0]]]
Former-commit-id: 3c6fa3bfc8
Former-commit-id: 83d17a138e [formerly 2589749b76]
Former-commit-id: f7ecee99ff
 2014-03-27 15:09:00 -05:00
Ron Anderson
93d29b05a9 Merge "Issue #2664 Added support for non-WGS84 shape files" into development 
Former-commit-id: a97734c786 [formerly 21e3eeca05] [formerly a97734c786 [formerly 21e3eeca05] [formerly 86c0fe78f2 [formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 374f012e85 [formerly c318aa6547]
Former-commit-id: 8eb249f866
 2014-03-27 14:35:34 -05:00
David Friedman
8f8f55dd3c Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
 2014-03-27 19:17:03 +00:00
Ron Anderson
b92df6757a Issue #2664 Added support for non-WGS84 shape files 
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: c9e456983b [formerly 1b39ed7771] [formerly c9e456983b [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: 527399107f [formerly 65d4400471]
Former-commit-id: 8f6c261d0d
 2014-03-27 13:04:44 -05:00
Bryan Kowal
a64288b37d Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development 
Former-commit-id: 5b563bf870 [formerly e0d15b8e29] [formerly 5b563bf870 [formerly e0d15b8e29] [formerly faa7604827 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]
Former-commit-id: faa7604827
Former-commit-id: 5ce208ec73 [formerly 7d68836b88]
Former-commit-id: 01a7d32bc1
 2014-03-27 09:25:14 -05:00
Brian.Dyke
102414db3a Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: a1b980a15d [formerly 6346c9776b] [formerly a1b980a15d [formerly 6346c9776b] [formerly 3b639347f8 [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 519ec3071a [formerly 76625c2238]
Former-commit-id: 9fa73765f9
 2014-03-27 10:22:26 -04:00
Steve Harris
d9af02b1d2 Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development 
Former-commit-id: 29f4f53d27 [formerly a70710b467] [formerly 29f4f53d27 [formerly a70710b467] [formerly 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]
Former-commit-id: 656ae897c1
Former-commit-id: b99ed0cce6 [formerly b1d31f21bc]
Former-commit-id: 2d6dde4ac6
 2014-03-26 16:19:26 -05:00
Steve Harris
76def67552 Merge branch 'master_14.2.2' into omaha_14.2.2 
Former-commit-id: d940427408 [formerly 53f91fdeea] [formerly d940427408 [formerly 53f91fdeea] [formerly e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 9d4f24da7b [formerly 1b9ebbddcc]
Former-commit-id: 7a7a9cc18e
 2014-03-26 16:13:59 -05:00
Steve Harris
ef058152a0 Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1 
Former-commit-id: 9cf3600ff6 [formerly 4879520391] [formerly 9cf3600ff6 [formerly 4879520391] [formerly a7efde7cf4 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 311c8d67af [formerly 55440888fd]
Former-commit-id: af32adebc5
 2014-03-26 15:51:32 -05:00
Bryan Kowal
6dc3ae2214 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts 
Former-commit-id: 911c0a99c9 [formerly a554dc8c20] [formerly 911c0a99c9 [formerly a554dc8c20] [formerly 286051cbb9 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]
Former-commit-id: 286051cbb9
Former-commit-id: f0f10e2544 [formerly 6b28f08242]
Former-commit-id: f5c1cf750b
 2014-03-26 14:57:46 -05:00
Bryan Kowal
ccff1985f9 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development 
Former-commit-id: 3f06c30135 [formerly 386e85fce9] [formerly 3f06c30135 [formerly 386e85fce9] [formerly 6df224e171 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]
Former-commit-id: 6df224e171
Former-commit-id: d8b088392b [formerly 70fdc03a5c]
Former-commit-id: 7a451cd404
 2014-03-26 09:19:05 -05:00
Brian.Dyke
e7aea77979 Fixed comment merge conflicts added .gitignore 
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
 2014-03-25 15:41:58 -04:00
Ron Anderson
d843d14130 Merge "Issue #2874 Initial implementation of RTOFS data." into development 
Former-commit-id: c8b2da72ee [formerly 1cad7c8ea7] [formerly c8b2da72ee [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]
Former-commit-id: fdbb505679
Former-commit-id: b154755f33 [formerly bbbf19c72e]
Former-commit-id: e7e9cf1e36
 2014-03-25 13:20:02 -05:00
Richard Peter
f8765902f3 Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development 
Former-commit-id: c37a55b552 [formerly 3e2f280091] [formerly c37a55b552 [formerly 3e2f280091] [formerly 3221310454 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]
Former-commit-id: 3221310454
Former-commit-id: 457e51a4ee [formerly 6ebd2444ef]
Former-commit-id: 4a3238b071
 2014-03-25 13:11:36 -05:00
Nate Jensen
a36bdb3b99 Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development 
Former-commit-id: c7dc0baeb9 [formerly 38e3305e60] [formerly c7dc0baeb9 [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 307cdc15c1 [formerly 7c581cb5d7]
Former-commit-id: 015dc45eba
 2014-03-25 13:11:29 -05:00
Bryan Kowal
6a9e1fec9c 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: 065e1dac5e [formerly 37a6b85483] [formerly 065e1dac5e [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 687a060d44c88723de7f775925536adb9f71a257]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 77601dbb9f [formerly dcaac3d61d]
Former-commit-id: 95f181f95f
 2014-03-25 13:03:44 -05:00
Brian.Dyke
2ba9b8825b OB_14.1.1-25 baseline 
Former-commit-id: c085bc6879 [formerly c67833407c] [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 95ada25b65 [formerly 36fdf6bfe4]
Former-commit-id: 05ab17425c
 2014-03-25 13:55:54 -04:00
Mike Duff
a86684f034 Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text 
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b

Former-commit-id: 1eefb7be44 [formerly 0bfdcdcbe0] [formerly 1eefb7be44 [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]
Former-commit-id: befb72d65e
Former-commit-id: f0f10d8061 [formerly c13b5959e9]
Former-commit-id: 8f0a23c91b
 2014-03-25 12:13:29 -05:00
Nate Jensen
2d08cd2ec7 Merge "Issue #2935 fix refresh issue" into development 
Former-commit-id: 07c97d0fda [formerly 4fe0db7411] [formerly 07c97d0fda [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]
Former-commit-id: 21d448c0bc
Former-commit-id: 33c20da77f [formerly c726dd0589]
Former-commit-id: ead4e7833c
 2014-03-25 11:25:38 -05:00
Mike Duff
7705874ea3 Issue #2938 - Show status message for site/role changes, but not return from away 
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 758fdca514 [formerly 1e42d8a30d] [formerly 758fdca514 [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]
Former-commit-id: a06f058ea9
Former-commit-id: 81ac35a1b8 [formerly d497c533e6]
Former-commit-id: 97c4e48255
 2014-03-25 11:18:09 -05:00
Nate Jensen
8e3b78ba6a Issue #2935 fix refresh issue 
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: d1f080fd05 [formerly 68f9181340] [formerly d1f080fd05 [formerly 68f9181340] [formerly 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 447b1a36bb [formerly 0cad1fa167]
Former-commit-id: a5b0c8b432
 2014-03-25 10:24:11 -05:00
Nate Jensen
ef30c5f9c8 Merge "Issue #2954 - Handle missing scale files at cave startup." into development 
Former-commit-id: e64401eedf [formerly d11a2dd96b] [formerly e64401eedf [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: 476e4df3ff [formerly 68298da133]
Former-commit-id: 82f9b6a092
 2014-03-25 08:37:55 -05:00
Mike Duff
e33813eef9 Issue #2954 - Handle missing scale files at cave startup. 
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 39cb0ac9e3 [formerly 372e9dc80f] [formerly 39cb0ac9e3 [formerly 372e9dc80f] [formerly 9334bc2b00 [formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]]]
Former-commit-id: 9334bc2b00
Former-commit-id: fb0073c74b [formerly 6de201d3f8]
Former-commit-id: 9c80493102
 2014-03-24 16:38:38 -05:00
Lee Venable
edcb08e4fe Issue #2951 - added dispose checks for runAsync calls. 
Former-commit-id: 4afcc659a2 [formerly f5c4414c72] [formerly 4afcc659a2 [formerly f5c4414c72] [formerly c2d52987f8 [formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]]]
Former-commit-id: c2d52987f8
Former-commit-id: 2575b680d1 [formerly d0ec74f4b7]
Former-commit-id: 464ae77609
 2014-03-24 16:14:49 -05:00
Nate Jensen
d207333ed5 Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development 
Former-commit-id: 0fa5b14762 [formerly 5df9be36da] [formerly 0fa5b14762 [formerly 5df9be36da] [formerly a47c32f4b9 [formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]]]
Former-commit-id: a47c32f4b9
Former-commit-id: b0616edf0e [formerly 2d97ef8631]
Former-commit-id: 92bf5f5075
 2014-03-24 15:59:20 -05:00
Mike Duff
9075ec61a0 Issue #2936 - Remove the join alert from the nws collaboration feed 
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: eacc161ee4 [formerly fd31ea7fa5] [formerly eacc161ee4 [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]
Former-commit-id: ca27ceac1f
Former-commit-id: 86fc8d74d5 [formerly fc7a71889c]
Former-commit-id: a1661a5389
 2014-03-24 14:59:33 -05:00