Commit graph

5125 commits

Author SHA1 Message Date
Nate Jensen
427ded7bcf Merge "Issue #2952 - Change MPE fieldgen to use thriftSrv" into development
Former-commit-id: 6e7b3d21a1 [formerly 8040bcd68d] [formerly df2ccad2d0599321f36ad1d0cd527bea37e9fc17 [formerly 0b25f77fe8]] [formerly 862d1de6c4 [formerly 0b25f77fe8 [formerly 8efaad8250215b687ae9286358cdd30148cdc366]]]
Former-commit-id: 862d1de6c4
Former-commit-id: aa40824139fb68908b53530f21471f11b8574ff6 [formerly 2534fb0ab1]
Former-commit-id: e1a62c357f
2014-04-02 09:54:53 -05:00
Greg Armendariz
522eea5741 Merge "Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds" into development
Former-commit-id: d93b20052e [formerly 28d399492b] [formerly 6b65575f3d] [formerly 60ffdf9ff2 [formerly 6b65575f3d [formerly d82ecf1319c5aee6d45fb7b42e8e757dcd6892ca]]]
Former-commit-id: 60ffdf9ff2
Former-commit-id: 26a4b510ba6631318dbc21939b1785a44a6e2976 [formerly eecea8bf4c]
Former-commit-id: 5624e78454
2014-04-01 19:34:23 -05:00
Lee Venable
1574e8a3b0 Issue #2979 - added dispose check to runAsync call.
Former-commit-id: fed1709f40 [formerly 6a5754b403] [formerly c0d95865f2] [formerly 4a81165239 [formerly c0d95865f2 [formerly d590cbe1508e1dfc1557e558a4a55aa7388e1d40]]]
Former-commit-id: 4a81165239
Former-commit-id: e418656bdca96cb73e044ab17808764c7423d8c0 [formerly d97d0bc29d]
Former-commit-id: 3cf97272ca
2014-04-01 16:36:22 -05:00
Lee Venable
961c8cf1fa Issue #2976 - added SWT widget dispose check in runAsync call.
Former-commit-id: 9187c4ccf4 [formerly 311337f5fc] [formerly 64905717e2] [formerly e6c9f4870e [formerly 64905717e2 [formerly 8617d57ea899877ba3f0149059a439d5dc60c5a2]]]
Former-commit-id: e6c9f4870e
Former-commit-id: 98b1ee3341a955bdfd361a9c85746fc1e941720d [formerly d4279a4390]
Former-commit-id: 1eed6a7ec6
2014-04-01 11:19:41 -05:00
Nate Jensen
43896bf040 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 a373345f6e [formerly 700269993a [formerly 4bcf4eac3618baa1d92c57b5984ff72ebf8d3dbc]]]
Former-commit-id: a373345f6e
Former-commit-id: b059d767e05b95533bb39256f2380c2f1f0573f0 [formerly 93ca04828d]
Former-commit-id: 008f7693c9
2014-04-01 10:01:35 -05:00
Richard Peter
a3820ecf07 Merge "Issue #2906 added synoptic obs translation tables" into development
Former-commit-id: 317a4a179f [formerly 349aa18226] [formerly fba9ea7d0c] [formerly 45b4288379 [formerly fba9ea7d0c [formerly 2bb81e87f7937e2223cb740ad56d2fb23d712cdf]]]
Former-commit-id: 45b4288379
Former-commit-id: 4ce44703a14c0b5ea5a9af32883b9a46fcd1269a [formerly 1be8d7b9fc]
Former-commit-id: 238b7c1b2d
2014-04-01 09:43:54 -05:00
Richard Peter
cbd9ce9df3 Merge "Issue #2791 Fix streamlines that were broken in conversion to data source." into development
Former-commit-id: 472d4a213f [formerly 584c8d2fc3] [formerly 609e574825] [formerly e0af16feed [formerly 609e574825 [formerly 045e498e5d6a47bc35fc7d26b8d8b431dcd4b492]]]
Former-commit-id: e0af16feed
Former-commit-id: 0b26cd285b56f196e8054113c3a18f6c2f904098 [formerly 42d745e515]
Former-commit-id: 088b1ebcc0
2014-04-01 09:38:23 -05:00
Nate Jensen
a6497bb55d Merge "Issue #2899 - Improve error messages." into development
Former-commit-id: 65f7ef9290 [formerly 651b40e423] [formerly fe56feaa74] [formerly b9aae5b0f2 [formerly fe56feaa74 [formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]]]
Former-commit-id: b9aae5b0f2
Former-commit-id: 253abdca80717dff3140bda2f1a2de3138cf2346 [formerly b5461e0ddb]
Former-commit-id: addd8031b1
2014-04-01 08:46:25 -05:00
Lee Venable
2cea1633be Issue #2970 - added SWT dispose checks to runAsync methods.
Former-commit-id: bd8d4feea2 [formerly 91c1cc0e2a] [formerly c43379b9168e0214803047217dc368064546dd53 [formerly 64f5da88ff]] [formerly 4714913a8c [formerly 64f5da88ff [formerly b07ebb73405c3421c6afa3e45db57162a7ca622b]]]
Former-commit-id: 4714913a8c
Former-commit-id: 399d430b6568ed3139d21a7f38ca7481ea493a92 [formerly 198785dc0c]
Former-commit-id: b95ff2aa5c
2014-03-31 16:06:59 -05:00
Mike Duff
2b67428bb8 Issue #2899 - Improve error messages.
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

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

Former-commit-id: 5d44d7d470 [formerly d1a705822c] [formerly 2cb92e6039] [formerly 235080c256 [formerly 2cb92e6039 [formerly 182b9f69c72332e73cdda26ebbebedb4abc059b0]]]
Former-commit-id: 235080c256
Former-commit-id: c7fdcb88f6d17b73071e2cd4f40334515c7187d6 [formerly b4f0f5c5b0]
Former-commit-id: 7bb2c5535a
2014-03-31 15:08:33 -05:00
Bryan Kowal
00532f63ff Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds
Amend: remove generated files

Change-Id: I727391745ff9cbaaa1a3953567f909da1da01630

Former-commit-id: 6c0f960c70 [formerly f790e255ff] [formerly 3dcab11c04e38dbe1640bd85c38c8e601f56b4b7 [formerly 72a8f0406f]] [formerly c9ee6a38d0 [formerly 72a8f0406f [formerly 20e1e788dd5ca68497d5496586b30a8463dd0ca8]]]
Former-commit-id: c9ee6a38d0
Former-commit-id: 454c0c02b1d2b3c3e8be077dcbdb6f905ca46d42 [formerly 5f2c5fb681]
Former-commit-id: 12a0cf6185
2014-03-31 12:37:37 -05:00
Brian Clements
bfac7edb8d Issue #2906 added synoptic obs translation tables
created a command line utility to generate translation table starters
added synoptic table mapped values to bufr translation tables


Former-commit-id: 3a29338902 [formerly 467cfe59d0] [formerly f4361b78b6] [formerly 0fa7dfb7df [formerly f4361b78b6 [formerly 7eb9def773f971d5dc0e43d8b191d2b864f290d2]]]
Former-commit-id: 0fa7dfb7df
Former-commit-id: 4ba927c05d23c15fec6ddc105f04d8fa7eea7509 [formerly a37eb5d142]
Former-commit-id: 18d71c92ac
2014-03-31 11:56:04 -05:00
Brad Gonzales
c12c4cf7e2 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 15e1b7a7f6 [formerly 404faeeca0 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: f8fc71ad10a4d9dbd3464113660b2d2d68675fd5 [formerly 2f56fd3c9d]
Former-commit-id: 1c685a9eb6
2014-03-31 11:45:22 -05:00
Mike Duff
5dd6bad115 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 5f1f931c64 [formerly be9cf109b1 [formerly ee88ab32961525d74a227cccec615c0610dc9525]]]
Former-commit-id: 5f1f931c64
Former-commit-id: e1dad5245b047c7e36a1a34a412afe2bccff0886 [formerly da5a3bf858]
Former-commit-id: c518a6710b
2014-03-31 11:35:06 -05:00
Lee Venable
5ffe5c01f6 Issue #2960 - added checks for SashForm weights
Former-commit-id: 0b8d762f4b [formerly bdb18ea85b] [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 19dd95ba24 [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 8994df39c007e35516677413a4a7d0c0f74e7bc6 [formerly 1504b3532e]
Former-commit-id: f7e1ee666b
2014-03-28 15:30:11 -05:00
Nate Jensen
9e6da704d2 Issue #2015 fix NPP displaying in collaboration shared display sessions
Change-Id: Ie5e40d8ff3e7a222448777b86d188822e3990746

Former-commit-id: befeb24d13 [formerly bd3e4659fb] [formerly e74027d8f7cac831ffb694371f09f2e5f7a28192 [formerly 32ae6bfb63]] [formerly 1e0026e60f [formerly 32ae6bfb63 [formerly d4e2da7f81d5c3ad005f299c936bd2d70f05b17a]]]
Former-commit-id: 1e0026e60f
Former-commit-id: a26d4fe2b0bedd830ce627e61d7d2847bf6111b4 [formerly 3c75dd7364]
Former-commit-id: 175f26a005
2014-03-28 09:56:59 -05:00
Nate Jensen
b9a24788bc Merge "Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions" into development
Former-commit-id: 95710fff2a [formerly a69165b4db] [formerly e7882b1409] [formerly 5af9c9113c [formerly e7882b1409 [formerly 723d44e31b8aad30428a3c1fd024b05555b4e9af]]]
Former-commit-id: 5af9c9113c
Former-commit-id: 1196279dfcb99aa5ff7ca86319c6b157a1e5fc53 [formerly ca19d00b1d]
Former-commit-id: 219be3e2e3
2014-03-27 17:25:55 -05:00
Mike Duff
cd626d0555 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: 5476afd095 [formerly d2eed9891a] [formerly d803986440] [formerly 98b5fd762e [formerly d803986440 [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]
Former-commit-id: 98b5fd762e
Former-commit-id: 7b61ae882d35a9231f7bff856832af42ae2f309a [formerly b1d74f855e]
Former-commit-id: f92754f752
2014-03-27 16:31:30 -05:00
Roger Ferrel
84af47197e Issue #2879 Code clean up.
Former-commit-id: 131f48b094 [formerly 4a306121bd] [formerly dd09032119] [formerly f6fe26d3de [formerly dd09032119 [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]
Former-commit-id: f6fe26d3de
Former-commit-id: 6ccd977daf48d3ec39f823e632c44c3cf519092d [formerly 867d85e17d]
Former-commit-id: ba38afeeb9
2014-03-27 16:17:02 -05:00
Roger Ferrel
7a33681851 Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: db88893eac [formerly 6e2d462052] [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 2f9c62bd0c [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]
Former-commit-id: b78a05658d
Former-commit-id: c545ff124a95b3a99150b9de93f0f583ad152243 [formerly 16ade55cb6]
Former-commit-id: 394e8fcbcf
2014-03-27 15:52:31 -05:00
Ben Steffensmeier
0efa412e99 Issue #2791 Fix streamlines that were broken in conversion to data source.
Former-commit-id: 288621fd9c [formerly 4289b416c0] [formerly b4c30292f8] [formerly 3c6fa3bfc8 [formerly b4c30292f8 [formerly 644ceb3fb7a4f01f74a0259043b23e4d01ce16c0]]]
Former-commit-id: 3c6fa3bfc8
Former-commit-id: a8575e0c50ea7854743176738e8faefc64b768b6 [formerly 2589749b76]
Former-commit-id: 83d17a138e
2014-03-27 15:09:00 -05:00
Roger Ferrel
28ddd79513 Issue #2790 Detect problems caused by simultaneous running of purge.
Former-commit-id: e2ba200bfb [formerly ae2cb792a1] [formerly ad5d6428a6] [formerly f012ac179d [formerly ad5d6428a6 [formerly 882cf75a4b9a5773def3dc9f167d2c441883789f]]]
Former-commit-id: f012ac179d
Former-commit-id: 9283ecb3a1798b165e95cbccd2ae0f07d19e5431 [formerly 8b24d06488]
Former-commit-id: b9e1dd70a9
2014-03-27 14:42:09 -05:00
Ron Anderson
6264fd681d Merge "Issue #2664 Added support for non-WGS84 shape files" into development
Former-commit-id: e7ec80c0ca [formerly a97734c786] [formerly 21e3eeca05] [formerly 86c0fe78f2 [formerly 21e3eeca05 [formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 277e90770a5c5453a1ebffc7aa107e33b2fb38a6 [formerly c318aa6547]
Former-commit-id: 374f012e85
2014-03-27 14:35:34 -05:00
Ron Anderson
fb564d8275 Issue #2664 Added support for non-WGS84 shape files
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: b08d5dfe21 [formerly c9e456983b] [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 1b39ed7771 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: 4fef82c9075c140b26c17875dcbc2c745ae87cba [formerly 65d4400471]
Former-commit-id: 527399107f
2014-03-27 13:04:44 -05:00
Slav Korolev
e932f63edc Issue #2811 - Added check for empty message. Updated logger.
Former-commit-id: 8c9fd8176b [formerly 24895b9308] [formerly 9ac8a7a2f3] [formerly 982735561c [formerly 9ac8a7a2f3 [formerly e0010578785dd88861e8c9ef229e3e6452a5bd0e]]]
Former-commit-id: 982735561c
Former-commit-id: 004d3f4af058bed1be995f9ee4c21da64edf5fe7 [formerly b5fb10a84d]
Former-commit-id: 0b04fb80e3
2014-03-27 10:54:41 -04:00
Bryan Kowal
fad5502b49 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 faa7604827 [formerly e0d15b8e29 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]
Former-commit-id: faa7604827
Former-commit-id: 55c97eebe8665cd8a5690127e9024a4759ccbf78 [formerly 7d68836b88]
Former-commit-id: 5ce208ec73
2014-03-27 09:25:14 -05:00
Steve Harris
4cc478e83b Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 656ae897c1 [formerly a70710b467 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]
Former-commit-id: 656ae897c1
Former-commit-id: c89d11e09dd409255cf1e5daff026439aa00fab2 [formerly b1d31f21bc]
Former-commit-id: b99ed0cce6
2014-03-26 16:19:26 -05:00
Steve Harris
46efda0c29 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly e5910b6c60 [formerly 53f91fdeea [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 81756753feb5c4701663ee447ac1a92dcfa9676d [formerly 1b9ebbddcc]
Former-commit-id: 9d4f24da7b
2014-03-26 16:13:59 -05:00
Nate Jensen
3c79a87b2e Merge "Issue #2905 fixed types, added scale/offset in bufr parser" into development
Former-commit-id: ac0b43566e [formerly 5a035c3730] [formerly c97c56c182] [formerly cf0afc8e57 [formerly c97c56c182 [formerly d324fc13d63bbd8edb780512fdce49b1e7c15a92]]]
Former-commit-id: cf0afc8e57
Former-commit-id: 250e8792f4970f1599caa024a87cb739aec13c8a [formerly 59fe50e847]
Former-commit-id: c783b80d8e
2014-03-26 16:12:16 -05:00
Lee Venable
a7f0db7114 Merge "Issue #2930 - Fixed error in distance." into development
Former-commit-id: d7f74c4608 [formerly a03c5a4922] [formerly 7ab1ce0f90] [formerly c0bd44bca8 [formerly 7ab1ce0f90 [formerly e924e378e2f0572f2ee02b23fee61e725f34ce93]]]
Former-commit-id: c0bd44bca8
Former-commit-id: 49ad054eca3e76810df279ec791f17454aa62f8a [formerly 1225edafba]
Former-commit-id: 70a0e968d3
2014-03-26 15:50:14 -05:00
Brian Clements
cdf6991fde Issue #2905 fixed types, added scale/offset in bufr parser
parser now does the following for each data value:
1) promote unsigned values to next larger type
2) replace with null if value equals missing value
3) apply scale factor and addition offset
to do this, the netcdf variable for each structure member was needed
this required walking the variable list along with the struct iterator


Former-commit-id: fd1ad8de3b [formerly 52a7443a6c] [formerly fb7b4ef8be7431dba52130f0cceaf8ba6a7f569a [formerly 82cee15739]] [formerly 3e5a5774c4 [formerly 82cee15739 [formerly dee6d1d1bd169854109f0921ca0c23bc212d2df9]]]
Former-commit-id: 3e5a5774c4
Former-commit-id: 22579f0db72fee00e444ab1a89a6b5b9d69cce63 [formerly e3020dbe8f]
Former-commit-id: 796305a348
2014-03-26 15:20:16 -05:00
Bryan Kowal
718bbc47f4 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 286051cbb9 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]
Former-commit-id: 286051cbb9
Former-commit-id: 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242]
Former-commit-id: f0f10e2544
2014-03-26 14:57:46 -05:00
Richard Peter
338bf77db7 Merge "Issue #2905 added translation tables for BUFR" into development
Former-commit-id: c4907301e1 [formerly 51485f9a74] [formerly a47ad6a51d] [formerly cf494e3290 [formerly a47ad6a51d [formerly 6bc42a9fd38373b4ba8cdbc9a8091eee8b867acd]]]
Former-commit-id: cf494e3290
Former-commit-id: 74585618b613441556f86ffd8482471510957896 [formerly 9e193a27eb]
Former-commit-id: 89680c26a0
2014-03-26 14:47:58 -05:00
Brian Clements
628831261b Issue #2905 added translation tables for BUFR
added current WMO BUFR code/flag XML table file
created parser that can read the WMO XML
created JAXB files for BUFR translation XML files
created utility to generate translation tables for specific BUFR tables


Former-commit-id: 5eee7e6034 [formerly f4ac2d117e] [formerly 6d3d459a90] [formerly d9eb75280d [formerly 6d3d459a90 [formerly 2634afede20af4ab6d059ef6dbd1af093184f90a]]]
Former-commit-id: d9eb75280d
Former-commit-id: 829beea4f8449a55d4ba450cb7b423c7d691c147 [formerly a153775c32]
Former-commit-id: 1bfbe099ea
2014-03-26 14:34:41 -05:00
Slav Korolev
e112de7701 Issue #2930 - Fixed error in distance.
Former-commit-id: e39ed3568a [formerly b197408019] [formerly c0688f9e99] [formerly 9b9d7f8f4e [formerly c0688f9e99 [formerly c56753c19f8413e1094b524a9bc43bbcfc74e46f]]]
Former-commit-id: 9b9d7f8f4e
Former-commit-id: 1652d8a3ce196167348b0fbd1e7557d4d751c3c6 [formerly 77803ef6b6]
Former-commit-id: 154206a2cb
2014-03-26 10:48:38 -04:00
Bryan Kowal
1a1c33b8c8 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 3821e13dcd [formerly 3f06c30135] [formerly 386e85fce9] [formerly 6df224e171 [formerly 386e85fce9 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]
Former-commit-id: 6df224e171
Former-commit-id: b1fdb0c4cb169ca5eddb0cdb3e8bfdb6ee9a3dbb [formerly 70fdc03a5c]
Former-commit-id: d8b088392b
2014-03-26 09:19:05 -05:00
Brian.Dyke
6476c4fb85 Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]
Former-commit-id: 412a7eb2c2
2014-03-25 15:41:58 -04:00
Ron Anderson
ac0f8c1339 Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: 1715102f26 [formerly c8b2da72ee] [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 1cad7c8ea7 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]
Former-commit-id: fdbb505679
Former-commit-id: 1ac36120a099b3b2a502909144590734aecf5303 [formerly bbbf19c72e]
Former-commit-id: b154755f33
2014-03-25 13:20:02 -05:00
Richard Peter
e5dc574b44 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 3221310454 [formerly 3e2f280091 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]
Former-commit-id: 3221310454
Former-commit-id: dd67ae29188f830e505220cad6a9914b86728cf8 [formerly 6ebd2444ef]
Former-commit-id: 457e51a4ee
2014-03-25 13:11:36 -05:00
Nate Jensen
0a9da8ca6c 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 4861f92ef6 [formerly 38e3305e60 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]
Former-commit-id: 4861f92ef6
Former-commit-id: f289ec627b5f30e10b3a962e1f08f3e13492e4e2 [formerly 7c581cb5d7]
Former-commit-id: 307cdc15c1
2014-03-25 13:11:29 -05:00
Bryan Kowal
5e07b5f00d 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 53d1b8bcbb [formerly 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: e2ae36264143a5a4e9f00cb98512d5d27750943e [formerly dcaac3d61d]
Former-commit-id: 77601dbb9f
2014-03-25 13:03:44 -05:00
Brian.Dyke
5b848e5480 OB_14.1.1-25 baseline
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]
Former-commit-id: 95ada25b65
2014-03-25 13:55:54 -04:00
Mike Duff
78523a861c 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 befb72d65e [formerly 0bfdcdcbe0 [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]
Former-commit-id: befb72d65e
Former-commit-id: 81e6f193a12ca5c960bf6c6512fb2a5e76dbdeec [formerly c13b5959e9]
Former-commit-id: f0f10d8061
2014-03-25 12:13:29 -05:00
Nate Jensen
c4eb2113d8 Merge "Issue #2935 fix refresh issue" into development
Former-commit-id: 61653d8e45 [formerly 07c97d0fda] [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 4fe0db7411 [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]
Former-commit-id: 21d448c0bc
Former-commit-id: 428b0f96016670efcf89eef5a265277ea2a064c3 [formerly c726dd0589]
Former-commit-id: 33c20da77f
2014-03-25 11:25:38 -05:00
Mike Duff
47402575c0 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 a06f058ea9 [formerly 1e42d8a30d [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]
Former-commit-id: a06f058ea9
Former-commit-id: 6fb4c8dc2286133134b00c03341141f90a3454df [formerly d497c533e6]
Former-commit-id: 81ac35a1b8
2014-03-25 11:18:09 -05:00
Greg Armendariz
f9e6adb11f Merge "Issue #2851 - 64-bit Windows Jep DLL" into development
Former-commit-id: 269a2f1091 [formerly a628c811ec] [formerly e8e90ff576] [formerly 035029851a [formerly e8e90ff576 [formerly 4729ae8efbd4ada965c45a67540349cd58a4b543]]]
Former-commit-id: 035029851a
Former-commit-id: b8ba835c9b0693ac3c866aecdd38f33affb2f7f9 [formerly 8d2ad9c43a]
Former-commit-id: fa2e5c0546
2014-03-25 10:45:18 -05:00
Bryan Kowal
ea67a997f6 Issue #2851 - 64-bit Windows Jep DLL
cots/org.jep.win64/jep.dll: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: aa83fbe567 [formerly a758bbdfaa] [formerly 5976347a921e475c15cd1f91b7bb504ddccbc540 [formerly 5871d767db]] [formerly 1feefeb41b [formerly 5871d767db [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]]
Former-commit-id: 1feefeb41b
Former-commit-id: a02f1e3bc84b917182117b2f562502f1f22a9e07 [formerly a02cf1f5df]
Former-commit-id: 278ff3c00a
2014-03-25 10:27:53 -05:00
Nate Jensen
19b2056aaf Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: c6474ef98e [formerly d1f080fd05] [formerly 68f9181340] [formerly 7b586ebd67 [formerly 68f9181340 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0 [formerly 0cad1fa167]
Former-commit-id: 447b1a36bb
2014-03-25 10:24:11 -05:00
Nate Jensen
eba1575cf9 Merge "Issue #2954 - Handle missing scale files at cave startup." into development
Former-commit-id: 8f104b014a [formerly e64401eedf] [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly d11a2dd96b [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: 57178504bc6c5c5d7cb61e70d2bca941f07ed2d2 [formerly 68298da133]
Former-commit-id: 476e4df3ff
2014-03-25 08:37:55 -05:00