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

5085 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Peter
3b21d80e86 Merge "Issue #2905 added translation tables for BUFR" into development 
Former-commit-id: 51485f9a74 [formerly a47ad6a51d] [formerly 51485f9a74 [formerly a47ad6a51d] [formerly cf494e3290 [formerly 6bc42a9fd38373b4ba8cdbc9a8091eee8b867acd]]]
Former-commit-id: cf494e3290
Former-commit-id: 89680c26a0 [formerly 9e193a27eb]
Former-commit-id: 2be893ab5d
 2014-03-26 14:47:58 -05:00
Brian Clements
2169cffb74 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: f4ac2d117e [formerly 6d3d459a90] [formerly f4ac2d117e [formerly 6d3d459a90] [formerly d9eb75280d [formerly 2634afede20af4ab6d059ef6dbd1af093184f90a]]]
Former-commit-id: d9eb75280d
Former-commit-id: 1bfbe099ea [formerly a153775c32]
Former-commit-id: 77b66da899
 2014-03-26 14:34:41 -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
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
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
Greg Armendariz
8f54660efa Merge "Issue #2851 - 64-bit Windows Jep DLL" into development 
Former-commit-id: a628c811ec [formerly e8e90ff576] [formerly a628c811ec [formerly e8e90ff576] [formerly 035029851a [formerly 4729ae8efbd4ada965c45a67540349cd58a4b543]]]
Former-commit-id: 035029851a
Former-commit-id: fa2e5c0546 [formerly 8d2ad9c43a]
Former-commit-id: 386804aa8e
 2014-03-25 10:45:18 -05:00
Bryan Kowal
8c8a0539ce 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: a758bbdfaa [formerly 5871d767db] [formerly a758bbdfaa [formerly 5871d767db] [formerly 1feefeb41b [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]]
Former-commit-id: 1feefeb41b
Former-commit-id: 278ff3c00a [formerly a02cf1f5df]
Former-commit-id: 116711b64f
 2014-03-25 10:27:53 -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
Nate Jensen
5b6683bd56 Issue #2868 plot delegate python now uses PythonCoordinatorJob API, 
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: 2418c9bdfe [formerly fe33896e7e] [formerly 2418c9bdfe [formerly fe33896e7e] [formerly c4beb293b9 [formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]
Former-commit-id: c4beb293b9
Former-commit-id: 0acb4621f9 [formerly 774091461c]
Former-commit-id: 96339798b5
 2014-03-24 14:59:31 -05:00
Lee Venable
ca68a98f36 Issue #1426 - fixed arrow buttons and simplified the code. 
Former-commit-id: 75504da2bc [formerly 702ebe6881] [formerly 75504da2bc [formerly 702ebe6881] [formerly 4c80552979 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]]]
Former-commit-id: 4c80552979
Former-commit-id: 5b0f8f631f [formerly 18de63886c]
Former-commit-id: 3af5936abd
 2014-03-24 14:08:49 -05:00
Ben Steffensmeier
77d809f66a Issue #2874 Initial implementation of RTOFS data. 
Former-commit-id: 1c18e800b3 [formerly 55046a8e1e] [formerly 1c18e800b3 [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: aadc22091e [formerly ab8293c6a1]
Former-commit-id: d20a1a6f54
 2014-03-24 11:10:18 -05:00
Slav Korolev
54e1c39279 Issue #2652. Fixed issue with edex-text-ingest log. Corrected. 
Change-Id: I0064146b6b6d1c05955f513ab9eda9b6ba03de76

Former-commit-id: c730d58f6c [formerly 4786aa382b] [formerly c730d58f6c [formerly 4786aa382b] [formerly 88fbcc2ca6 [formerly dd0660d1b51aef2e3e703fd21c0f1d98f3484fbc]]]
Former-commit-id: 88fbcc2ca6
Former-commit-id: 84d8d13da7 [formerly c6f98da81c]
Former-commit-id: 49bd53ef7c
 2014-03-21 15:25:51 -04:00
Lee Venable
f160e66a85 Issue #2925 - Fixed NPE found during testing. 
Former-commit-id: cc7d240cfd [formerly c29981fa99] [formerly cc7d240cfd [formerly c29981fa99] [formerly 5b73c516d3 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 05a4c4e31b [formerly f08d4a827f]
Former-commit-id: 2384cc90c0
 2014-03-21 12:42:13 -05:00
Richard Peter
c3e96872f1 Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development 
Former-commit-id: fa801ee21e [formerly e766c3b5bf] [formerly fa801ee21e [formerly e766c3b5bf] [formerly b87cb91164 [formerly f3ed4ac03fd902909d027e576245ebb47c4d69b3]]]
Former-commit-id: b87cb91164
Former-commit-id: dae6dcd9fa [formerly 1777bc667c]
Former-commit-id: 8b0b197a79
 2014-03-21 10:23:08 -05:00
Nate Jensen
bb0d7ba73d Merge "Issue #2688 Return value from subprocess.check_output is not return code, but is process output. Updated check for success." into development 
Former-commit-id: 1765aa8d1b [formerly 28ddcc3883] [formerly 1765aa8d1b [formerly 28ddcc3883] [formerly c14a1e2952 [formerly 134dae207d8f8ec28b355760ec79ce76ac009b82]]]
Former-commit-id: c14a1e2952
Former-commit-id: 54110899c5 [formerly b1dbc1a6ae]
Former-commit-id: 3903eb195c
 2014-03-21 09:03:21 -05:00
Lee Venable
22f0babb46 Merge "Issue #2925 - added runAsync dispose checks." into development 
Former-commit-id: d8f6d3eeb4 [formerly 7d4062dc66] [formerly d8f6d3eeb4 [formerly 7d4062dc66] [formerly 597fe2b674 [formerly cb16fae6fd3cebdf1c80fc18dbc2684c27018b3d]]]
Former-commit-id: 597fe2b674
Former-commit-id: b5e946dc69 [formerly 88619d51a1]
Former-commit-id: 9ec7c38125
 2014-03-20 17:49:30 -05:00
Brad Gonzales
ff0548af38 Issue #2688 Return value from 
subprocess.check_output is not return code, but is process output.
Updated check for success.

Change-Id: If06cb77406f4c5dd07a356236b7a8cae908cd2fd

Former-commit-id: 7f4abee83c [formerly 28440284d1] [formerly 7f4abee83c [formerly 28440284d1] [formerly 8d7178cf68 [formerly 8fb43f1e2a108af18c1a6908bed54e8ca71369e0]]]
Former-commit-id: 8d7178cf68
Former-commit-id: 61653e1c1a [formerly 28b1daf0e0]
Former-commit-id: aef9e747dc
 2014-03-20 16:39:43 -05:00
Nate Jensen
eff32cc336 Merge "Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image." into development 
Former-commit-id: 94c25f784e [formerly 8a3c03b260] [formerly 94c25f784e [formerly 8a3c03b260] [formerly a47328b3cb [formerly 8fddee15ee0fbe36c917b06cdf64f76c2b69fc86]]]
Former-commit-id: a47328b3cb
Former-commit-id: bcd700102f [formerly a5cf7bd6e0]
Former-commit-id: 229672e8bc
 2014-03-20 14:22:57 -05:00
Nate Jensen
12c127a163 Merge "Issue #2791 fix NaN handling of smoothed contours." into development 
Former-commit-id: d2ad1bf3f2 [formerly f9b86f97e0] [formerly d2ad1bf3f2 [formerly f9b86f97e0] [formerly c64f0b2558 [formerly 347b9555cfe67ee5643b92bd84afbd1e2899acd7]]]
Former-commit-id: c64f0b2558
Former-commit-id: 57907af1e8 [formerly 59485dbac7]
Former-commit-id: af4b4c326b
 2014-03-20 14:19:17 -05:00
Ben Steffensmeier
49ebe73b07 Issue #2791 fix NaN handling of smoothed contours. 
Former-commit-id: b9cbe28411 [formerly 76fcfe163e] [formerly b9cbe28411 [formerly 76fcfe163e] [formerly c5aac15437 [formerly a6f8a0bd2758008997555e08ea7245517535b1db]]]
Former-commit-id: c5aac15437
Former-commit-id: 133767ff26 [formerly a9ee8b9b2f]
Former-commit-id: 466ce63273
 2014-03-20 13:34:52 -05:00
Ben Steffensmeier
166f571c84 Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image. 
Former-commit-id: ff0dfb0b11 [formerly 286f447a9c] [formerly ff0dfb0b11 [formerly 286f447a9c] [formerly 14af3282cb [formerly db3ffd586611ea8692728ea0de5451cec89421b6]]]
Former-commit-id: 14af3282cb
Former-commit-id: 4fbe62066a [formerly 48dac44df4]
Former-commit-id: bb39a48e5b
 2014-03-20 13:31:08 -05:00
Brad Gonzales
412262edcf Issue #2873 Removed 32 bit native libraries and references. 
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: de508133ff [formerly 08dde4824f] [formerly de508133ff [formerly 08dde4824f] [formerly 189234f162 [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]
Former-commit-id: 189234f162
Former-commit-id: 0022633626 [formerly d303662a51]
Former-commit-id: f859a625d0
 2014-03-20 13:27:39 -05:00
Lee Venable
bf055bee25 Issue #2925 - added runAsync dispose checks. 
Change-Id: I4048f4b4ae8976d93b1bee89179be527ee3139e5

Former-commit-id: 43cfdc587a [formerly 112f7a886e] [formerly 43cfdc587a [formerly 112f7a886e] [formerly 397cb233d4 [formerly 2ebffdcfca606309daa3ed587f696a95af0b094e]]]
Former-commit-id: 397cb233d4
Former-commit-id: 30f7cac193 [formerly 2a6f9e8a85]
Former-commit-id: 60f93fef09
 2014-03-20 13:09:17 -05:00
Nate Jensen
51eda792e5 Merge "Issue #2905 added ucar bufr parser" into development 
Former-commit-id: 24acffb941 [formerly 68ef66d3c1] [formerly 24acffb941 [formerly 68ef66d3c1] [formerly 72156362db [formerly 3f966aded5f61189bc7e02343219c36063dece5e]]]
Former-commit-id: 72156362db
Former-commit-id: ca07f99f29 [formerly fcf4a7e142]
Former-commit-id: dcf91e0b4a
 2014-03-20 12:28:26 -05:00
Mike Duff
ab451ac799 Issue #2857 - Implement Redbook NCO NDM menus 
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b

Former-commit-id: 645e16792e [formerly c67f9c4be2] [formerly 645e16792e [formerly c67f9c4be2] [formerly 4ec18a8178 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]]]
Former-commit-id: 4ec18a8178
Former-commit-id: 80855b8e08 [formerly a624cd8053]
Former-commit-id: bb07313742
 2014-03-20 11:24:48 -05:00
Mike Duff
df31189a39 Issue #2856 - Implement Redbook CPC ndm menus 
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693

Former-commit-id: cdee2df27f [formerly 25c8a0a8aa] [formerly cdee2df27f [formerly 25c8a0a8aa] [formerly 40319e5fcf [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]]]
Former-commit-id: 40319e5fcf
Former-commit-id: af9f9ba2c8 [formerly 09be0ef28d]
Former-commit-id: 9335ae821e
 2014-03-20 11:16:35 -05:00
Brian Clements
f673684948 Issue #2905 added ucar bufr parser 
added netcdf 4.2 bufr library to ucar.nc2 foss
added backported 4.3 bufr splitter library
created a parser wrapper for ease of use


Former-commit-id: 5b69e9b21c [formerly 199701def9] [formerly 5b69e9b21c [formerly 199701def9] [formerly 5348f0a29d [formerly 5ddf9be7105dbd8d1fb76ce28a4e6e3f03240974]]]
Former-commit-id: 5348f0a29d
Former-commit-id: 420b48c8ea [formerly 0e11ca3cfe]
Former-commit-id: c203e2d631
 2014-03-20 11:11:53 -05:00
Richard Peter
694ad6dd4d Merge "Issue #2859 - Implement redbook MPC NDM menus" into development 
Former-commit-id: 734eeedd36 [formerly 7070313c0b] [formerly 734eeedd36 [formerly 7070313c0b] [formerly 14bed8a1df [formerly dc3a698f046599a19beed986c2424c1b8796927e]]]
Former-commit-id: 14bed8a1df
Former-commit-id: 1eaad7ed7e [formerly 2ea76b73cf]
Former-commit-id: 0668437eba
 2014-03-20 11:01:08 -05:00
Lee Venable
b9b9f57472 Merge "Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level" into development 
Former-commit-id: fae5d96361 [formerly 65335c255d] [formerly fae5d96361 [formerly 65335c255d] [formerly 47f5ec5139 [formerly a5ba903c1500f5e989d9ab6aa80f2521d0653a42]]]
Former-commit-id: 47f5ec5139
Former-commit-id: f72aea75af [formerly 7499124119]
Former-commit-id: 1bd6fe401d
 2014-03-20 10:38:17 -05:00
David Gillingham
e147fe5674 Issue #2882: Allow null values to be passed back in parameter values for DefaultGeometryData. 
Change-Id: I258d247476cf280e107d386b903e9764a492d4f4

Former-commit-id: e34f698b1d [formerly d58bb87ee6] [formerly e34f698b1d [formerly d58bb87ee6] [formerly 0407f5b2e5 [formerly 0e583860b64e9ca856152affe70f62d5f866af4f]]]
Former-commit-id: 0407f5b2e5
Former-commit-id: 7d27ef3a2e [formerly 492264e695]
Former-commit-id: dec9acd621
 2014-03-19 17:28:03 -05:00
Mike Duff
580af4bdeb Issue #2859 - Implement redbook MPC NDM menus 
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e

Former-commit-id: 4be30fdc5b [formerly 059ac9c52a] [formerly 4be30fdc5b [formerly 059ac9c52a] [formerly e479bd7055 [formerly 619efadc2230af13707f124534d3caf2fdfaba68]]]
Former-commit-id: e479bd7055
Former-commit-id: 0b94340d7e [formerly bb07c57f3e]
Former-commit-id: c67dacabf5
 2014-03-19 14:40:00 -05:00
Bryan Kowal
d189d82929 Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level 
Amend: use baseline Redmine number

Change-Id: I765c1199e9d8b639e3c87afec41798459f0f92e4

Former-commit-id: e7c80e9bfd [formerly 316f9b4747] [formerly e7c80e9bfd [formerly 316f9b4747] [formerly 4e320a35a3 [formerly b48eb97e9d270ad49d93f2ca85ceae48da9b9269]]]
Former-commit-id: 4e320a35a3
Former-commit-id: e92a5230a3 [formerly 68c1654214]
Former-commit-id: f02a9f476a
 2014-03-19 14:07:03 -05:00
Slav Korolev
bcc2a7ecc5 Issue #2652. Fixed issue with edex-text-ingest log. 
Former-commit-id: 68a98f4d85 [formerly ef75ea04c0] [formerly 68a98f4d85 [formerly ef75ea04c0] [formerly 7ca9607e68 [formerly 62f19ca599740c580973e166e8053ba1c4800178]]]
Former-commit-id: 7ca9607e68
Former-commit-id: cfe67c2528 [formerly 423fc045e3]
Former-commit-id: 0eb6d0ebde
 2014-03-19 11:00:51 -04:00
Lee Venable
c59ab27cd4 Merge "Issue #2433 - Implement view by priority check box menus review comments" into development 
Former-commit-id: 12aa173989 [formerly 96ea26a9a2] [formerly 12aa173989 [formerly 96ea26a9a2] [formerly ab3de987b4 [formerly 27cb84fc6629e94927a4e80cba9586df20805b0a]]]
Former-commit-id: ab3de987b4
Former-commit-id: 4ed1e7327e [formerly 9784b3737e]
Former-commit-id: 51234efbbb
 2014-03-19 08:54:39 -05:00
Nate Jensen
6d25649178 Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development 
Former-commit-id: bc9f494604 [formerly 3ee42187e6] [formerly bc9f494604 [formerly 3ee42187e6] [formerly d44fee0588 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]]]
Former-commit-id: d44fee0588
Former-commit-id: 116c66b685 [formerly 99643d9545]
Former-commit-id: beeabfec37
 2014-03-18 17:01:44 -05:00
Mike Duff
ae25f4e867 Issue #2433 - Implement view by priority check box menus 
review comments

Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7

Former-commit-id: 9d24291927 [formerly a7e568e799] [formerly 9d24291927 [formerly a7e568e799] [formerly 202a822384 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]]]
Former-commit-id: 202a822384
Former-commit-id: b0554f903f [formerly 980e398584]
Former-commit-id: 43744f0255
 2014-03-18 16:42:58 -05:00
Nate Jensen
e25dd853df Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development 
Former-commit-id: 61c5a25407 [formerly 85e3ac041a] [formerly 61c5a25407 [formerly 85e3ac041a] [formerly 7e7745cd7b [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]]]
Former-commit-id: 7e7745cd7b
Former-commit-id: e3bc322d49 [formerly 3e32812f13]
Former-commit-id: f823e46676
 2014-03-18 13:13:53 -05:00
Nate Jensen
1125203c93 Issue #2895 fixed telestration when leadership returns to a previous 
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 68b60eba47 [formerly e75d3dfb7c] [formerly 68b60eba47 [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 8589374171 [formerly ca1ec93450]
Former-commit-id: 5cb38bd511
 2014-03-18 12:52:01 -05:00
Nate Jensen
19a66e94b9 Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development 
Former-commit-id: b5f2064207 [formerly 5f79ece006] [formerly b5f2064207 [formerly 5f79ece006] [formerly e9be36b08c [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]]]
Former-commit-id: e9be36b08c
Former-commit-id: 8ebc031a07 [formerly a4728542c5]
Former-commit-id: 4483a54b05
 2014-03-18 12:38:48 -05:00
Mike Duff
179082ebf9 Issue #2798 - Fix issue with color not changing for existing user changing site. 
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: ac65a87fe5 [formerly 3d10260065] [formerly ac65a87fe5 [formerly 3d10260065] [formerly 7bdef60a55 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]
Former-commit-id: 7bdef60a55
Former-commit-id: 1a3e88c5da [formerly 5bbe504f82]
Former-commit-id: b560f16623
 2014-03-18 11:55:00 -05:00