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

3212 commits

Author SHA1 Message Date
Brian Clements
0b7e067d96 Issue #3020 fixed error message when attempting to create already accessible room 
Former-commit-id: 57d2f28d54 [formerly bfafb0d055] [formerly 57d2f28d54 [formerly bfafb0d055] [formerly 4a8ee65cca [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 4829ef25bc [formerly 8861489810]
Former-commit-id: 63b9349843
 2014-04-16 14:26:17 -05:00
Lee Venable
9b085066c0 Issue #3034 - added widget dispose checks in runAsync methods. 
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: f4fb7b24f6 [formerly 7f068f164c] [formerly f4fb7b24f6 [formerly 7f068f164c] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]
Former-commit-id: ff3b42468f
Former-commit-id: 885e17788d [formerly 4cdbf301f3]
Former-commit-id: 31c8e61cb6
 2014-04-16 13:15:31 -05:00
Brian.Dyke
73efa466f9 Merged 13.5.5-1 into 1412 
Former-commit-id: 65ad515a6e [formerly 188d84cc87] [formerly 65ad515a6e [formerly 188d84cc87] [formerly 35ad867281 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]
Former-commit-id: 35ad867281
Former-commit-id: c0266e8988 [formerly 72618c4214]
Former-commit-id: 737283b94a
 2014-04-16 12:09:12 -04:00
Brian Clements
4979fe13df Issue #2981 fixed NPE when cached shared group deleted on server 
Former-commit-id: 8a4f212fdb [formerly 7afb1e66f5] [formerly 8a4f212fdb [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]
Former-commit-id: 7fd7817af4
Former-commit-id: 1daf03844c [formerly 007ba2ae4d]
Former-commit-id: 14084ee128
 2014-04-16 09:23:26 -05:00
Nate Jensen
0e6fdab306 Merge "Issue #2956 safety checks for GLShadedShapeBase" into development 
Former-commit-id: 2fba1f36ef [formerly 80434db98d] [formerly 2fba1f36ef [formerly 80434db98d] [formerly 120d8429a7 [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]
Former-commit-id: 120d8429a7
Former-commit-id: 2e23ae75f4 [formerly 62613ab33d]
Former-commit-id: 2f2d965833
 2014-04-16 08:41:43 -05:00
Nate Jensen
baafe7f7da Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development 
Former-commit-id: c723ec0bda [formerly 771885f9a5] [formerly c723ec0bda [formerly 771885f9a5] [formerly c16bbb52e4 [formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]
Former-commit-id: c16bbb52e4
Former-commit-id: 79c3f5f3a8 [formerly 550577806f]
Former-commit-id: 267258647e
 2014-04-15 17:55:21 -05:00
Nate Jensen
c9a79bc2d5 Issue #2956 safety checks for GLShadedShapeBase 
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451

Former-commit-id: 66f4ce250a [formerly 726c122dc7] [formerly 66f4ce250a [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: 2cf5941fe1 [formerly 56f645bbc7]
Former-commit-id: 77cf2d682f
 2014-04-15 17:38:17 -05:00
Lee Venable
4d0bead6bd Merge "Issue #3031 - Added dispose check in the runAsync calls." into development 
Former-commit-id: 14f0dc298e [formerly cde3cdeed1] [formerly 14f0dc298e [formerly cde3cdeed1] [formerly 2a93e03117 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]
Former-commit-id: 2a93e03117
Former-commit-id: a34e169792 [formerly c9c845d5f2]
Former-commit-id: 195a4dacfa
 2014-04-15 17:37:13 -05:00
Ron Anderson
072102dff0 Issue #3016 Fix ColormappedImage and ColorMapper. 
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
 2014-04-15 17:22:12 -05:00
Everett Kladstrup
2470d81179 Issue #2725 Move viirs derivparam python package to common_static 
Former-commit-id: 08dfcd9bd9 [formerly 5dbedee47a] [formerly 08dfcd9bd9 [formerly 5dbedee47a] [formerly 200f8f461d [formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]
Former-commit-id: 200f8f461d
Former-commit-id: 158e1fd086 [formerly fd2ddd24a7]
Former-commit-id: 6a2a88f75f
 2014-04-15 16:53:07 -05:00
Lee Venable
f51d2bf46d Issue #3031 - Added dispose check in the runAsync calls. 
Change-Id: I7996f58995aa261a1a66acc755768c3489130d43

Former-commit-id: 39b9d94dc1 [formerly d4aafc69d9] [formerly 39b9d94dc1 [formerly d4aafc69d9] [formerly 2122b79416 [formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]
Former-commit-id: 2122b79416
Former-commit-id: e30c910657 [formerly c3f4bccbf9]
Former-commit-id: ee78554540
 2014-04-15 16:49:42 -05:00
Everett Kladstrup
241387ba19 Issue #2725 Fix localization type for DerivParamLocalizationAdapter 
Former-commit-id: 4f1c7281d3 [formerly 27885c8296] [formerly 4f1c7281d3 [formerly 27885c8296] [formerly 54db6ad9af [formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]
Former-commit-id: 54db6ad9af
Former-commit-id: c2dfdf8cae [formerly ca7b672b52]
Former-commit-id: 6b1d0e6aa2
 2014-04-15 15:18:09 -05:00
Brian Clements
8945b26e9b Issue #2822 only allow transfer leader if participant is using shared display 
Former-commit-id: db67c03382 [formerly 5250f7a442] [formerly db67c03382 [formerly 5250f7a442] [formerly 6ccedc1182 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 6f9ef9a515 [formerly e8907aa729]
Former-commit-id: 9acb5a4a5b
 2014-04-15 15:15:11 -05:00
Brian Clements
86081dda91 Issue #2903 made xmpp reconnect an explicit action by user 
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 6f7851d8c4 [formerly 8ab1bab974] [formerly 6f7851d8c4 [formerly 8ab1bab974] [formerly 6b22374046 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: ca5909e222 [formerly 7cf5f06f2a]
Former-commit-id: 054b47951d
 2014-04-15 15:12:33 -05:00
Mike Duff
78a0ad33ef Issue #2785 - Fix loading of groups in sub request dialog 
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: 3a6e718ff0 [formerly 81e4c9b05d] [formerly 3a6e718ff0 [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]
Former-commit-id: d2a80ca966
Former-commit-id: 0bf14203ff [formerly 4773c3722c]
Former-commit-id: ddeb7fe4d2
 2014-04-15 10:10:18 -05:00
Nate Jensen
697a7f5b9b Issue #2984 remove unnecessary plugins from features 
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: e24940ead6 [formerly 6e2d68e102] [formerly e24940ead6 [formerly 6e2d68e102] [formerly 57f2357f10 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]
Former-commit-id: 57f2357f10
Former-commit-id: 97f09968b3 [formerly d435258fce]
Former-commit-id: 9ad8236b8d
 2014-04-14 16:50:54 -05:00
Nate Jensen
9972baa000 Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development 
Former-commit-id: d741f996c6 [formerly c71205eb89] [formerly d741f996c6 [formerly c71205eb89] [formerly 111b7f4283 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]
Former-commit-id: 111b7f4283
Former-commit-id: 9593960e9f [formerly 9917a8ef62]
Former-commit-id: 37a6c292f7
 2014-04-14 15:46:14 -05:00
Ron Anderson
07e6998fc6 Merge changes Ic5c0dcaa,Iae10909e into development 
* changes:
  Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
  Issue #2947 Make GridCoverage implement IGridGeometryProvider.


Former-commit-id: d5ebb5a800 [formerly 46d5349940] [formerly d5ebb5a800 [formerly 46d5349940] [formerly fd79bd354b [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]
Former-commit-id: fd79bd354b
Former-commit-id: d2346699bb [formerly 5ab1b1b95c]
Former-commit-id: c7e1797dd4
 2014-04-14 14:45:03 -05:00
Nate Jensen
c8c25d9224 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe 
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 40d1fda798 [formerly f086bb0c9b] [formerly 40d1fda798 [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: dfe50ee038 [formerly 715932091e]
Former-commit-id: 1e5433c9c3
 2014-04-14 14:28:11 -05:00
Lee Venable
4978a231eb Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development 
Former-commit-id: 1a3738c8fd [formerly f6601d6bcc] [formerly 1a3738c8fd [formerly f6601d6bcc] [formerly d4a6ce546d [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]
Former-commit-id: d4a6ce546d
Former-commit-id: bf4f3c75ef [formerly caf31402d7]
Former-commit-id: de242e3e91
 2014-04-14 14:09:03 -05:00
Richard Peter
6ef84cf3c4 Merge "Issue #2862 Implements locks on case creation." into development 
Former-commit-id: 22a01edbb7 [formerly 19755418f8] [formerly 22a01edbb7 [formerly 19755418f8] [formerly 181ffee3db [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: c4853e7982 [formerly 0abb97820b]
Former-commit-id: 48c8415382
 2014-04-14 13:28:26 -05:00
Richard Peter
de624d87d3 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: e4be1f24e7 [formerly dbba727f3d] [formerly e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: ff87317bd4 [formerly 8b279966d1]
Former-commit-id: b3fd8e5480
 2014-04-14 13:10:11 -05:00
Nate Jensen
ee8020b667 Merge "Issue #2241 fix tear off menus in practice mode" into development 
Former-commit-id: 2a0c73fb25 [formerly 47eb9ecb0a] [formerly 2a0c73fb25 [formerly 47eb9ecb0a] [formerly 5fe4c08ab6 [formerly 4fedbaacf54b5194afb9548101badc4619347638]]]
Former-commit-id: 5fe4c08ab6
Former-commit-id: 60ee75d3df [formerly f77b99b51c]
Former-commit-id: e115f8581b
 2014-04-14 09:28:34 -05:00
Richard Peter
4ca584c465 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development 
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: a4eba6e6df [formerly ffd74e6787]
Former-commit-id: c072d0d0ca
 2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8 Issue #2947 Minor satellite and derived parameter improvements. 
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: b120feab6f [formerly 6c92b645f0]
Former-commit-id: 0b6ca56417
 2014-04-11 17:37:59 -05:00
Ben Steffensmeier
43e975b11e Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider. 
Former-commit-id: ca78a04d95 [formerly d5b91d8846] [formerly ca78a04d95 [formerly d5b91d8846] [formerly 1ad8396366 [formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]]
Former-commit-id: 1ad8396366
Former-commit-id: b707e3b6db [formerly fb85857ff5]
Former-commit-id: 7ca12d26a9
 2014-04-11 17:34:38 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
 2014-04-11 16:23:09 -05:00
Roger Ferrel
6f127a05e0 Issue #2862 Implements locks on case creation. 
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b

Former-commit-id: 16fab01b8b [formerly 5570261d74] [formerly 16fab01b8b [formerly 5570261d74] [formerly cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]
Former-commit-id: cfea0489d7
Former-commit-id: c5de39c162 [formerly d66a346c65]
Former-commit-id: ac1946609e
 2014-04-11 16:07:58 -05:00
Qinglu.Lin
a849842e06 ASM #505 - Color table editor does not allow enough significant digits 
Change-Id: I2b98ec0de0ebef7b585574d063ddf87834edd44a

Former-commit-id: 6741deb3c2 [formerly 3bae853360] [formerly 6741deb3c2 [formerly 3bae853360] [formerly 18804fe98e [formerly 2b9cb3e46fbd1598e95a4ea3a866741fed6603d9]]]
Former-commit-id: 18804fe98e
Former-commit-id: dd6ff185c7 [formerly 2659a9ce4d]
Former-commit-id: 1c242f9e50
 2014-04-11 12:22:44 -04:00
brian.dyke
f299a28f9b Merge branch 'master_14.2.2' into asm_14.2.2 
Former-commit-id: 6a9ccba393 [formerly 6575f77fe3] [formerly 6a9ccba393 [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 88ddd667b6 [formerly ad63114f16]
Former-commit-id: 1c4e02168c
 2014-04-11 10:58:48 -04:00
Richard Peter
b6c8960328 Merge "Issue #2864 - Change how saved subset files are stored." into development 
Former-commit-id: 69c6217ae9 [formerly 8a682a5e23] [formerly 69c6217ae9 [formerly 8a682a5e23] [formerly 695878c6aa [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b4cc44faa0 [formerly 0fa4180959]
Former-commit-id: e858f14a8c
 2014-04-11 09:41:31 -05:00
Mike Duff
8b46df102d Issue #2864 - Change how saved subset files are stored. 
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: a58f279b54 [formerly 82cf444d6f] [formerly a58f279b54 [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]
Former-commit-id: 890faf2d73
Former-commit-id: dc2a5b0c6f [formerly 6d8bead4a7]
Former-commit-id: 583a4b1cea
 2014-04-11 08:27:42 -05:00
Nate Jensen
0bac0fa185 Merge "Issue #2937 Connect to the venue after the feed view is available." into development 
Former-commit-id: c7593d61c4 [formerly 5fc6942fab] [formerly c7593d61c4 [formerly 5fc6942fab] [formerly b3b9dbff67 [formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]]
Former-commit-id: b3b9dbff67
Former-commit-id: 7f32159599 [formerly 4a395ff2bc]
Former-commit-id: ff5519566f
 2014-04-10 16:59:17 -05:00
Everett Kladstrup
9327eebf87 Issue #2725 Moving derivparam plugins to the lowest applicable features 
Former-commit-id: 7fd3d7ce3d [formerly b074c88957] [formerly 7fd3d7ce3d [formerly b074c88957] [formerly ed0c157e33 [formerly 4397d0c6018858ab967110884cfdb7771c08e199]]]
Former-commit-id: ed0c157e33
Former-commit-id: 70a383f68d [formerly b9f67d3bae]
Former-commit-id: 5f280b7352
 2014-04-10 16:00:22 -05:00
Matt Nash
6fc553f812 Issue #2241 fix tear off menus in practice mode 
Change-Id: I52a2e9be64bff8a044b148666b7ad77670a6f64e

Former-commit-id: f5e333c154 [formerly 81c4976c96] [formerly f5e333c154 [formerly 81c4976c96] [formerly 0eed368ac4 [formerly 391655cd6a84c6cbf31e711ec5e1aa92833db896]]]
Former-commit-id: 0eed368ac4
Former-commit-id: d91e77641b [formerly 46df69447b]
Former-commit-id: 17f43a6114
 2014-04-10 14:50:06 -05:00
Everett Kladstrup
1467f1a316 Issue #2725 Put derivparam plugins in viz and edex separately 
Former-commit-id: 90244ad7ec [formerly d76aaed2f0] [formerly 90244ad7ec [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: fa9ee97662 [formerly db413dc65f]
Former-commit-id: 1a68ea889a
 2014-04-10 14:08:42 -05:00
Brad Gonzales
91d546d015 Issue #2937 Connect to the venue after the feed view is available. 
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 5fcec27765 [formerly cc0fd1e9af] [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: e41f9defa4 [formerly 3b25edad9a]
Former-commit-id: 8f72707b3a
 2014-04-10 14:01:53 -05:00
Nate Jensen
7cae36a45e Merge "Issue #1803 fix redbook sharing in collaboration" into development 
Former-commit-id: 74a7189143 [formerly e88519c5e3] [formerly 74a7189143 [formerly e88519c5e3] [formerly 666b271528 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: 5d17f07d25 [formerly 573981b0d5]
Former-commit-id: 4cffa91903
 2014-04-10 13:50:55 -05:00
Mike Duff
b432d6a4f6 Issue #2892 - Fix problems loading saved configs for data browser dialog. 
Change-Id: I73b98714642f5852f7209fd8533d49aa473412f9

Former-commit-id: 635684bb4e [formerly 33a2259cf4] [formerly 635684bb4e [formerly 33a2259cf4] [formerly da65756e3b [formerly 323badf58cf12a35b3a4d93ff0188b638e60969b]]]
Former-commit-id: da65756e3b
Former-commit-id: a23608ec59 [formerly 67ff4371b3]
Former-commit-id: bc82bf8f86
 2014-04-10 13:31:42 -05:00
Brian.Dyke
fbefee3e1d Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 73be1016c0 [formerly 8c2f601b59] [formerly 73be1016c0 [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: afc1da9015 [formerly ff51498036]
Former-commit-id: f051b95a7a
 2014-04-10 13:26:42 -04:00
David Gillingham
2ab21ac335 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 1c7e650e6a [formerly c8a6dc8769] [formerly 1c7e650e6a [formerly c8a6dc8769] [formerly da31ab2042 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: 0385a4395e [formerly 72229cfb94]
Former-commit-id: 89046665f6
 2014-04-10 11:24:40 -05:00
Nate Jensen
71e01e0264 Issue #1803 fix redbook sharing in collaboration 
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: 4cccdac37e [formerly 1efb9a2a4d] [formerly 4cccdac37e [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: 2750a173dc [formerly a191b473e2]
Former-commit-id: a3fef22e8b
 2014-04-10 10:50:33 -05:00
Nate Jensen
c2f1f5542a Merge "Issue #2725 Add new project to alertviz feature" into development 
Former-commit-id: 56b820ab97 [formerly ec40cb3dfc] [formerly 56b820ab97 [formerly ec40cb3dfc] [formerly eaf1382178 [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: a0e2342126 [formerly 952586230a]
Former-commit-id: 8c6704e442
 2014-04-09 16:07:25 -05:00
Everett Kladstrup
de0f935f69 Issue #2725 Add new project to alertviz feature 
Former-commit-id: 963ce8716e [formerly e4633811fc] [formerly 963ce8716e [formerly e4633811fc] [formerly 02b47e4d5a [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: c2a96ba985 [formerly 55638c0916]
Former-commit-id: a00b1dd9f6
 2014-04-09 16:01:57 -05:00
Richard Peter
421b2716a4 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
 2014-04-09 16:00:54 -05:00
Nate Jensen
560bdaf4c8 Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development 
Former-commit-id: ad961bb84d [formerly 0dd55f63ba] [formerly ad961bb84d [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]
Former-commit-id: 88d0e400fb
Former-commit-id: dfac2a42c2 [formerly a2c4c63852]
Former-commit-id: 5a2f9a2e04
 2014-04-09 14:07:09 -05:00
Everett Kladstrup
136af85d0c Issue #2725 Remove datacube plugin from viz.core feature 
Former-commit-id: b670fa67f6 [formerly 50346d5aec] [formerly b670fa67f6 [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: fd9bd8282a [formerly 9faba2afbf]
Former-commit-id: 21c7199512
 2014-04-09 13:59:11 -05:00
Everett Kladstrup
619ccff21b Issue #2725 Add new plugin to uf.viz.base feature 
Former-commit-id: 91673b18b0 [formerly 8d918404d5] [formerly 91673b18b0 [formerly 8d918404d5] [formerly 28364c8618 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]
Former-commit-id: 28364c8618
Former-commit-id: d968a60023 [formerly 378193b61f]
Former-commit-id: 64dad45a1c
 2014-04-09 13:43:09 -05:00
Ben Steffensmeier
28f06f5bfc Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps. 
Former-commit-id: 9c5eb936d3 [formerly 5328415054] [formerly 9c5eb936d3 [formerly 5328415054] [formerly daff2b9d9d [formerly 67302674101992ae5416f342f92acab9233a113d]]]
Former-commit-id: daff2b9d9d
Former-commit-id: 88f5dbe81d [formerly f5271a94d6]
Former-commit-id: cf81a60e7c
 2014-04-09 13:19:21 -05:00
Nate Jensen
edc55ee2ca Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development 
Former-commit-id: 187a895056 [formerly b58bb8500c] [formerly 187a895056 [formerly b58bb8500c] [formerly 2c2e324401 [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]
Former-commit-id: 2c2e324401
Former-commit-id: f574c535f5 [formerly 8999051f04]
Former-commit-id: 4af6b91229
 2014-04-09 11:22:07 -05:00