Commit graph

3857 commits

Author SHA1 Message Date
Richard Peter
74b976232c Issue #2357: Remove edex jms resource reuse by other threads.
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823

Former-commit-id: c146f90a09 [formerly be99174b65] [formerly c146f90a09 [formerly be99174b65] [formerly 802ab87e57 [formerly a13a027b07a8d080c4506748afe5882575ae6532]]]
Former-commit-id: 802ab87e57
Former-commit-id: 7dc61aceee [formerly 5320536f54]
Former-commit-id: 91bf400b6a
2013-10-07 12:38:08 -05:00
Bryan Kowal
ed95cf88b9 Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: 6e05c00981 [formerly 0698d28222] [formerly 6e05c00981 [formerly 0698d28222] [formerly 82d61b53d4 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]
Former-commit-id: 82d61b53d4
Former-commit-id: 5cd20aed43 [formerly 551b501e2e]
Former-commit-id: d0c79c347c
2013-10-07 11:52:58 -05:00
Greg Armendariz
249ea872cc Merge "Revert "Issue #2033 - msi build updates"" into development
Former-commit-id: 9a75ba8d59 [formerly 2059cbc573] [formerly 9a75ba8d59 [formerly 2059cbc573] [formerly b09988c403 [formerly 7157d5791045a456ebe9eef1c8ce21e549bf0761]]]
Former-commit-id: b09988c403
Former-commit-id: f03c56aa9d [formerly 74b1f23db7]
Former-commit-id: 25e168e8a2
2013-10-07 10:01:14 -05:00
Lee Venable
7ac56a3b59 Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 0eff818ede [formerly c1991c5c66] [formerly 0eff818ede [formerly c1991c5c66] [formerly 7bd1fec82e [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: a55d310ebe [formerly bdd28e1e09]
Former-commit-id: 9d07c6428b
2013-10-07 09:30:45 -05:00
Nate Jensen
3d36bc8ee5 Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
Former-commit-id: be1385b705 [formerly adc774bee9] [formerly be1385b705 [formerly adc774bee9] [formerly c36c50d189 [formerly a686d702002a5e01389be1fd5e72558239687080]]]
Former-commit-id: c36c50d189
Former-commit-id: 01997dd1fb [formerly 10ba6f231a]
Former-commit-id: 315026f786
2013-10-07 09:30:31 -05:00
Lee Venable
b0af7745a6 Issue #2436 - disposed of the sort color
Former-commit-id: 8c8adf8be6 [formerly 9c97908f36] [formerly 8c8adf8be6 [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: 2ed106cac4 [formerly 46db8998a6]
Former-commit-id: 1000147d0c
2013-10-07 09:11:25 -05:00
Bryan Kowal
07a882ac48 Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly 33a9270304 [formerly 6023c61bca] [formerly 33a9270304 [formerly 6023c61bca] [formerly 9a77e3553a [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].


Former-commit-id: a75ed2b079 [formerly bb2e914c00] [formerly a75ed2b079 [formerly bb2e914c00] [formerly 9d47e7565d [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: d4eba48f94 [formerly 4d08d7a1c3]
Former-commit-id: 2f6791dc19
2013-10-04 09:47:59 -05:00
Bryan Kowal
0ad325f534 Revert "Issue #2033 - msi build updates"
Undo copying localization into etc at build time.

This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1] [formerly 3bf9b72f52 [formerly 7208eadbfb] [formerly 3bf9b72f52 [formerly 7208eadbfb] [formerly e46254cef1 [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]].


Former-commit-id: 1632c72103 [formerly 02e1055f19] [formerly 1632c72103 [formerly 02e1055f19] [formerly 3d6ff3f0fa [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: a29a8b8d0e [formerly ac0b2bd9eb]
Former-commit-id: b72e77fdc0
2013-10-04 09:47:59 -05:00
Mike Duff
6a1030a923 Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: 80081ff25b [formerly 865b5f6878] [formerly 80081ff25b [formerly 865b5f6878] [formerly d258009cc7 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 2261f9ff61 [formerly 81bd77e56d]
Former-commit-id: 96df3a4989
2013-10-04 09:27:30 -05:00
Richard Peter
19e860f9a8 Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
Former-commit-id: f52fdf1916 [formerly 5adf4298ef] [formerly f52fdf1916 [formerly 5adf4298ef] [formerly bc3843dc75 [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]
Former-commit-id: bc3843dc75
Former-commit-id: 8694f13766 [formerly f7a7228e09]
Former-commit-id: 2af4638a97
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
8187fb1fa8 Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

Former-commit-id: 7f7aa20d0a [formerly 236b3fe05f] [formerly 7f7aa20d0a [formerly 236b3fe05f] [formerly 8f94e1434c [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 69eec8d4c6 [formerly d4670d19b1]
Former-commit-id: 9a0a15ffd8
2013-10-03 16:30:13 -05:00
Nate Jensen
3a28687ca2 Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650

Former-commit-id: ee134db130 [formerly 3f24b9e424] [formerly ee134db130 [formerly 3f24b9e424] [formerly 42fee320ab [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]
Former-commit-id: 42fee320ab
Former-commit-id: 82e0af6a9c [formerly 160d1fbb01]
Former-commit-id: 25bdea7759
2013-10-03 15:18:55 -05:00
Nate Jensen
96672be561 Merge "Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness" into development
Former-commit-id: 4fa6911aa0 [formerly 23c742c202] [formerly 4fa6911aa0 [formerly 23c742c202] [formerly 36f5c2c44b [formerly fdf53f7eb888c38849821457fe248ba1f399b6e5]]]
Former-commit-id: 36f5c2c44b
Former-commit-id: 649c3b0e7d [formerly 485a36fbb4]
Former-commit-id: 084a495032
2013-10-03 12:56:47 -05:00
Bryan Kowal
16efd625bb Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: ef93741056 [formerly 3b1f089cbd] [formerly ef93741056 [formerly 3b1f089cbd] [formerly 26f787ac83 [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]
Former-commit-id: 26f787ac83
Former-commit-id: 2e9836e506 [formerly 429c534da0]
Former-commit-id: 9f7222a1b3
2013-10-03 11:54:23 -05:00
Max Schenkelberg
6e5873733e Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
Amend: Accepted ticket.

Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830

Former-commit-id: 780ac0129f [formerly e3f6b1ea21] [formerly 780ac0129f [formerly e3f6b1ea21] [formerly 866c851b47 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]
Former-commit-id: 866c851b47
Former-commit-id: 43b7cb3107 [formerly ba25f56dbe]
Former-commit-id: 80efdbb2b4
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
938ace6bae Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644

Former-commit-id: 860258e49c [formerly ff06ea1c5a] [formerly 860258e49c [formerly ff06ea1c5a] [formerly 20853f7333 [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]
Former-commit-id: 20853f7333
Former-commit-id: bf0642450c [formerly 6c7c693581]
Former-commit-id: baa1ddd596
2013-10-03 10:36:47 -05:00
Greg Armendariz
48595626a4 Merge "Issue #2142 fix hibernate log" into development
Former-commit-id: 1c7dcca534 [formerly 16e36817cf] [formerly 1c7dcca534 [formerly 16e36817cf] [formerly f7b6c60ee6 [formerly bf5cbc38c8b345830c673cda8078a62de8040335]]]
Former-commit-id: f7b6c60ee6
Former-commit-id: 18f6b66b7a [formerly b2c2fcb968]
Former-commit-id: 13fbc8b6ef
2013-10-02 15:32:54 -05:00
Nate Jensen
fc53dae5f8 Issue #2142 fix hibernate log
Change-Id: I20cfbaacd210ec43f6228d094669b34224862549

Former-commit-id: 5e48cfdd9d [formerly ee3550654b] [formerly 5e48cfdd9d [formerly ee3550654b] [formerly 687e64dc29 [formerly e5d5ceb52ab2a0306c313169dddd71cf4368de17]]]
Former-commit-id: 687e64dc29
Former-commit-id: a97cd93f95 [formerly db35be851e]
Former-commit-id: 729678f323
2013-10-02 15:30:52 -05:00
Nate Jensen
a0340f2a82 Merge "Issue #2404 move grid reprojection style rules to common." into development
Former-commit-id: 028165eace [formerly 4564a94369] [formerly 028165eace [formerly 4564a94369] [formerly 6bc326b8d1 [formerly 942bc0600576cd0d322c4e82748ac6fbffc0548e]]]
Former-commit-id: 6bc326b8d1
Former-commit-id: 14d7cc21e1 [formerly d7a8341832]
Former-commit-id: 549f2b33ba
2013-10-02 11:21:04 -05:00
Nate Jensen
8291074794 Merge "Issue #2296 - Change email recipients of unit test failure email." into development
Former-commit-id: 5eeb64c356 [formerly 708ac85c7c] [formerly 5eeb64c356 [formerly 708ac85c7c] [formerly 5dc4dbb431 [formerly 4f46993c19c9479541ec009469e00f2060e408a3]]]
Former-commit-id: 5dc4dbb431
Former-commit-id: dd9d517f56 [formerly f67efb2b78]
Former-commit-id: cc3c0e95df
2013-10-02 11:20:54 -05:00
Ben Steffensmeier
ff28df9bbc Issue #2404 move grid reprojection style rules to common.
Former-commit-id: a95f0dbac4 [formerly a75361ad34] [formerly a95f0dbac4 [formerly a75361ad34] [formerly 32a01070f9 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]
Former-commit-id: 32a01070f9
Former-commit-id: 95b1c01650 [formerly 59d7c79c20]
Former-commit-id: dc4c07c194
2013-10-02 10:33:23 -05:00
Mike Duff
387865a9fc Issue #2296 - Change email recipients of unit test failure email.
Change-Id: I17338a82fd97a12eaafc1b64a91ebe35de1fb270

Former-commit-id: 425ce97978 [formerly 7072b53ba5] [formerly 425ce97978 [formerly 7072b53ba5] [formerly 77c2043a1a [formerly 466b16f5052e3a848980976cfbdcf5dff95673c9]]]
Former-commit-id: 77c2043a1a
Former-commit-id: 35c44291e0 [formerly 229637bf7a]
Former-commit-id: 076da5b3f3
2013-10-02 09:54:16 -05:00
Nate Jensen
c18e9ee060 Issue #2361 remove XML annotations from localization requests/responses
Change-Id: Ia2aa791f7e68524d19f24522c7824a977d25d58f

Former-commit-id: 8e17babd91 [formerly dd75847b7b] [formerly 8e17babd91 [formerly dd75847b7b] [formerly 396e69180d [formerly ef569f59ca91c73cfbfad4b062fb0110d33533d3]]]
Former-commit-id: 396e69180d
Former-commit-id: 28ce7782fe [formerly 3b92de5abc]
Former-commit-id: 38edfa0d07
2013-10-02 09:09:26 -05:00
Nate Jensen
580f3be05d Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
Former-commit-id: 68c8f9addd [formerly 265b6e7e61] [formerly 68c8f9addd [formerly 265b6e7e61] [formerly 6cd79464ef [formerly 33899872714e8b945131bc17eab63bc71af38d37]]]
Former-commit-id: 6cd79464ef
Former-commit-id: c4018373f1 [formerly 64d66cf406]
Former-commit-id: ff27201982
2013-10-01 15:19:56 -05:00
Richard Peter
86c28e6e16 Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50

Former-commit-id: 75b0f19d87 [formerly bb9488bb92] [formerly 75b0f19d87 [formerly bb9488bb92] [formerly f4e71b65d3 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 3514194d3b [formerly 39ae6d437d]
Former-commit-id: ddf07f8030
2013-10-01 15:06:34 -05:00
Richard Peter
32dd0fedc1 Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

Former-commit-id: 984785ce5e [formerly e45689dbc7] [formerly 984785ce5e [formerly e45689dbc7] [formerly add32a774f [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]
Former-commit-id: add32a774f
Former-commit-id: aa2eda2c38 [formerly c178e4543a]
Former-commit-id: 06737e3fa2
2013-10-01 14:22:33 -05:00
Richard Peter
b6b92e0ff1 Merge "Issue #2191 Fixing Registry Federation" into development
Former-commit-id: f1dbe103ee [formerly 50ce059677] [formerly f1dbe103ee [formerly 50ce059677] [formerly eefbfee6fc [formerly 97ab04bce3db7f2f2e19d310da5b696e2a860d55]]]
Former-commit-id: eefbfee6fc
Former-commit-id: 8e429ae579 [formerly 14b1fcc763]
Former-commit-id: ed261ea1a5
2013-10-01 13:07:47 -05:00
Nate Jensen
0c92f4eca1 Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7

Former-commit-id: f529c077c6 [formerly effa4f4f26] [formerly f529c077c6 [formerly effa4f4f26] [formerly 3e7dc7782f [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: e1c35952c9 [formerly 4e6f5afc57]
Former-commit-id: 593700bd28
2013-10-01 11:25:45 -05:00
Bryan Kowal
6056aed708 Issue #2033 - msi build updates
Former-commit-id: 3bf9b72f52 [formerly 7208eadbfb] [formerly 3bf9b72f52 [formerly 7208eadbfb] [formerly e46254cef1 [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]
Former-commit-id: e46254cef1
Former-commit-id: 93ff6ab60d [formerly e76c20007a]
Former-commit-id: 8660d4b9e7
2013-09-30 16:18:37 -05:00
Lee Venable
027e9179a5 Issue #2420 - fixed font memory leak in the setFont method
Change-Id: Ibf773c6df580cb65dd62b46f8fd127fde6585a57

Former-commit-id: e18b0d7e6a [formerly 44d9e12d98] [formerly e18b0d7e6a [formerly 44d9e12d98] [formerly 9c159e7c40 [formerly 16effa6f2cda60d566e5f820ab517ed105a0894e]]]
Former-commit-id: 9c159e7c40
Former-commit-id: e5861dabc3 [formerly 39cf74adf1]
Former-commit-id: 238d4fa030
2013-09-30 14:31:46 -05:00
Nate Jensen
622563303e Merge "Issue #2400 fix so active map editor is used if applicable" into development
Former-commit-id: 1825bea2cb [formerly c5d223ade8] [formerly 1825bea2cb [formerly c5d223ade8] [formerly 7da1197e7a [formerly 288acb25b23972bda06795bd02e2de973d4b170b]]]
Former-commit-id: 7da1197e7a
Former-commit-id: 40eb34ac41 [formerly 3e9afe9bab]
Former-commit-id: 2ce522854c
2013-09-30 13:10:08 -05:00
Greg Armendariz
03eee46e44 Merge "Issue #2033 - pde and rpm build updates" into development
Former-commit-id: 14fda3ff05 [formerly 32349a807b] [formerly 14fda3ff05 [formerly 32349a807b] [formerly 4c838ad045 [formerly c39016a5ce3f12e960b2419a8e3a7df6523791a3]]]
Former-commit-id: 4c838ad045
Former-commit-id: 660f7bb52f [formerly ab4c07dfdc]
Former-commit-id: 926e15025f
2013-09-30 12:11:59 -05:00
Steve Harris
79d71e33d0 13.5.2-7 baseline
Former-commit-id: b5cb693619 [formerly 0f8fc513bf] [formerly b5cb693619 [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]
Former-commit-id: a212c30bd7
Former-commit-id: 06ba0dbf6c [formerly 02d6145782]
Former-commit-id: 5e4023b974
2013-09-30 13:05:31 -04:00
Nate Jensen
8b62ea092a Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

Former-commit-id: 58c9aced4e [formerly 8e9e495149] [formerly 58c9aced4e [formerly 8e9e495149] [formerly c1dd4b40fb [formerly 563212924964f8ca66cba789d7867b19c68d0682]]]
Former-commit-id: c1dd4b40fb
Former-commit-id: 81f5ecb21a [formerly 136ea71235]
Former-commit-id: 726f38c27f
2013-09-30 11:47:26 -05:00
Benjamin Phillippe
bfac3e7977 Issue #2191 Fixing Registry Federation
Change-Id: Ibf3dec6af45424bc8678a37f00b070d3032bb7de

Former-commit-id: 1c9f237245 [formerly f76c747a01] [formerly 1c9f237245 [formerly f76c747a01] [formerly ac44137242 [formerly 985d2d02c2191eadcba59af4b16ad3d7e15de6d6]]]
Former-commit-id: ac44137242
Former-commit-id: 83cbecc94e [formerly cc1c27ea93]
Former-commit-id: 6e249902d4
2013-09-30 10:16:03 -05:00
Mike Duff
9dd740eeee Issue #2417 - Fix the highlight all button in the notification center's find dialog
Change-Id: Ia39e049045116a4766ed989612f6ab9a3d994efd

Former-commit-id: a966d4ce97 [formerly 43e2b5c156] [formerly a966d4ce97 [formerly 43e2b5c156] [formerly b0fac5792b [formerly 01d92017a3db5aafc4b6d6a9f00abbf64481cfe7]]]
Former-commit-id: b0fac5792b
Former-commit-id: 095a9161f4 [formerly 708f60d5c0]
Former-commit-id: e66ae68770
2013-09-30 09:40:08 -05:00
Lee Venable
a9e6005dd2 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: ae23948831 [formerly 0758d67964] [formerly ae23948831 [formerly 0758d67964] [formerly 9c02d45802 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]]]
Former-commit-id: 9c02d45802
Former-commit-id: abb0b0a7f1 [formerly b9fd15122e]
Former-commit-id: 87be8618c4
2013-09-27 15:07:02 -05:00
Brian Clements
86ad359c34 Issue #2404 added upgrade script to move style rules
Former-commit-id: 480605251a [formerly 5c3a995fad] [formerly 480605251a [formerly 5c3a995fad] [formerly 2ebc09493a [formerly c6b890c59cdc5d831358f3d908533cc1ecf2cec9]]]
Former-commit-id: 2ebc09493a
Former-commit-id: 1dc301acd0 [formerly 788e95f6d1]
Former-commit-id: 72b5f0927a
2013-09-27 11:16:35 -05:00
Brian Clements
6cb6d468fe Issue #2404 Moved colormap parameter factory to common
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common


Former-commit-id: 4c5d2b051d [formerly 2f25116c10] [formerly 4c5d2b051d [formerly 2f25116c10] [formerly 75448f8a42 [formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]]
Former-commit-id: 75448f8a42
Former-commit-id: fedd0dc781 [formerly e8cc15940c]
Former-commit-id: 0ba625fbe6
2013-09-27 09:41:51 -05:00
Nate Jensen
a3cfe6903a Merge "Issue #2386 Backend work for adding multiple types to Subscription overlap rules Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17" into development
Former-commit-id: 51bf49f6b5 [formerly 291cd53426] [formerly 51bf49f6b5 [formerly 291cd53426] [formerly c40bedaaf9 [formerly 9f24ff56dd91286c02ef168be4d4b36efe67f497]]]
Former-commit-id: c40bedaaf9
Former-commit-id: daff685991 [formerly a865c6b706]
Former-commit-id: e5d98833b1
2013-09-27 09:39:54 -05:00
Nate Jensen
9296ad509b Merge "Issue #2081 Removed the special case handling of spaces in dataURIs. Provided upgrade script for data types that have underscores in their dataURIs that should be spaces." into development
Former-commit-id: 37beaaadc1 [formerly 692a15a92f] [formerly 37beaaadc1 [formerly 692a15a92f] [formerly 06631d85f6 [formerly df60c32387ae7959be9e5ea7579f07ab67fb991b]]]
Former-commit-id: 06631d85f6
Former-commit-id: 5d3eecfb25 [formerly 4a7b73943a]
Former-commit-id: 40c0a64490
2013-09-26 17:31:26 -05:00
Richard Peter
88968d426f Merge "Issue #2413 - Added isDirty check to new config for Data Browser Peer review comments" into development
Former-commit-id: a7f13c41ae [formerly 2257278313] [formerly a7f13c41ae [formerly 2257278313] [formerly 1f40a40449 [formerly bedacaf43bb65ed3cfbf2aff57cd8839f8df4815]]]
Former-commit-id: 1f40a40449
Former-commit-id: 84c5ae8313 [formerly a87a85f3af]
Former-commit-id: 795a14d55b
2013-09-26 15:23:54 -05:00
Mike Duff
980ac20a35 Issue #2413 - Added isDirty check to new config for Data Browser
Peer review comments

Change-Id: I920fb093aea05ca985e1429671b94e34279a1af2

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

Former-commit-id: a9ec223319 [formerly 83064b2bd7] [formerly a9ec223319 [formerly 83064b2bd7] [formerly d29beb9d8d [formerly 96b4c904497ffc99d57949455b96025c658ae9c7]]]
Former-commit-id: d29beb9d8d
Former-commit-id: 8f89d25fc2 [formerly c2f6f46ece]
Former-commit-id: 79bcf798a2
2013-09-26 15:08:30 -05:00
Richard Peter
feb026820f Merge "Issue #2412 - Fix problem loading config in dataset discovery browser" into development
Former-commit-id: 7bcf34a67f [formerly 077703ddd8] [formerly 7bcf34a67f [formerly 077703ddd8] [formerly 15866b434c [formerly 97e67fe192e23cc11a05f9db69455b88c7a6fa5d]]]
Former-commit-id: 15866b434c
Former-commit-id: 64f7bceaf6 [formerly 3ba5596d9f]
Former-commit-id: ac85df4574
2013-09-26 14:56:11 -05:00
Richard Peter
ba88b1e608 Merge "Issue #2409 - Add widget disposed check" into development
Former-commit-id: 5dd79b7d5e [formerly 4a4f47e8d1] [formerly 5dd79b7d5e [formerly 4a4f47e8d1] [formerly 00e7a6fb16 [formerly 3c3fa316eb073d685f471ebcc48d599b4013c2c4]]]
Former-commit-id: 00e7a6fb16
Former-commit-id: 2e72cda86c [formerly 0f6fc99952]
Former-commit-id: 3b1c95ecde
2013-09-26 14:55:17 -05:00
Richard Peter
cd9e7d8195 Merge "Issue #2408 - Add a restore hidden notification menu item to Notification center" into development
Former-commit-id: 24da2b9721 [formerly f066cee72b] [formerly 24da2b9721 [formerly f066cee72b] [formerly 614cde9ec7 [formerly fac0408066832cb82e8193e1151eb8c63f9131f8]]]
Former-commit-id: 614cde9ec7
Former-commit-id: e75f71c079 [formerly 4c5a733870]
Former-commit-id: 801d9e4ccc
2013-09-26 14:55:01 -05:00
Richard Peter
460ef0b032 Merge "Issue #2375 - Only display the configured number of messages in the notification center. Peer review comments" into development
Former-commit-id: fd6b01b653 [formerly f1b5b78165] [formerly fd6b01b653 [formerly f1b5b78165] [formerly a1a5ad148c [formerly c43fa953929a1da0eb0ed8523f5a9b85b4e4b981]]]
Former-commit-id: a1a5ad148c
Former-commit-id: a0aa2311e0 [formerly a284046404]
Former-commit-id: d5ca48b3c6
2013-09-26 14:54:48 -05:00
Nate Jensen
e7e734f80c Merge "Issue #2250 fix for Python PathManager not correctly closing" into development
Former-commit-id: 51785dc207 [formerly 238936fe63] [formerly 51785dc207 [formerly 238936fe63] [formerly 71dfb4d01e [formerly 1c50504201635d54722be811ae27a3a3abe1a976]]]
Former-commit-id: 71dfb4d01e
Former-commit-id: eb6866e7e1 [formerly 8bd7aa3942]
Former-commit-id: 4c76645ccf
2013-09-26 14:53:49 -05:00
Max Schenkelberg
9c906f67cb Issue #2081 Removed the special case handling of spaces in dataURIs. Provided upgrade script for data types that have underscores in their dataURIs that should be spaces.
Amend: Fixed working directory issue
Amend: Added comments and encoded '%' character as well as '/'

Change-Id: I5297d35e1cbc33ee8d2af24da02b101bb6b766ba

Former-commit-id: fb6b1d3af1 [formerly b0416f43ba] [formerly fb6b1d3af1 [formerly b0416f43ba] [formerly e7220b37e6 [formerly c3a682e2885c81248fa0aa3f11d82f1d34ff74f7]]]
Former-commit-id: e7220b37e6
Former-commit-id: 972b7a1d3a [formerly 9243407623]
Former-commit-id: 600eb7a3a6
2013-09-26 14:51:07 -05:00