Commit graph

3064 commits

Author SHA1 Message Date
Nate Jensen
678fdc5e2e Issue #1803 fix redbook sharing in collaboration
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: b591e66736 [formerly 4cccdac37e] [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly 1efb9a2a4d [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: aa1362605787dece16aa34229e2c361a80278f2b [formerly a191b473e2]
Former-commit-id: 2750a173dc
2014-04-10 10:50:33 -05:00
Nate Jensen
1822ef2a7e Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: d784482c45 [formerly 56b820ab97] [formerly ec40cb3dfc] [formerly eaf1382178 [formerly ec40cb3dfc [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: 86328e4c52cd162460d6569d863534fac351186a [formerly 952586230a]
Former-commit-id: a0e2342126
2014-04-09 16:07:25 -05:00
Everett Kladstrup
2c4f13742b Issue #2725 Add new project to alertviz feature
Former-commit-id: e4be485bf7 [formerly 963ce8716e] [formerly e4633811fc] [formerly 02b47e4d5a [formerly e4633811fc [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: feed7806f268e67eb9fd6dedff48a2ee5e474222 [formerly 55638c0916]
Former-commit-id: c2a96ba985
2014-04-09 16:01:57 -05:00
Nate Jensen
d39ebe23fe Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
Former-commit-id: 3a88116cb1 [formerly ad961bb84d] [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 0dd55f63ba [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]
Former-commit-id: 88d0e400fb
Former-commit-id: 3475ac1a7fc2f3432054d40ed5ff81e416e0c344 [formerly a2c4c63852]
Former-commit-id: dfac2a42c2
2014-04-09 14:07:09 -05:00
Everett Kladstrup
dfbf285867 Issue #2725 Remove datacube plugin from viz.core feature
Former-commit-id: ffdcf503ca [formerly b670fa67f6] [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 50346d5aec [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: 2969dd971742c263227ae7f907962d513b487eaf [formerly 9faba2afbf]
Former-commit-id: fd9bd8282a
2014-04-09 13:59:11 -05:00
Everett Kladstrup
9248f426c8 Issue #2725 Add new plugin to uf.viz.base feature
Former-commit-id: 11e432a9a5 [formerly 91673b18b0] [formerly 8d918404d5] [formerly 28364c8618 [formerly 8d918404d5 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]
Former-commit-id: 28364c8618
Former-commit-id: b46b79c0e0435ebeaaed5f2f37fbfa85e03a4d6f [formerly 378193b61f]
Former-commit-id: d968a60023
2014-04-09 13:43:09 -05:00
Ben Steffensmeier
73083d370e Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
Former-commit-id: e74539a3e3 [formerly 9c5eb936d3] [formerly 5328415054] [formerly daff2b9d9d [formerly 5328415054 [formerly 67302674101992ae5416f342f92acab9233a113d]]]
Former-commit-id: daff2b9d9d
Former-commit-id: f590a0574524916e7a70b9bcfcc701a011f106d2 [formerly f5271a94d6]
Former-commit-id: 88f5dbe81d
2014-04-09 13:19:21 -05:00
Nate Jensen
344f074849 Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
Former-commit-id: af412382b6 [formerly 187a895056] [formerly b58bb8500c] [formerly 2c2e324401 [formerly b58bb8500c [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]
Former-commit-id: 2c2e324401
Former-commit-id: 94cbd5ff0ac104e99e8caffdaf43085926994028 [formerly 8999051f04]
Former-commit-id: f574c535f5
2014-04-09 11:22:07 -05:00
Nate Jensen
4281ca0951 Merge "Issue #2950 Add option to interpolate image colors." into development
Former-commit-id: 5aa9e39af6 [formerly 0da28c9c7a] [formerly 1f2809ced0] [formerly d729cc70af [formerly 1f2809ced0 [formerly 1db00446a00b6cd268b169871eadd1bef407e268]]]
Former-commit-id: d729cc70af
Former-commit-id: 4e3e0a1ac7417f8887477ecc5573ff6370319711 [formerly c460736793]
Former-commit-id: 6f36916c31
2014-04-09 11:20:59 -05:00
Nate Jensen
7c7b5851a7 Merge "Issue #2950 Support dynamic color counts for color map editing." into development
Former-commit-id: 992a00b18c [formerly 6989999e95] [formerly 5129002e91] [formerly 5bad21f3e6 [formerly 5129002e91 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 80e6eaeae66bf6576685319ea3e0cf04186e38c2 [formerly 92f0182d3f]
Former-commit-id: 58516f3a9f
2014-04-09 11:20:04 -05:00
Mike Duff
612ee41f8d Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: 981306d474 [formerly 5e39f5a61c] [formerly 23474c5ead] [formerly eafa177f4b [formerly 23474c5ead [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]
Former-commit-id: eafa177f4b
Former-commit-id: 6b9f38ad83f0cd349b068977532f23df7c700056 [formerly ee80debc36]
Former-commit-id: 1363155c34
2014-04-09 10:17:22 -05:00
Richard Peter
8ee15aba37 Merge "Issue #2725 Move derived parameters logic to common" into development
Former-commit-id: b86321616b [formerly 16e1018dd9] [formerly 9f0be4335806f82323adcb70ad62f21922700611 [formerly ea4d09c674]] [formerly ed25b71ff1 [formerly ea4d09c674 [formerly d97da3eb67c00a8d5bf1af0fae453fa9c96aacc4]]]
Former-commit-id: ed25b71ff1
Former-commit-id: 4968784e25043d1fa4fe8bf73e2308272466e2d1 [formerly ce7e0f9a31]
Former-commit-id: a32e066d95
2014-04-09 09:33:56 -05:00
Nate Jensen
165ad12513 Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
Former-commit-id: c8ed059461 [formerly 6aa42816ec] [formerly abee6815ad] [formerly 143c3e1801 [formerly abee6815ad [formerly 663db14c5fa57c1d9ccd9c3d6ef82862d330a4b4]]]
Former-commit-id: 143c3e1801
Former-commit-id: ad20b8d2488e9d35df5bb49d9b58237c03c3af22 [formerly 0ea487feec]
Former-commit-id: 9899b9ecab
2014-04-09 09:32:39 -05:00
Everett Kladstrup
29ce7781c9 Issue #2725 Move derived parameters logic to common
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]
Former-commit-id: 0699041518
Former-commit-id: eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc]
Former-commit-id: 86bf2b5ea0
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
02596282ca Issue #2920 Fix serialization of DrawStringEvent.
Former-commit-id: b921f6bb4e [formerly d09b87736a] [formerly 0abf71f719] [formerly d43e5abf29 [formerly 0abf71f719 [formerly d88bdcccb805896e32766373bc07185364741d4e]]]
Former-commit-id: d43e5abf29
Former-commit-id: 1eb3a1fd0725f2b68c866f6793a038c710d184f7 [formerly 6327c3a673]
Former-commit-id: 41e508b0da
2014-04-09 09:21:45 -05:00
Nate Jensen
d252a00965 Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
Former-commit-id: 323e6beb3e [formerly 44f93acd4d] [formerly 847481950c] [formerly ea3a8e29c3 [formerly 847481950c [formerly 2f4d6ca7b78e40d11a3dbfd66969681ddd2135fd]]]
Former-commit-id: ea3a8e29c3
Former-commit-id: 2d66ea60e65694f8edb4f2b29eaafcecb6c33f34 [formerly e99ad67ada]
Former-commit-id: 7a9f211997
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
4c72a79253 Issue #2950 Support dynamic color counts for color map editing.
Former-commit-id: c23ef56706 [formerly 9d7504e2c3] [formerly c5a48642eb] [formerly c805a5fed7 [formerly c5a48642eb [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]
Former-commit-id: c805a5fed7
Former-commit-id: be88286e2cfc17a580f9a83f0f911cee38d4ed27 [formerly 16446101a4]
Former-commit-id: cf3456c6cd
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
c8fa54c867 Issue #2950 Add option to interpolate image colors.
Former-commit-id: 5dee593089 [formerly c2e028f178] [formerly bd3ad2a477] [formerly 525cf4053f [formerly bd3ad2a477 [formerly 5bb0c1e3cc65fc86b48565603f2f78a4ad1e1be7]]]
Former-commit-id: 525cf4053f
Former-commit-id: 417e51c1aea500c36281264f72ebb85553d4da5d [formerly 9481062a43]
Former-commit-id: de4386e102
2014-04-08 15:19:00 -05:00
Nate Jensen
df17c66980 Merge "Issue #2920 Allow strings to use mulitple styles." into development
Former-commit-id: f0ef64f03c [formerly b793ce20bc] [formerly 811364eb73] [formerly 3fff4e77d4 [formerly 811364eb73 [formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]]
Former-commit-id: 3fff4e77d4
Former-commit-id: db49414e20c75fd602d8f320d136a06df8df5843 [formerly 2fdac5fec2]
Former-commit-id: 41a7098166
2014-04-08 14:28:44 -05:00
Mike Duff
6fd58b3778 Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: 7c9a7d609e [formerly bdde561f8a] [formerly efefe62e0f] [formerly 7da1547c22 [formerly efefe62e0f [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]
Former-commit-id: 7da1547c22
Former-commit-id: 130275c111513af444bdaa0efc7abcffce08c460 [formerly 7145820d62]
Former-commit-id: 2b67272b60
2014-04-08 14:14:20 -05:00
Nate Jensen
c557c6570a Issue #2968 improve efficiency by only compressing/serializing persisted
objects once

Change-Id: Iba90717d049571b801254852a7fd5a73202701f2

Former-commit-id: 0949264e48 [formerly 579584c346] [formerly e3df98635a] [formerly aaf2d3c8a4 [formerly e3df98635a [formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: a6b37f03d074f8bb7e3b6be39e76118f7884e57e [formerly 8cb284d2c2]
Former-commit-id: 45ccb7d7fe
2014-04-08 12:59:16 -05:00
Brian.Dyke
824e1f6d14 Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 518167e0bb [formerly 529059851a] [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 20fef0f15b [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 05c5a8903cdbc8d381e7bf1456acac3943c3855e [formerly 538b02e42b]
Former-commit-id: 20c27a479d
2014-04-08 13:05:12 -04:00
Nate Jensen
c38fd5990f Merge "Issue #2968 fix buffer thread safety issues" into development
Former-commit-id: cb858dc39e [formerly ccb6c8fc2c] [formerly e3e5a25484] [formerly a03ca229e7 [formerly e3e5a25484 [formerly 30eee9a48d797c2e6cd509fd878b1b2ee759c105]]]
Former-commit-id: a03ca229e7
Former-commit-id: 0870db93156ebb3d82d832d6ebde4a0411034deb [formerly ac7f0b69a4]
Former-commit-id: f16f51aa12
2014-04-08 09:46:11 -05:00
Nate Jensen
3649961255 Issue #2968 fix buffer thread safety issues
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2

Former-commit-id: 917e1ed8fd [formerly 5c775618e3] [formerly e11a5c4559] [formerly f2b18b76f2 [formerly e11a5c4559 [formerly edc629d4b63f2a873752a232ee8f6530ec314595]]]
Former-commit-id: f2b18b76f2
Former-commit-id: 27cad95bf8fbd0f9b7e8f6e916202f0a2685b801 [formerly ae9c53fd05]
Former-commit-id: f5d594bddc
2014-04-07 17:30:27 -05:00
Mike Duff
49d3dd00ba Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM
Change-Id: If01865b85f7ed18edea63757426cb76e44587b0e

Former-commit-id: 97fb67b7b2 [formerly 09802cfde2] [formerly 692d8841d1] [formerly 418c80640e [formerly 692d8841d1 [formerly 4ae763f1f1865d7c16eefb8d3647e3f94c5c1c22]]]
Former-commit-id: 418c80640e
Former-commit-id: 9721d262ea6ec4e5bc559f295bf2f4efcca6c33a [formerly 80bb9e41f5]
Former-commit-id: 7bb7f3c4eb
2014-04-07 16:17:28 -05:00
Nate Jensen
43b52d6340 Issue #2959 fix watches/warnings handling of color change
Change-Id: Ic8d510e6cce1949d784cd480e58cf4347527b79e

Former-commit-id: 4aea30fbea [formerly 300c26820f] [formerly 5a1877d8a3] [formerly e4c52e83e2 [formerly 5a1877d8a3 [formerly fd9234aa70a7712101de73c892fd92f329e533e7]]]
Former-commit-id: e4c52e83e2
Former-commit-id: 22e497f441e2210c18b0f84b208424ea7065f6e4 [formerly 5cb4f195f9]
Former-commit-id: 3167c3bd96
2014-04-07 13:31:58 -05:00
Ben Steffensmeier
045013ad87 Issue #2920 Allow strings to use mulitple styles.
Former-commit-id: 72f68e9e2b [formerly ddc97933b8] [formerly 32016d5401] [formerly bb205cdef9 [formerly 32016d5401 [formerly ba3638effd48445bd00b8ef5e3771f05910c2af1]]]
Former-commit-id: bb205cdef9
Former-commit-id: 1b839595fb2bd5d3a3b79985f5a8779a7a6342be [formerly 5b55eb6e39]
Former-commit-id: 963901f6b1
2014-04-04 16:16:06 -05:00
Ron Anderson
bb12a4b904 Merge "Issue #2737 Make iscMosaic remove data from ISC when grids are deleted." into development
Former-commit-id: d4d7e81799 [formerly 83d660cf2e] [formerly 9aca9a23b621306e017fb3123a6902ff25149da6 [formerly 2042d975c2]] [formerly debde74356 [formerly 2042d975c2 [formerly 93c224f21b0aec4eef0eaf0f57c5f48237c68265]]]
Former-commit-id: debde74356
Former-commit-id: 108d722236ee29849900176e85dc9365b6df27dd [formerly d4fabcc4b1]
Former-commit-id: c3a4664534
2014-04-04 08:35:12 -05:00
Ron Anderson
1c032ab6f0 Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe

Former-commit-id: 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly ea250a253f [formerly 01ab6ce52d [formerly 5db8738783d79e8a48bfffac49910cc46df61ad2]]]
Former-commit-id: ea250a253f
Former-commit-id: 11feb3f28beaaea54d7cf1c0af9fce201f9ec319 [formerly de50c5e47d]
Former-commit-id: 4d9d2f59aa
2014-04-03 16:56:36 -05:00
Richard Peter
e20c238886 Merge "Issue #2874 RTOFS temperature unit correction and style enhancements" into development
Former-commit-id: 024ba3b887 [formerly 68559ad7ef] [formerly f4a5c3ac93] [formerly 05756d272c [formerly f4a5c3ac93 [formerly de9e3602df90b1a90c352b356a8880103e61acaf]]]
Former-commit-id: 05756d272c
Former-commit-id: 89fa60f9b60f7238a49d76af4b9f07d1146823c7 [formerly 3c5d3fe932]
Former-commit-id: 878cc797db
2014-04-03 16:52:46 -05:00
Ben Steffensmeier
12d697fc1c Issue #2874 RTOFS temperature unit correction and style enhancements
Former-commit-id: dae20b905a [formerly f2c605f6d3] [formerly a846430a84] [formerly 3baaf6543d [formerly a846430a84 [formerly 129dff2511c50abe9367e233fb64b5ca923db258]]]
Former-commit-id: 3baaf6543d
Former-commit-id: 34465f247844dc3904337e65921ee04c89a51fef [formerly 6125fee4e8]
Former-commit-id: 92beb626b4
2014-04-03 16:42:45 -05:00
Nate Jensen
5059473b5e Issue #2967 fix error when erasing the last piece of a telestrator line
Change-Id: I51a3a07848dfa8639f553f86a831f15e9965bf84

Former-commit-id: 0498ff757b [formerly 4d0b0495fe] [formerly 3e6de492ec] [formerly 6b3504a39c [formerly 3e6de492ec [formerly d152fa62494ae9b2880a94de92587df0db1bad6c]]]
Former-commit-id: 6b3504a39c
Former-commit-id: 3de3bf102a92af52452844e38c9dbcaa83cb90c3 [formerly 64dde02001]
Former-commit-id: 64731a98cb
2014-04-03 15:08:40 -05:00
Dave Hladky
7138f246cc Issue #2974 added DD id to sub dialogs
Change-Id: I2392f4ef1736edd940998a83b4ecba43829f92e7

Former-commit-id: 246dfa699f [formerly 030541d701] [formerly 5b6c972210] [formerly ef337f77d2 [formerly 5b6c972210 [formerly d86b847689c3843a8b49f30a2f0613a34e70167a]]]
Former-commit-id: ef337f77d2
Former-commit-id: 185884f62e58f4ad15cd3dbaacca1889be318a36 [formerly 729cc25047]
Former-commit-id: 48d96c7a19
2014-04-03 14:48:42 -05:00
Ron Anderson
11df67c9f4 Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development
Former-commit-id: 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 52c2092e1c [formerly 90429229f7 [formerly 4e57b93f72b9e73a4ac2e1205393b3cae8e21958]]]
Former-commit-id: 52c2092e1c
Former-commit-id: 6fa5ea130dedea2082686ac70b1f9913fc8f6110 [formerly 2bee12cb02]
Former-commit-id: 3e144c80a6
2014-04-03 14:27:41 -05:00
Richard Peter
ca4bf07f79 Merge "Issue #2889 user who issued change now shows in notification center Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc" into development
Former-commit-id: bef54117fd [formerly ba37332585] [formerly ae13682598a53998b23637ec80a5c8ade97d6551 [formerly f0330daea2]] [formerly b7bd68b3e7 [formerly f0330daea2 [formerly 06e08d77b5c2f57d30d0e12e2e9f2800020447d3]]]
Former-commit-id: b7bd68b3e7
Former-commit-id: dce34ccb75a84f0d0fb52584e274ca8a6b93b7c9 [formerly 1dc927034c]
Former-commit-id: 695bb0c91e
2014-04-03 13:07:36 -05:00
Ron Anderson
5d84747472 Issue #2961 Fixed issue where ISC grids are selected based on the start time of the
Fcst and not the grid that overlaps the spatial editor time.

Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2

Former-commit-id: 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly db080f3eba [formerly eb90c1f216 [formerly 131f9c0933280d25f61458e270b5bb9715c2d67b]]]
Former-commit-id: db080f3eba
Former-commit-id: f40c2938a553a6bd3809588d95bac2b3641d2765 [formerly c7b392e36b]
Former-commit-id: c880002b1e
2014-04-03 13:04:55 -05:00
Ron Anderson
2a0c06c814 Merge "Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py" into development
Former-commit-id: dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly 822acbb32b [formerly b67c36c08b [formerly dc953f5285a2fb5c56148b78c5db31c4ccdda3a7]]]
Former-commit-id: 822acbb32b
Former-commit-id: 2376fd5832ad8d1cfd61ec7ab3b9ba1df3cefd08 [formerly f7910616ca]
Former-commit-id: b5680ce7f3
2014-04-03 12:57:16 -05:00
Ron Anderson
f35fcf7c6f Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: I75d37583d15decaeb50db0d70fc0ba1f3a8a7b7c

Former-commit-id: 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]]
Former-commit-id: 2abfe6de77
Former-commit-id: 2d2d6d92129690dc9335d9253ddd5235606cc9bd [formerly bd502fbe07]
Former-commit-id: 8dcbe3a815
2014-04-03 12:42:42 -05:00
Ron Anderson
048d7d363b Merge "Issue #2847: Add option to export only selected parms to GFE KML export dialog." into development
Former-commit-id: 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 60f3ad27e2 [formerly b61a1b346d [formerly 17ab17280bc6e4c990edec44a40f78f1f36f5ced]]]
Former-commit-id: 60f3ad27e2
Former-commit-id: 62d6e4880917155c00a538024e1217517051a84e [formerly d1e5fdd365]
Former-commit-id: 6f9cadafa7
2014-04-03 11:47:15 -05:00
David Gillingham
87ce104d67 Issue #2847: Add option to export only selected parms to GFE KML export dialog.
Change-Id: I6f0111d0f8eaed302c18dcd08e4433a7e544e669

Former-commit-id: f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly 7f36b8ba9c [formerly 965d76c139 [formerly cdb6f07f0a514c159e792e3bb911ef93a8354b2d]]]
Former-commit-id: 7f36b8ba9c
Former-commit-id: aa5f9f82bfce0e52bd621bb6427bfb10d3b1447a [formerly 017ea69812]
Former-commit-id: 9fcb3f6920
2014-04-03 11:30:59 -05:00
Ron Anderson
ec74556c48 Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c

Former-commit-id: ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly 69cd6a1598 [formerly 8da64048e7 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]
Former-commit-id: 69cd6a1598
Former-commit-id: ef0141d58da5e73da45520afce6c1175f7c71496 [formerly dde9253f15]
Former-commit-id: b16405ecb3
2014-04-02 18:22:51 -05:00
Ron Anderson
8463514df0 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 efb27793f4 [formerly f4b31b336a [formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]
Former-commit-id: efb27793f4
Former-commit-id: 3dc1bbaea04ff0ad7927eabe00966a8cca040dc6 [formerly bfed3dc521]
Former-commit-id: c1e5e2fd18
2014-04-02 16:55:02 -05:00
Dave Hladky
b908654a83 Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc

Former-commit-id: ec2c3b4af2 [formerly 2d18b657a8] [formerly 1671baaf10] [formerly 9479219b73 [formerly 1671baaf10 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]
Former-commit-id: 9479219b73
Former-commit-id: 6f17881da511134df9f83e5fdfe37fa16d15481a [formerly f26450c40d]
Former-commit-id: 86287bb5df
2014-04-02 14:06:25 -05:00
Nate Jensen
5821a0e0e0 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 579d2416cb [formerly 6b20d38b1a [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]
Former-commit-id: 579d2416cb
Former-commit-id: b937a5eaf68a15c6804ca9d1bfabddacdd99ff79 [formerly 19560ebc7c]
Former-commit-id: d5d42f2f6b
2014-04-02 11:23:02 -05:00
Mike Duff
378909ad2c 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 d5df936431 [formerly 538261f6d5 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]
Former-commit-id: d5df936431
Former-commit-id: 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aa]
Former-commit-id: 7aa5cebfb0
2014-04-02 10:08:45 -05:00
Nate Jensen
2b7a95598e Merge "Issue #2938 - Fix site/role change logic for messages" into development
Former-commit-id: 4ec98ab846 [formerly 654d5abb57] [formerly 6637623c4f] [formerly eab75cab11 [formerly 6637623c4f [formerly 8fe6aa419874d54755836fa44e252d53b32b7f8c]]]
Former-commit-id: eab75cab11
Former-commit-id: 2db9cd45dbb0b28cc1547e80c8c6e446eb551909 [formerly a9e2e856d6]
Former-commit-id: 4494674310
2014-04-02 09:55:19 -05:00
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
Mike Duff
fe8961bb24 Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 656966669d [formerly 66181ca3a5] [formerly 8967ddd94a] [formerly 169ad502de [formerly 8967ddd94a [formerly 9ffc540c21245b308334040234be03d78a501656]]]
Former-commit-id: 169ad502de
Former-commit-id: f6d2ebf70d78eeca18274f66c05c2ad2791f600b [formerly f117f575eb]
Former-commit-id: 3686e50328
2014-04-02 08:12:53 -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
Brian.Dyke
f5ed39a8d9 Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: d9da3cc373b8f207d487dbe28227905b8a81846e [formerly c013460db1]
Former-commit-id: d163d9d190
2014-04-01 14:29:33 -04:00