Commit graph

190 commits

Author SHA1 Message Date
Mike Duff
0f848918e8 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 47a0477587 [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02]
Former-commit-id: 44cc3d8776
2013-11-14 17:07:54 -06:00
Mike Duff
b27ee6803f Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: c3aee76403 [formerly f6c4ca2bc0] [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42]
Former-commit-id: 48093514a6
2013-11-14 14:40:33 -06:00
Brad Gonzales
725742f4ec Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]
Former-commit-id: aea0e847aa
Former-commit-id: 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0]
Former-commit-id: 7747d901f7
2013-11-12 12:42:16 -06:00
Slav Korolev
703c97394f Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: 4b539632b4 [formerly 2d002ccde3] [formerly 59d1de165d] [formerly 7b7754982c [formerly 59d1de165d [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]]
Former-commit-id: 7b7754982c
Former-commit-id: c443ab7eec2c21f49cfe030af7a19a96edf9fde4 [formerly c4a633acde]
Former-commit-id: 53b6d4aa69
2013-11-08 11:09:21 -05:00
Lee Venable
a6557a089e Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]
Former-commit-id: 20726d4e7c
Former-commit-id: 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]
Former-commit-id: 9a8a813cf8
2013-11-06 15:42:40 -06:00
Slav Korolev
5cd1d585b1 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly c25204d75b [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]
Former-commit-id: c25204d75b
Former-commit-id: 2d965e7d5b9ce80b4a1638b7546c6d8d63a4d209 [formerly 3223cd19cd]
Former-commit-id: 8fbf625667
2013-11-06 14:38:55 -05:00
Mike Duff
89c7970f8b Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly 35c4911e7e [formerly e1180868e7 [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]
Former-commit-id: 35c4911e7e
Former-commit-id: 046ac466943d54b80185d43c7b3cbf79bd485473 [formerly 7e28ffcaad]
Former-commit-id: e1b9c9daa8
2013-11-06 12:00:04 -06:00
Lee Venable
07e89ee05d Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: 608f6b9d8262abfc44e2d399f8c52580ba4437af [formerly f6f1b16c0c]
Former-commit-id: c7d03bf267
2013-11-02 10:43:48 -05:00
Slav Korolev
4b225552e2 Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]
Former-commit-id: 6b3481ca26
2013-11-01 15:06:19 -04:00
Slav Korolev
9c8b7d1e96 Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]
Former-commit-id: f7d1939b36
Former-commit-id: 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]
Former-commit-id: fcbe5d09da
2013-11-01 11:03:06 -04:00
Nate Jensen
2aa3471a8a Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]
Former-commit-id: de50a9214b
Former-commit-id: c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]
Former-commit-id: c9d9070600
2013-10-31 12:24:23 -05:00
Richard Peter
7b0ad6bacc Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]
Former-commit-id: fca3d73aa7
2013-10-31 11:46:25 -05:00
Mike Duff
ce2afdf1b3 Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]
Former-commit-id: b0c54d7c17
2013-10-31 09:22:50 -05:00
Ben Steffensmeier
8ec09e8f61 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]
Former-commit-id: 78efdb7572
2013-10-29 17:35:55 -05:00
Mike Duff
3f502364c9 Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]
Former-commit-id: 4beb79d5a7
2013-10-29 13:49:47 -05:00
Dave Hladky
e44f20606e Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]
Former-commit-id: db33e9cafa
2013-10-24 13:52:45 -05:00
Slav Korolev
d56f7ca3a9 Issue #2455. Fixed error from test.
Former-commit-id: 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]
Former-commit-id: 981544290e
Former-commit-id: 90582b33ceb3e84ea08f1c20ad1a3bd68ef28ea6 [formerly 263244b606]
Former-commit-id: d0aa6f6f26
2013-10-22 12:34:34 -04:00
Slav Korolev
da1acc7fff Issue #2451. Get highlighted rows on the table page after message update. Corrected.
Former-commit-id: 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly a7883aabd3 [formerly d0d4f12057 [formerly 652094eb318459b1b73924ebba2b542b5f97eaff]]]
Former-commit-id: a7883aabd3
Former-commit-id: 08093b85ce58869330a7d6751c6f0a99e4322a03 [formerly 1d5a028ee1]
Former-commit-id: d5315c8f57
2013-10-17 16:39:26 -04:00
Slav Korolev
80b0798d4f Issue #2455. Fixed a problem with Changes Applied window. Corrected.
Former-commit-id: ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly 4100629b39 [formerly 93b69bd6a7 [formerly c07a918474361d83907fb8de03538ec88486016d]]]
Former-commit-id: 4100629b39
Former-commit-id: 9cc2d94fd6c5402787966d92170a9231e42ba36d [formerly 552789c978]
Former-commit-id: b3ec990f41
2013-10-17 14:17:11 -04:00
Dave Hladky
aa5fd1ba3f Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]
Former-commit-id: 477fbd3d59
Former-commit-id: a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]
Former-commit-id: 9880c82a36
2013-10-16 09:06:00 -05:00
Mike Duff
5933d330b9 Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

Former-commit-id: 78e2aab777 [formerly 9e2a8a0e04] [formerly 1485ddd779] [formerly a9c8797e9e [formerly 1485ddd779 [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]]]
Former-commit-id: a9c8797e9e
Former-commit-id: 50ee7818c09a698535754beff5d683b662eb6675 [formerly 7dd6e09fe1]
Former-commit-id: 367b98e07f
2013-10-15 11:18:52 -05:00
Mike Duff
4b3f55662c Issue #2386 - Fix for editing subscriptions from subscription manager dlg.
Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682

Former-commit-id: e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly 65c693d5c4 [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]]
Former-commit-id: 65c693d5c4
Former-commit-id: b2ab42e078ad49f585ba986c8d78ecffb7953af6 [formerly a49af4489e]
Former-commit-id: 7bcffa5275
2013-10-15 09:52:08 -05:00
Nate Jensen
95f1de78e5 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]]
Former-commit-id: 23e1817385
Former-commit-id: f7e467ca19c87bc093a0933e116c7732cad75cd7 [formerly 7cdd1071cf]
Former-commit-id: eabc32a720
2013-10-14 16:26:47 -05:00
Mike Duff
5913f21dd6 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67]
Former-commit-id: c4e3b900c9
2013-10-14 15:42:28 -05:00
Richard Peter
6a0020cf1c Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]
Former-commit-id: c056c93104
Former-commit-id: 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]
Former-commit-id: b6d6458ab2
2013-10-14 11:15:40 -05:00
Mike Duff
27fd5ba0fa Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]
Former-commit-id: a69120c623
Former-commit-id: 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]
Former-commit-id: 610c937a00
2013-10-11 18:18:18 -05:00
Nate Jensen
d3e361eaa4 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]
Former-commit-id: fd3a19a73c
2013-10-11 11:21:18 -05:00
Brad Gonzales
ff0ec3ddc6 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]
Former-commit-id: bc87f2a168
Former-commit-id: 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]
Former-commit-id: 5825fa41d6
2013-10-11 10:36:53 -05:00
Max Schenkelberg
98b60f0050 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]
Former-commit-id: 01c0e022d5
Former-commit-id: d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]
Former-commit-id: dfd6ffabd8
2013-10-11 10:21:37 -05:00
Slav Korolev
74fb9bb36c Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]
Former-commit-id: 0021d53557
Former-commit-id: 14b3866029e9725abb0c7991b69a2bf28a11dd22 [formerly 3631bfbeba]
Former-commit-id: bd225735ff
2013-10-10 14:09:37 -04:00
Richard Peter
7dc72f9bba Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]
Former-commit-id: d7db5d0219
Former-commit-id: 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]
Former-commit-id: 3fec426da2
2013-10-10 11:34:11 -05:00
Slav Korolev
a1e3716076 Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc] [formerly c91df51c728a2df7e57ff49ccc29634b41c359b5 [formerly 012497bfef]] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]
Former-commit-id: f0aba7be10
Former-commit-id: 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e]
Former-commit-id: 09f00e1d81
2013-10-10 09:34:24 -04:00
Brad Gonzales
74df786a0b Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]
Former-commit-id: 61448cc04a
Former-commit-id: 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d]
Former-commit-id: aff77aa148
2013-10-09 17:58:12 -05:00
Richard Peter
55c9d3f470 Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 3a79334f10bfa880b8282cf69118ab055077d496 [formerly e43cd4b397]
Former-commit-id: 80dd506d10
2013-10-07 16:19:11 -05:00
Dave Hladky
87574fd68a Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]
Former-commit-id: 1733834e74
Former-commit-id: 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c]
Former-commit-id: 21239525ea
2013-10-04 10:36:27 -05:00
Mike Duff
e1017e7ce8 Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: 354af07416 [formerly 80081ff25b] [formerly 865b5f6878] [formerly d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 1ac7599652efeecae27c7dd2a2b8782fc610c0bc [formerly 81bd77e56d]
Former-commit-id: 2261f9ff61
2013-10-04 09:27:30 -05:00
Mike Duff
fe2772a402 Issue #2417 - Fix the highlight all button in the notification center's find dialog
Change-Id: Ia39e049045116a4766ed989612f6ab9a3d994efd

Former-commit-id: b6cdbfa984 [formerly a966d4ce97] [formerly b5f0a52171435d1ac459213692c622604296485c [formerly 43e2b5c156]] [formerly b0fac5792b [formerly 43e2b5c156 [formerly 01d92017a3db5aafc4b6d6a9f00abbf64481cfe7]]]
Former-commit-id: b0fac5792b
Former-commit-id: 3c1e5b6577a1d21f08888d233d952d001cab7fd5 [formerly 708f60d5c0]
Former-commit-id: 095a9161f4
2013-09-30 09:40:08 -05:00
Lee Venable
02d2efbab4 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: 03eded9a02 [formerly ae23948831] [formerly 0758d67964] [formerly 9c02d45802 [formerly 0758d67964 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]]]
Former-commit-id: 9c02d45802
Former-commit-id: 10aea7943c14acb6d64234fe754bf95304637693 [formerly b9fd15122e]
Former-commit-id: abb0b0a7f1
2013-09-27 15:07:02 -05:00
Nate Jensen
429c48e4b0 Merge "Issue #2386 Backend work for adding multiple types to Subscription overlap rules Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17" into development
Former-commit-id: d229a9e02f [formerly 51bf49f6b5] [formerly 291cd53426] [formerly c40bedaaf9 [formerly 291cd53426 [formerly 9f24ff56dd91286c02ef168be4d4b36efe67f497]]]
Former-commit-id: c40bedaaf9
Former-commit-id: c4f4fd5103ce13cdb252034475a043e5da28d555 [formerly a865c6b706]
Former-commit-id: daff685991
2013-09-27 09:39:54 -05:00
Richard Peter
f1a02dd4de Merge "Issue #2413 - Added isDirty check to new config for Data Browser Peer review comments" into development
Former-commit-id: d4a9919307 [formerly a7f13c41ae] [formerly 2257278313] [formerly 1f40a40449 [formerly 2257278313 [formerly bedacaf43bb65ed3cfbf2aff57cd8839f8df4815]]]
Former-commit-id: 1f40a40449
Former-commit-id: 3fc499910ccf3ce4979b9fd849045398d61f9ca7 [formerly a87a85f3af]
Former-commit-id: 84c5ae8313
2013-09-26 15:23:54 -05:00
Mike Duff
5717096f2e Issue #2413 - Added isDirty check to new config for Data Browser
Peer review comments

Change-Id: I920fb093aea05ca985e1429671b94e34279a1af2

Former-commit-id: 4a008acf29 [formerly ab857adda8] [formerly 9d95942ad1] [formerly 8a325f1af7 [formerly 9d95942ad1 [formerly 56d7387b481a2ed6c6647130ad75eae22e319928]]]
Former-commit-id: 8a325f1af7
Former-commit-id: 7ae2d0e707c77ed36da8f67bc4002f3195cbc23c [formerly 5a62dad000]
Former-commit-id: 65fc907fa9
2013-09-26 15:18:42 -05:00
Mike Duff
059618692b Issue #2410 - Fix loading of notification center's filter config file
Change-Id: I0bc9557d0eb0a8f5de40a45064cba031f7839fbd

Former-commit-id: 12575e501a [formerly a9ec223319] [formerly 83064b2bd7] [formerly d29beb9d8d [formerly 83064b2bd7 [formerly 96b4c904497ffc99d57949455b96025c658ae9c7]]]
Former-commit-id: d29beb9d8d
Former-commit-id: 21fe3045321c5e2ed56fa3c17953fed91c53998c [formerly c2f6f46ece]
Former-commit-id: 8f89d25fc2
2013-09-26 15:08:30 -05:00
Richard Peter
fc2a63ae15 Merge "Issue #2412 - Fix problem loading config in dataset discovery browser" into development
Former-commit-id: 9a4ac3be05 [formerly 7bcf34a67f] [formerly 077703ddd8] [formerly 15866b434c [formerly 077703ddd8 [formerly 97e67fe192e23cc11a05f9db69455b88c7a6fa5d]]]
Former-commit-id: 15866b434c
Former-commit-id: 4f737c335107fe37379a8e21d576bf4d75918c92 [formerly 3ba5596d9f]
Former-commit-id: 64f7bceaf6
2013-09-26 14:56:11 -05:00
Richard Peter
7aef50cd70 Merge "Issue #2409 - Add widget disposed check" into development
Former-commit-id: 4b5d2ebe33 [formerly 5dd79b7d5e] [formerly 4a4f47e8d1] [formerly 00e7a6fb16 [formerly 4a4f47e8d1 [formerly 3c3fa316eb073d685f471ebcc48d599b4013c2c4]]]
Former-commit-id: 00e7a6fb16
Former-commit-id: aef2cc3aacb239e6df24efd698892f6fc1909fef [formerly 0f6fc99952]
Former-commit-id: 2e72cda86c
2013-09-26 14:55:17 -05:00
Richard Peter
94a172b2f9 Merge "Issue #2408 - Add a restore hidden notification menu item to Notification center" into development
Former-commit-id: 722d1c48e9 [formerly 24da2b9721] [formerly f066cee72b] [formerly 614cde9ec7 [formerly f066cee72b [formerly fac0408066832cb82e8193e1151eb8c63f9131f8]]]
Former-commit-id: 614cde9ec7
Former-commit-id: a9f5068270194d6028c8d361a2849fc5b4bd463b [formerly 4c5a733870]
Former-commit-id: e75f71c079
2013-09-26 14:55:01 -05:00
Richard Peter
24910e6531 Merge "Issue #2375 - Only display the configured number of messages in the notification center. Peer review comments" into development
Former-commit-id: b296af36fa [formerly fd6b01b653] [formerly 416f4b138c8e1f0abb32b153cec75e6b449838bc [formerly f1b5b78165]] [formerly a1a5ad148c [formerly f1b5b78165 [formerly c43fa953929a1da0eb0ed8523f5a9b85b4e4b981]]]
Former-commit-id: a1a5ad148c
Former-commit-id: e43702f2b9d4c946e9047af629ed7de7dd6c5d92 [formerly a284046404]
Former-commit-id: a0aa2311e0
2013-09-26 14:54:48 -05:00
Mike Duff
152a54de8f Issue #2375 - Only display the configured number
of messages in the notification center.
Peer review comments

Change-Id: I17c1f0a2d2cf910a52a0bdb655d39a08e47494ea

Former-commit-id: 179d7c38ca [formerly dfd23d61fb] [formerly 08078bbd54] [formerly 4ee719b32c [formerly 08078bbd54 [formerly f4ac1c5a665346641cc9fcffa67aed522b1967e3]]]
Former-commit-id: 4ee719b32c
Former-commit-id: d0a801651f9c8ca642d546aa95b54479f0cfe2d5 [formerly 7b1ff055d0]
Former-commit-id: 848530acad
2013-09-26 11:23:12 -05:00
Dave Hladky
0565c63bf6 Issue #2386 Backend work for adding multiple types to Subscription overlap rules
Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17

Former-commit-id: dd6074c6dc [formerly b9f8daf751] [formerly d34882eb49] [formerly e29d10ba4f [formerly d34882eb49 [formerly 449c584afc46257671808b921847a621e7020bcf]]]
Former-commit-id: e29d10ba4f
Former-commit-id: 1ecfea5f1843dfbb7d5f937257854d66e55d7645 [formerly d9f06e5bea]
Former-commit-id: 4d963954b1
2013-09-26 11:12:00 -05:00
Mike Duff
c80b965705 Issue #2412 - Fix problem loading config in dataset discovery browser
Change-Id: I765ec92e587aa4772af1ac170be32395e698beef

Former-commit-id: b3bdf87b90 [formerly 4745867a18] [formerly b20e7e3386] [formerly d66d30ba32 [formerly b20e7e3386 [formerly c478a13d2740e7ad97e02be81233bd8a2fd0dd3e]]]
Former-commit-id: d66d30ba32
Former-commit-id: 0de47fd52aa147ebecde98f2eb3801a47e59542b [formerly 7045c5f10c]
Former-commit-id: 275c48fa11
2013-09-26 09:02:41 -05:00
Mike Duff
7fc647de33 Issue #2409 - Add widget disposed check
Change-Id: Idd73e96d7704184392eb6297b87957126a286a72

Former-commit-id: 724e262578 [formerly c36d6b4670] [formerly 18791bc1e8] [formerly d3ade70500 [formerly 18791bc1e8 [formerly 6b3df536a3052028c72841e22b65c381fd070742]]]
Former-commit-id: d3ade70500
Former-commit-id: f2cf5e0d3044fb39b6faf7402d3db136afb74911 [formerly f9ec1168ac]
Former-commit-id: d04f33910a
2013-09-25 16:37:18 -05:00