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

3157 commits

Author SHA1 Message Date
Nate Jensen
76f191192c Merge "Issue #2956 safety checks for GLShadedShapeBase" into development 
Former-commit-id: 0b85a99337 [formerly 2fba1f36ef] [formerly 80434db98d] [formerly 120d8429a7 [formerly 80434db98d [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]
Former-commit-id: 120d8429a7
Former-commit-id: ba3109c60afbaff247b963019ac0ea3cfd8248fb [formerly 62613ab33d]
Former-commit-id: 2e23ae75f4
 2014-04-16 08:41:43 -05:00
Nate Jensen
dc74920834 Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development 
Former-commit-id: 9dc2c1187c [formerly c723ec0bda] [formerly 771885f9a5] [formerly c16bbb52e4 [formerly 771885f9a5 [formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]
Former-commit-id: c16bbb52e4
Former-commit-id: 337b6a7e826170373ae4e133ca9ba41486c415c1 [formerly 550577806f]
Former-commit-id: 79c3f5f3a8
 2014-04-15 17:55:21 -05:00
Nate Jensen
e1b9c91df1 Issue #2956 safety checks for GLShadedShapeBase 
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451

Former-commit-id: 796efabc3b [formerly 66f4ce250a] [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 726c122dc7 [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: da7df5c1cb8add048021783ebafe66b2d4afe16b [formerly 56f645bbc7]
Former-commit-id: 2cf5941fe1
 2014-04-15 17:38:17 -05:00
Lee Venable
1c0b3bf7f7 Merge "Issue #3031 - Added dispose check in the runAsync calls." into development 
Former-commit-id: 30c5233ae4 [formerly 14f0dc298e] [formerly cde3cdeed1] [formerly 2a93e03117 [formerly cde3cdeed1 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]
Former-commit-id: 2a93e03117
Former-commit-id: 78f80c2eced18a183f677dcd92efee78aa09ec9c [formerly c9c845d5f2]
Former-commit-id: a34e169792
 2014-04-15 17:37:13 -05:00
Ron Anderson
c263058e63 Issue #3016 Fix ColormappedImage and ColorMapper. 
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

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

Former-commit-id: cdc1edef6b [formerly 39b9d94dc1] [formerly d4aafc69d9] [formerly 2122b79416 [formerly d4aafc69d9 [formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]
Former-commit-id: 2122b79416
Former-commit-id: 171f7d971779860672bb25dbda78f2ce0c6f989b [formerly c3f4bccbf9]
Former-commit-id: e30c910657
 2014-04-15 16:49:42 -05:00
Everett Kladstrup
133dff106f Issue #2725 Fix localization type for DerivParamLocalizationAdapter 
Former-commit-id: 9f3f3f2b69 [formerly 4f1c7281d3] [formerly 27885c8296] [formerly 54db6ad9af [formerly 27885c8296 [formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]
Former-commit-id: 54db6ad9af
Former-commit-id: 5eaecc4538d5563c1f6b15d1ab3f3819ede97fdb [formerly ca7b672b52]
Former-commit-id: c2dfdf8cae
 2014-04-15 15:18:09 -05:00
Brian Clements
602794b56d Issue #2822 only allow transfer leader if participant is using shared display 
Former-commit-id: dc1d2d39f8 [formerly db67c03382] [formerly 5e13503b9abb63ac2a2c246e1d0e4eba40c2ad52 [formerly 5250f7a442]] [formerly 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729]
Former-commit-id: 6f9ef9a515
 2014-04-15 15:15:11 -05:00
Brian Clements
5b5669e1e1 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: 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a]
Former-commit-id: ca5909e222
 2014-04-15 15:12:33 -05:00
Mike Duff
dceb75c423 Issue #2785 - Fix loading of groups in sub request dialog 
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

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

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: c0df96e085 [formerly e24940ead6] [formerly 56280c47faa8df4c130fc7ca68cdcf59c00e6094 [formerly 6e2d68e102]] [formerly 57f2357f10 [formerly 6e2d68e102 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]
Former-commit-id: 57f2357f10
Former-commit-id: dad31d1699bb36bcaccd3d7e306c1af3e1f8b973 [formerly d435258fce]
Former-commit-id: 97f09968b3
 2014-04-14 16:50:54 -05:00
Nate Jensen
b9be7343bf Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development 
Former-commit-id: 7c58c1262a [formerly d741f996c6] [formerly c71205eb89] [formerly 111b7f4283 [formerly c71205eb89 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]
Former-commit-id: 111b7f4283
Former-commit-id: c249e01da13dd43a2a49740d644cfa02fc5f32ca [formerly 9917a8ef62]
Former-commit-id: 9593960e9f
 2014-04-14 15:46:14 -05:00
Ron Anderson
9b2cd2d486 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: 6063cdd984 [formerly d5ebb5a800] [formerly 46d5349940] [formerly fd79bd354b [formerly 46d5349940 [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]
Former-commit-id: fd79bd354b
Former-commit-id: 5456b75aa7d4a323625c887f487c61c54177d524 [formerly 5ab1b1b95c]
Former-commit-id: d2346699bb
 2014-04-14 14:45:03 -05:00
Nate Jensen
134f34c4df Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe 
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]
Former-commit-id: dfe50ee038
 2014-04-14 14:28:11 -05:00
Lee Venable
70cc279e37 Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development 
Former-commit-id: 09afdba1fe [formerly 1a3738c8fd] [formerly f6601d6bcc] [formerly d4a6ce546d [formerly f6601d6bcc [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]
Former-commit-id: d4a6ce546d
Former-commit-id: 3f0a4ef9f6a2a757d0bd3de95cef502c549c0dff [formerly caf31402d7]
Former-commit-id: bf4f3c75ef
 2014-04-14 14:09:03 -05:00
Richard Peter
4aad8cf61c Merge "Issue #2862 Implements locks on case creation." into development 
Former-commit-id: 50624b548a [formerly 22a01edbb7] [formerly 19755418f8] [formerly 181ffee3db [formerly 19755418f8 [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: 94d21459e635974814c625195c69afdafdc4a867 [formerly 0abb97820b]
Former-commit-id: c4853e7982
 2014-04-14 13:28:26 -05:00
Richard Peter
b5fa843960 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]
Former-commit-id: ff87317bd4
 2014-04-14 13:10:11 -05:00
Nate Jensen
28455b8d42 Merge "Issue #2241 fix tear off menus in practice mode" into development 
Former-commit-id: 1882acee98 [formerly 2a0c73fb25] [formerly 47eb9ecb0a] [formerly 5fe4c08ab6 [formerly 47eb9ecb0a [formerly 4fedbaacf54b5194afb9548101badc4619347638]]]
Former-commit-id: 5fe4c08ab6
Former-commit-id: d47a5b14445159c53f75e0aafca11164146f6133 [formerly f77b99b51c]
Former-commit-id: 60ee75d3df
 2014-04-14 09:28:34 -05:00
Richard Peter
d5149f4409 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development 
Former-commit-id: 84bb4e5e32 [formerly 97fb03df02] [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 91e941f60a [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: 0189c0a9c6497ecc36bfd9e74f6935af94b96c99 [formerly ffd74e6787]
Former-commit-id: a4eba6e6df
 2014-04-11 19:33:31 -05:00
Ben Steffensmeier
a224105467 Issue #2947 Minor satellite and derived parameter improvements. 
Former-commit-id: 4004fe2d18 [formerly 2d66e58671] [formerly dd794a3c12] [formerly 428f3a2d8b [formerly dd794a3c12 [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: 8166890980b160e863adea23a121042b57a2fc64 [formerly 6c92b645f0]
Former-commit-id: b120feab6f
 2014-04-11 17:37:59 -05:00
Ben Steffensmeier
48a6b0fdf8 Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider. 
Former-commit-id: 3efa47aafd [formerly ca78a04d95] [formerly d5b91d8846] [formerly 1ad8396366 [formerly d5b91d8846 [formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]]
Former-commit-id: 1ad8396366
Former-commit-id: 210e31e5660405a56e7296c949aac3ee05d190f4 [formerly fb85857ff5]
Former-commit-id: b707e3b6db
 2014-04-11 17:34:38 -05:00
Richard Peter
56089894f2 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: 9b12d9ddaf [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]
Former-commit-id: d65b11d404
 2014-04-11 16:23:09 -05:00
Roger Ferrel
bd722b378a Issue #2862 Implements locks on case creation. 
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b

Former-commit-id: 67399901a0 [formerly 16fab01b8b] [formerly 5570261d74] [formerly cfea0489d7 [formerly 5570261d74 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]
Former-commit-id: cfea0489d7
Former-commit-id: 9eb23d5c82b57af43b0527c290b725d2880e27a1 [formerly d66a346c65]
Former-commit-id: c5de39c162
 2014-04-11 16:07:58 -05:00
brian.dyke
16a261d7f6 Merge branch 'master_14.2.2' into asm_14.2.2 
Former-commit-id: c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: f4680f6e78d8dd9f6a0ede6791f8e2273054f211 [formerly ad63114f16]
Former-commit-id: 88ddd667b6
 2014-04-11 10:58:48 -04:00
Richard Peter
ed571fbebd Merge "Issue #2864 - Change how saved subset files are stored." into development 
Former-commit-id: ce74b40f0b [formerly 69c6217ae9] [formerly 8a682a5e23] [formerly 695878c6aa [formerly 8a682a5e23 [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b517923cac7561c9a58df72238f27a0df00b52df [formerly 0fa4180959]
Former-commit-id: b4cc44faa0
 2014-04-11 09:41:31 -05:00
Mike Duff
6e9e743fdc Issue #2864 - Change how saved subset files are stored. 
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

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

Former-commit-id: 4dc5f614b3 [formerly f5e333c154] [formerly 35451bbd2178a902e5df41c477872fdb2f45f1a8 [formerly 81c4976c96]] [formerly 0eed368ac4 [formerly 81c4976c96 [formerly 391655cd6a84c6cbf31e711ec5e1aa92833db896]]]
Former-commit-id: 0eed368ac4
Former-commit-id: 86544febdae736a9401f59264c6f5bfd1f622710 [formerly 46df69447b]
Former-commit-id: d91e77641b
 2014-04-10 14:50:06 -05:00
Everett Kladstrup
2bdc415769 Issue #2725 Put derivparam plugins in viz and edex separately 
Former-commit-id: e543570a07 [formerly 90244ad7ec] [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly d76aaed2f0 [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: a7438ce6930c1b0cfa77ca4e1ab2e52ab9d87305 [formerly db413dc65f]
Former-commit-id: fa9ee97662
 2014-04-10 14:08:42 -05:00
Brad Gonzales
ccc4bc5a27 Issue #2937 Connect to the venue after the feed view is available. 
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

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

Former-commit-id: 578aa18528 [formerly 635684bb4e] [formerly 33a2259cf4] [formerly da65756e3b [formerly 33a2259cf4 [formerly 323badf58cf12a35b3a4d93ff0188b638e60969b]]]
Former-commit-id: da65756e3b
Former-commit-id: b538cf660c9cfb4fa877799b800a871c591269c0 [formerly 67ff4371b3]
Former-commit-id: a23608ec59
 2014-04-10 13:31:42 -05:00
Brian.Dyke
70e228a893 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: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]
Former-commit-id: afc1da9015
 2014-04-10 13:26:42 -04:00
David Gillingham
969dccd366 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

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

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

Former-commit-id: 981306d474 [formerly 5e39f5a61c] [formerly 23474c5ead] [formerly eafa177f4b [formerly 23474c5ead [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]
Former-commit-id: eafa177f4b
Former-commit-id: 6b9f38ad83f0cd349b068977532f23df7c700056 [formerly ee80debc36]
Former-commit-id: 1363155c34
 2014-04-09 10:17:22 -05:00
Richard Peter
8ee15aba37 Merge "Issue #2725 Move derived parameters logic to common" into development 
Former-commit-id: b86321616b [formerly 16e1018dd9] [formerly 9f0be4335806f82323adcb70ad62f21922700611 [formerly ea4d09c674]] [formerly ed25b71ff1 [formerly ea4d09c674 [formerly d97da3eb67c00a8d5bf1af0fae453fa9c96aacc4]]]
Former-commit-id: ed25b71ff1
Former-commit-id: 4968784e25043d1fa4fe8bf73e2308272466e2d1 [formerly ce7e0f9a31]
Former-commit-id: a32e066d95
 2014-04-09 09:33:56 -05:00