Commit graph

2221 commits

Author SHA1 Message Date
Bryan Kowal
3dcba78e27 Issue #2033 - pde and rpm build updates
Former-commit-id: 33a9270304 [formerly 6023c61bca] [formerly 33a9270304 [formerly 6023c61bca] [formerly 9a77e3553a [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]
Former-commit-id: 9a77e3553a
Former-commit-id: b89469aa84 [formerly a27a7b6da6]
Former-commit-id: c1d353c7d2
2013-09-20 12:36:56 -05:00
Richard Peter
143b9e02c6 Merge "Issue #2391 - Add Data Delivery to product browser. Peer review comments" into development
Former-commit-id: 41529c1202 [formerly 8d3e7e1ace] [formerly 41529c1202 [formerly 8d3e7e1ace] [formerly 2c9c5e3597 [formerly 683c87e0bfa87c9b7d8ad72e29ba72f581acf92d]]]
Former-commit-id: 2c9c5e3597
Former-commit-id: d017f2a3d9 [formerly 78d939dbca]
Former-commit-id: 1523f3cd05
2013-09-20 12:19:34 -05:00
Richard Peter
0e76ca1472 Merge "Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests." into development
Former-commit-id: 06791d17fc [formerly 693810a877] [formerly 06791d17fc [formerly 693810a877] [formerly 626ead2ff7 [formerly 61a6a3d0151652ce5c2862f23b42ce9aa888715c]]]
Former-commit-id: 626ead2ff7
Former-commit-id: bc397cb89d [formerly 026b88afc5]
Former-commit-id: 63b556c295
2013-09-20 10:23:47 -05:00
Mike Duff
e70a8b982b Issue #2391 - Add Data Delivery to product browser.
Peer review comments

Change-Id: Iffbedf518b2867533592b90bc993bce8f3df91fc

Former-commit-id: f878c1c78c [formerly 1a1f06defc] [formerly f878c1c78c [formerly 1a1f06defc] [formerly 6320aa3238 [formerly 5b393ffd7873116f665917286d127db4a76d9fb3]]]
Former-commit-id: 6320aa3238
Former-commit-id: f16bcdebcf [formerly c094e6cadc]
Former-commit-id: b468fa3bd5
2013-09-20 08:38:35 -05:00
Ben Steffensmeier
ff43ca7f98 Issue #2309 Make CachingDataStore more smarter.
Change-Id: Icb8c5ddc0ed9c648f4e2609b9801a695745f7600

Former-commit-id: b5c045f6b4 [formerly 503282475c] [formerly b5c045f6b4 [formerly 503282475c] [formerly 83a91dac47 [formerly 8343b7256c6d2a034d57714b0d7966282b758290]]]
Former-commit-id: 83a91dac47
Former-commit-id: a72e68eb4a [formerly c6dbf97207]
Former-commit-id: 6e9becc1e4
2013-09-19 16:48:51 -05:00
Brad Gonzales
82c2f1fcc0 Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests.
Amend:  Reverted BandwidthDaoUtil.setAdhocMostRecentUrlAndTime to Dave's fixes, with one
        minor change.  Added additional handling to start and end bucket calculation in
        InMemoryBandwidthBucketDao.  Addtional logging.  Removed exception logging of
        subscriptions.

Change-Id: Ie51c0accd7f39d31379e49e97542bae75bde5a1c

Former-commit-id: b5669581d8 [formerly c81825ce57] [formerly b5669581d8 [formerly c81825ce57] [formerly d597d7f653 [formerly 148cc6d96ed17127590827d166325c4748384689]]]
Former-commit-id: d597d7f653
Former-commit-id: e6247e83da [formerly 6ddb913829]
Former-commit-id: 3ca693fb89
2013-09-19 12:54:31 -05:00
Nate Jensen
1c84ac6a75 Issue #2360 don't allow mouse actions on layer if layer is invisible
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a

Former-commit-id: 906e9ad7e9 [formerly 08bd2c0241] [formerly 906e9ad7e9 [formerly 08bd2c0241] [formerly ce457b5be4 [formerly e4e6f46be381f83c7273d84e62d274575048aac2]]]
Former-commit-id: ce457b5be4
Former-commit-id: 450f5d063d [formerly 11c1fa94ae]
Former-commit-id: 1150d848e4
2013-09-18 17:33:20 -05:00
Lee Venable
77a256f2ec Issue #2384 - fixed try/catch/finally
Former-commit-id: 9875aba51b [formerly f4ee04c905] [formerly 9875aba51b [formerly f4ee04c905] [formerly b9e2d6c605 [formerly 696e7297f7130ff5486e947b179e3bb0f2eaaabd]]]
Former-commit-id: b9e2d6c605
Former-commit-id: 6efec38c47 [formerly 3bdf7eed9d]
Former-commit-id: cfc9ad8fb0
2013-09-18 07:41:23 -05:00
Richard Peter
808cb5766f Merge "Issue #2375 - update notification config dialog Peer review comments." into development
Former-commit-id: 1a66b94f69 [formerly f1dab03b63] [formerly 1a66b94f69 [formerly f1dab03b63] [formerly 2c8c541100 [formerly 64f5ff1867d110948dce30b41d2208aa8c494c7f]]]
Former-commit-id: 2c8c541100
Former-commit-id: f4dc92270d [formerly 7d5ac503b4]
Former-commit-id: 3c5919b297
2013-09-17 20:43:08 -05:00
Max Schenkelberg
4059622cb7 Issue #2285 Fixed openFile in FileTreeView to attempt to refresh the tree if file not found.
Change-Id: Icce65c35a7a812e09af931dc451801f9caa383d5

Former-commit-id: 5bffdf61bb [formerly aee70a1a65] [formerly 5bffdf61bb [formerly aee70a1a65] [formerly 4392aec17a [formerly aae7d6af040d9a4f394d32782228878ce2092a07]]]
Former-commit-id: 4392aec17a
Former-commit-id: 938f8a92fe [formerly f941760133]
Former-commit-id: 0d72794455
2013-09-17 17:38:27 -05:00
Lee Venable
945a1de7fd Issue #2384 - fixed memory leak and resource leak
Former-commit-id: a3f09b3956 [formerly 001dd5e203] [formerly a3f09b3956 [formerly 001dd5e203] [formerly 5e9ce7e29f [formerly ce5883e6f612cd8c5ff6a4f41bcff374e4b3ef1f]]]
Former-commit-id: 5e9ce7e29f
Former-commit-id: 4b549c7b9a [formerly 20e5ee5c3f]
Former-commit-id: 6246cb04af
2013-09-17 16:53:20 -05:00
Bryan Kowal
ec850d5a85 Issue #2297 - fix 14.2.1 build
- Amend: fix issue #

Change-Id: Ib438dfdb4f80320f2052c5941d80f2dbb49882e4

Former-commit-id: 87390b9381 [formerly 1b35cf5c72] [formerly 87390b9381 [formerly 1b35cf5c72] [formerly fb10395d44 [formerly ff7244318b689bfee01796af0b1a0c1b277e4b48]]]
Former-commit-id: fb10395d44
Former-commit-id: 93743b9d2c [formerly 85c2c499b6]
Former-commit-id: abde04230f
2013-09-17 09:16:21 -05:00
Mike Duff
92b812fb0e Issue #2375 - update notification config dialog
Peer review comments.

Change-Id: Idf4fa753df71ed5cd482ceb22f5b8851fbb1a716

Former-commit-id: 945ceae14a [formerly 046d98b5e7] [formerly 945ceae14a [formerly 046d98b5e7] [formerly dd361ff1f1 [formerly ec7e3683dd59401ff7365fb3095e5b695c2ba9ee]]]
Former-commit-id: dd361ff1f1
Former-commit-id: 6f6dcf604b [formerly b0f3cc6b34]
Former-commit-id: 81eb2d9617
2013-09-17 08:13:08 -05:00
Richard Peter
0c0496b98e Merge "Issue #2309 Request subgrids of grib data whenever possible." into development
Former-commit-id: 44a5ec8ee0 [formerly 7245c8674d] [formerly 44a5ec8ee0 [formerly 7245c8674d] [formerly caf2e69a87 [formerly e7f1c0a4f67bf2f440c27c4e77e8d8ae0145186a]]]
Former-commit-id: caf2e69a87
Former-commit-id: 0974e63812 [formerly 0da96389cf]
Former-commit-id: b11b749cfc
2013-09-16 20:04:22 -05:00
Ron Anderson
bad3536d96 Merge "Issue #2033: Move GFE-specific localization files and other misc. code out of build.cave project and into viz.gfe project." into development
Former-commit-id: 2fb7e9505b [formerly 8c972a61ac] [formerly 2fb7e9505b [formerly 8c972a61ac] [formerly 609c518335 [formerly 9385c67334c9837546677dd1e22f6c93fdd6453d]]]
Former-commit-id: 609c518335
Former-commit-id: 42075bcfb7 [formerly b88c204578]
Former-commit-id: 232380edc9
2013-09-16 17:05:36 -05:00
Max Schenkelberg
420a31b8cb Issue #2318 Added OVERLINE,UNDERLINE, and STRIKETHROUGH text styles
Change-Id: I8762cb2385a89941936f37e6fb65dc324d5af0e5

Former-commit-id: 0302fdf992 [formerly c3f6193618] [formerly 0302fdf992 [formerly c3f6193618] [formerly 74cf8523c6 [formerly 6ec6a0cd016a240f9e91baef4d16ba01f9676049]]]
Former-commit-id: 74cf8523c6
Former-commit-id: 69a341060b [formerly ce73a1c1dd]
Former-commit-id: 1aecf9cb85
2013-09-16 12:53:34 -05:00
David Gillingham
05929b719f Issue #2033: Move GFE-specific localization files and other misc. code out of
build.cave project and into viz.gfe project.

Change-Id: Ic51275064f92a9cf50a15c2fff647b73f0839375

Former-commit-id: ee4ba98a26 [formerly b8c1bc39f6] [formerly ee4ba98a26 [formerly b8c1bc39f6] [formerly 64cde568ab [formerly cdb1ad6eee96d2b61d35d7d5d727336128827a1b]]]
Former-commit-id: 64cde568ab
Former-commit-id: 04f2c165da [formerly e311062ae2]
Former-commit-id: a9c59c0a1e
2013-09-16 12:50:04 -05:00
Ben Steffensmeier
624f840272 Issue #2309 Request subgrids of grib data whenever possible.
Former-commit-id: f061cc71c8 [formerly 990964ca40] [formerly f061cc71c8 [formerly 990964ca40] [formerly 38fc89ffaa [formerly c9e8e6a8d6550f41039e2208b50bd053bfef94b8]]]
Former-commit-id: 38fc89ffaa
Former-commit-id: 67c685df05 [formerly 0c21decc97]
Former-commit-id: 8efc9946e0
2013-09-16 10:53:23 -05:00
Nate Jensen
6319e8d515 Merge "Issue #2277 Got rid of all ScriptCreator references in raytheon code." into development
Former-commit-id: d0e9c87501 [formerly 10f06e1056] [formerly d0e9c87501 [formerly 10f06e1056] [formerly abbfa7c9e3 [formerly 0c417fcd710641f134fa20f7993eb5829f91bac9]]]
Former-commit-id: abbfa7c9e3
Former-commit-id: 69fe3a6a2d [formerly 7e9a577e02]
Former-commit-id: 69399dc749
2013-09-13 15:13:11 -05:00
Jonathan Sanchez
114c778c57 Issue #2364 Moved import in python method
Change-Id: Id5ccb072140259866d387765836e8fb4887d5283

Former-commit-id: 616ee390d2 [formerly c5bb45f380] [formerly 616ee390d2 [formerly c5bb45f380] [formerly a5631d0132 [formerly 6710f93ec44b23d2af4c708af3127ef6f564777c]]]
Former-commit-id: a5631d0132
Former-commit-id: 23725d7aaa [formerly edfc6531c5]
Former-commit-id: 450d8ef777
2013-09-12 15:56:03 -05:00
Max Schenkelberg
f8d2a9770b Issue #2277 Got rid of all ScriptCreator references in raytheon code.
Change-Id: I255301d36da8546ef0850b3dc0b4d00ee0bfa002

Former-commit-id: 661d47c894 [formerly 955db6a722] [formerly 661d47c894 [formerly 955db6a722] [formerly 0faed07d58 [formerly 3183c0abb055acf02e255392f92402e84abd0e08]]]
Former-commit-id: 0faed07d58
Former-commit-id: 08e85c8588 [formerly 2a8d148a74]
Former-commit-id: 65d11c8e51
2013-09-12 10:10:04 -05:00
Lee Venable
165a6571cb Issue #2353 - fixed cursor memory leaks
Former-commit-id: 60fb3a2b8f [formerly e70475bb7b] [formerly 60fb3a2b8f [formerly e70475bb7b] [formerly a52ea0a481 [formerly 0481bd1eaf467d1be6b8cc2f558f2de0301969ad]]]
Former-commit-id: a52ea0a481
Former-commit-id: 85d091f8a4 [formerly 15d4b2e7f3]
Former-commit-id: d64d1ffad3
2013-09-12 08:39:07 -05:00
Max Schenkelberg
00364668a4 Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 487775918d [formerly 17b38d9f72] [formerly 487775918d [formerly 17b38d9f72] [formerly 63e90f6955 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]]
Former-commit-id: 63e90f6955
Former-commit-id: 96852b88ec [formerly e4b18ef410]
Former-commit-id: 87d33eb32f
2013-09-11 16:32:00 -05:00
Nate Jensen
b30de9c463 Merge "Issue #2251 fix alertviz build since style rules now in common" into development
Former-commit-id: 1953e9ff78 [formerly 6ee783aa78] [formerly 1953e9ff78 [formerly 6ee783aa78] [formerly 17cac1c339 [formerly 8727b316bfa7c8acd8539c756865346c5235e6ab]]]
Former-commit-id: 17cac1c339
Former-commit-id: 7ad774e7be [formerly d6b7f6c1f5]
Former-commit-id: 216d0fa21f
2013-09-11 16:31:52 -05:00
Matt Nash
3101c06b78 Issue #2251 fix alertviz build since style rules now in common
Change-Id: I4753835357468b279543704cd4b3fa4dc25e9899

Former-commit-id: 05a77ad637 [formerly 6a24bc2c0f] [formerly 05a77ad637 [formerly 6a24bc2c0f] [formerly ac55123956 [formerly 4b1ef869f3a5363875db4b429c0c8864dda24a2b]]]
Former-commit-id: ac55123956
Former-commit-id: 3c2889969f [formerly 98b37086f9]
Former-commit-id: 1795299136
2013-09-11 16:30:12 -05:00
Dave Hladky
898e63c10e Merge branch 'dd_pre_release_2.1' into development
Former-commit-id: e4e75ec268 [formerly f1fc14ce90] [formerly e4e75ec268 [formerly f1fc14ce90] [formerly 329a40852c [formerly 076dd7338edcf45a33f6485f190831acd344b954]]]
Former-commit-id: 329a40852c
Former-commit-id: 2f3f1d88b4 [formerly b0b51dbcb6]
Former-commit-id: 1348b91f27
2013-09-11 15:07:23 -05:00
Nate Jensen
97b7ee3d89 Merge "Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6" into dd_pre_release_2.1
Former-commit-id: 5058c9cb9c [formerly 2696f8bc3b] [formerly 5058c9cb9c [formerly 2696f8bc3b] [formerly 98c4525dab [formerly 9cbd8325e0225e1523e0cba20c3c08ded3beb32c]]]
Former-commit-id: 98c4525dab
Former-commit-id: 016acab272 [formerly 4808073dc9]
Former-commit-id: 679fa39be0
2013-09-11 14:57:28 -05:00
Dave Hladky
c735f574bc Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow
Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6

Former-commit-id: cedbfc69b7 [formerly f0cd59589b] [formerly cedbfc69b7 [formerly f0cd59589b] [formerly 32492e2fc7 [formerly 5013a3b61bcc0a1533211e047d780e5a7ecacb08]]]
Former-commit-id: 32492e2fc7
Former-commit-id: 326a5d8776 [formerly 027ab20562]
Former-commit-id: 2ea538fa64
2013-09-11 13:28:51 -05:00
Nate Jensen
225eb7ed52 Merge "Issue #2180 - handle delete of credentials" into dd_pre_release_2.1
Former-commit-id: b40157ac97 [formerly 92233a3f3a] [formerly b40157ac97 [formerly 92233a3f3a] [formerly b371d6ed2a [formerly 07a5e7a9826935e7e3e724e648ce931faf0da62e]]]
Former-commit-id: b371d6ed2a
Former-commit-id: b2f2a54c29 [formerly 94c5782fbd]
Former-commit-id: f5a3c53329
2013-09-11 13:00:03 -05:00
Mike Duff
fa7a76c1ff Issue #2180 - handle delete of credentials
Change-Id: Ie8f1cdba92df03d94a4d7b009b8330eced10e036

Former-commit-id: 43583eeaae [formerly 0d602a6c3f] [formerly 43583eeaae [formerly 0d602a6c3f] [formerly aaf7a3778f [formerly 1dfcfc80308a182f0f21f028e19285fa39c53d6e]]]
Former-commit-id: aaf7a3778f
Former-commit-id: 30076abe7c [formerly 4b572b038f]
Former-commit-id: 0f386a468f
2013-09-11 12:08:12 -05:00
Mike Duff
2b81983331 Issue #2352 - Data Browser Must Check For Subscriptions Belonging to the Local Site
Change-Id: I23392906a7d829852af2991dd096d4b5e76765aa

Former-commit-id: b569410bc4 [formerly 89342e59b9] [formerly b569410bc4 [formerly 89342e59b9] [formerly b8d2c6cffc [formerly 5b4c9794eb396f02cdf024d2df2089add4719910]]]
Former-commit-id: b8d2c6cffc
Former-commit-id: 2465a0625b [formerly 13751ede70]
Former-commit-id: ed8fa698dd
2013-09-11 09:47:04 -05:00
Nate Jensen
3a5f1354cd Merge "Issue #2251 cleanup of moving style rules and fix an ncep project" into development
Former-commit-id: f6d30d15f2 [formerly d63abcb6a8] [formerly f6d30d15f2 [formerly d63abcb6a8] [formerly b209f87199 [formerly ec7e5d011d1638b1dec62ca43ae9b8b45a41beb6]]]
Former-commit-id: b209f87199
Former-commit-id: 9371f25e07 [formerly f61ff594b6]
Former-commit-id: 2d65127bd0
2013-09-10 12:17:13 -05:00
Matt Nash
1a63211900 Issue #2251 cleanup of moving style rules and fix an ncep project
Change-Id: I625a2f919be6b4f2a649addaf62aa1fa948e4739

Former-commit-id: 4799f1b69f [formerly b60db8dd8b] [formerly 4799f1b69f [formerly b60db8dd8b] [formerly 89d251ef64 [formerly aa426e18a0be68455a600b641074130b0bb1f9cb]]]
Former-commit-id: 89d251ef64
Former-commit-id: 484ac8fa02 [formerly f28acc9820]
Former-commit-id: a2751406fb
2013-09-10 10:55:46 -05:00
Matt Nash
37b4f67f16 Issue #2251 make style rules pluggable
Change-Id: I3adc5c94eb4a13686b346d231248faebc696c865

Former-commit-id: c4a6097e8b [formerly dd7111d7d3] [formerly c4a6097e8b [formerly dd7111d7d3] [formerly cb7d5a4c70 [formerly 9e31d3facd4d4807db060d6e1de29215b11a448e]]]
Former-commit-id: cb7d5a4c70
Former-commit-id: af4bc2a359 [formerly b873b6e399]
Former-commit-id: 35cddbf5f9
2013-09-10 09:50:56 -05:00
Matt Nash
d70677d78e Issue #2251 move style rules and preferences to common
Change-Id: I50bd92d1ed4e08d7d6204b7fa1cca0e8f1645030

Former-commit-id: e6af6c447f [formerly 06e04a419d] [formerly e6af6c447f [formerly 06e04a419d] [formerly f0a32e82a1 [formerly 982f297ab19ebcb5e49f662c30b44992e63569cb]]]
Former-commit-id: f0a32e82a1
Former-commit-id: 698e2ee1cc [formerly 2e8149bcb2]
Former-commit-id: d1ea1f569f
2013-09-10 09:28:11 -05:00
Nate Jensen
47cf026940 Merge "Issue #2277 Removed more ScriptCreator references, fixed profiler data from last commit" into development
Former-commit-id: bcd75b23b7 [formerly 7c539a3900] [formerly bcd75b23b7 [formerly 7c539a3900] [formerly 27e04e5bae [formerly dadf441e9716e0a1e78549af3c8808103c1babed]]]
Former-commit-id: 27e04e5bae
Former-commit-id: 32670dccb6 [formerly 7294d2a621]
Former-commit-id: 7f0bb64b95
2013-09-09 17:15:35 -05:00
Max Schenkelberg
94345c7641 Issue #2277 Removed more ScriptCreator references, fixed profiler data from last commit
Change-Id: I703d877c72df3cc561495b6c58de5cebe745ee09

Former-commit-id: b584c11d77 [formerly 3471f4cb46] [formerly b584c11d77 [formerly 3471f4cb46] [formerly 8ada70e372 [formerly a9d39a209f6e315ddc60d5000fdcf9c40d59f8eb]]]
Former-commit-id: 8ada70e372
Former-commit-id: d035fdef33 [formerly eaaf36a2ea]
Former-commit-id: ffc6e1b745
2013-09-09 17:13:24 -05:00
Lee Venable
c8091476fb Issue #2349 - Fixed font memory leaks
Former-commit-id: 6b171d20db [formerly 02651018f2] [formerly 6b171d20db [formerly 02651018f2] [formerly 0816c3e7c7 [formerly e81149f65d944f9898509a6ff03b063662a88882]]]
Former-commit-id: 0816c3e7c7
Former-commit-id: 0636263f5b [formerly 1db5b00c76]
Former-commit-id: 89dafbbe63
2013-09-09 16:54:49 -05:00
Lee Venable
c0c042ea03 Issue #2346 - fixed cursor memory leaks
Former-commit-id: 0ac37c18b3 [formerly 24c55ec007] [formerly 0ac37c18b3 [formerly 24c55ec007] [formerly 2c46c54a87 [formerly 645aceffd1d205eb4be4c8fd122e6cdf7b3b368e]]]
Former-commit-id: 2c46c54a87
Former-commit-id: c605449e94 [formerly 71f4f58a1b]
Former-commit-id: f6da35ba37
2013-09-09 15:12:05 -05:00
Max Schenkelberg
1a466db041 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 8a500677d3 [formerly b633f9987a] [formerly 8a500677d3 [formerly b633f9987a] [formerly 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]
Former-commit-id: 2d1db7d0e2
Former-commit-id: 1bdef4ddd3 [formerly 61e6dd1316]
Former-commit-id: 66d023227d
2013-09-09 10:10:11 -05:00
Lee Venable
587b808635 Issue #2342 - fixed color memory leak and NPE
Change-Id: I34c6bf75f3901f7304ef392a4549f51f599752ff

Former-commit-id: 52667faab5 [formerly b71b2c4208] [formerly 52667faab5 [formerly b71b2c4208] [formerly 508757bce6 [formerly 68411a30159f8251937f78d77f561c20a4822e48]]]
Former-commit-id: 508757bce6
Former-commit-id: 9f3666fbbe [formerly 74d23f7948]
Former-commit-id: bf26f7d0fa
2013-09-06 14:03:14 -05:00
David Gillingham
2e92a5fce1 Issue #2307: Remove calls to PythonScript constructor without ClassLoader
argument, fix IscMosaic.

Change-Id: Iff29b2790fd1c6d5f5b829f6b35ff31829cdc907

Former-commit-id: 936326f11e [formerly e526e7a82c] [formerly 936326f11e [formerly e526e7a82c] [formerly 47878a4318 [formerly 85609a4bf9072ae41dbafbc1b874efbcd5bd21a4]]]
Former-commit-id: 47878a4318
Former-commit-id: 73f1695e2a [formerly 28e5aaabca]
Former-commit-id: c0f4022abd
2013-09-06 10:16:31 -05:00
Richard Peter
f0a4b41ca4 Merge "Issue #2330 SubscriptionManagerAction.execute now filters subscriptions by current site id." into dd_pre_release_2.1
Former-commit-id: e65a557536 [formerly 4dcc55b0c3] [formerly e65a557536 [formerly 4dcc55b0c3] [formerly a149d485dd [formerly 9cdf94f6651d4e84af65738aaf577713fb717d95]]]
Former-commit-id: a149d485dd
Former-commit-id: bdab9e5d8d [formerly 5dcfb40eed]
Former-commit-id: b0e863109a
2013-09-05 16:40:30 -05:00
Richard Peter
5a00dc1f56 Merge "Issue #2335 - Implement adhoc point queries" into dd_pre_release_2.1
Former-commit-id: 76316ae998 [formerly a6652b28f5] [formerly 76316ae998 [formerly a6652b28f5] [formerly fa09f2a97f [formerly b21e918baf426f02947dcc98e33478018dcfe789]]]
Former-commit-id: fa09f2a97f
Former-commit-id: 4e1e507eeb [formerly ab8e1d868e]
Former-commit-id: 277814865a
2013-09-05 16:39:53 -05:00
Brad Gonzales
61cabab0d3 Issue #2330 SubscriptionManagerAction.execute now filters subscriptions by current site id.
Change-Id: I4572837369088bcc1ee0bb4d5fb2349162f386b2

Former-commit-id: 96b3794c45 [formerly 2ebe39ea37] [formerly 96b3794c45 [formerly 2ebe39ea37] [formerly 0f12e60d65 [formerly 92386c72ba9e7ef3ee0c64caa8b369c23b0367eb]]]
Former-commit-id: 0f12e60d65
Former-commit-id: 6a669537f6 [formerly c35ee5cd06]
Former-commit-id: 648b34ff53
2013-09-05 16:30:15 -05:00
Richard Peter
60ae00be89 Merge "Issue #2314 - Fix for notification center's filtering." into dd_pre_release_2.1
Former-commit-id: 2d1c0c1688 [formerly a64552274c] [formerly 2d1c0c1688 [formerly a64552274c] [formerly 5127bb9485 [formerly fa034b944ece4587ad74adf430751faa6e32eb36]]]
Former-commit-id: 5127bb9485
Former-commit-id: 6731bfab3e [formerly e876e9ebf5]
Former-commit-id: 4ca0be5c1a
2013-09-05 16:26:48 -05:00
Mike Duff
dd7c6a2a18 Issue #2314 - Fix for notification center's filtering.
Change-Id: I404c5c79f642908ff8c48cba23b269af9a4dc3f6

Former-commit-id: bfc8669f17 [formerly 0ad77d7f3c] [formerly bfc8669f17 [formerly 0ad77d7f3c] [formerly 37896c4b81 [formerly 307c3cbca9732a534448eb40c4bff03573e4a975]]]
Former-commit-id: 37896c4b81
Former-commit-id: 286496addb [formerly 08bc45d599]
Former-commit-id: d7ef2edfcd
2013-09-05 15:04:23 -05:00
Mike Duff
8fc841e5b5 Issue #2335 - Implement adhoc point queries
Change-Id: I8d5f6017ee79c5aeb1769797c679688afef71259

Former-commit-id: 1c014081a2 [formerly b7e284b810] [formerly 1c014081a2 [formerly b7e284b810] [formerly 05170ee93f [formerly ee8fab4cffe5ef010c9a0296d1098ede9ba6b0c9]]]
Former-commit-id: 05170ee93f
Former-commit-id: 6fa63fc533 [formerly 30f47d5038]
Former-commit-id: e9534d779e
2013-09-05 14:48:31 -05:00
Ben Steffensmeier
a132ecda55 Issue #2316 Better upgrade script and feature files.
Change-Id: Ia86dce4fb73893a63ab35003eef8341cbfb0cd4b

Former-commit-id: c09b38e5b5 [formerly 72728121e4] [formerly c09b38e5b5 [formerly 72728121e4] [formerly af8fbacf72 [formerly 7855257369af383399d6cc2ea94d743e139263d2]]]
Former-commit-id: af8fbacf72
Former-commit-id: 2a602a76f3 [formerly f289473792]
Former-commit-id: 4d18d761c9
2013-09-05 13:22:12 -05:00
Richard Peter
7bb0b4addd Merge "Issue #2317 Unify airep and ncairep." into development
Former-commit-id: c0faebdf22 [formerly 6ece2b45c1] [formerly c0faebdf22 [formerly 6ece2b45c1] [formerly 298ac739af [formerly ed1255e60090ec39361d0c57f7d7d12412515262]]]
Former-commit-id: 298ac739af
Former-commit-id: e5602ccfde [formerly 76ac9a9cdc]
Former-commit-id: a1fc84a8a7
2013-09-05 12:22:20 -05:00