Steve Harris
|
cee20d8656
|
12.5.1-15 baseline
Former-commit-id: 1c128372ef9f478f1b807e8d0f23207d095bfc65
|
2012-06-11 16:02:30 -05:00 |
|
Matt Nash
|
b78d86bf04
|
issue #693 always allow to invite users after opening create session dialog
Former-commit-id: 204c35530bbe8c7e39749d70331ceb93c4d4a790
|
2012-06-11 15:34:49 -05:00 |
|
Steve Harris
|
d325d496f5
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: a435e6464a78345b5036e3060430375dc53e4faf
|
2012-06-11 15:24:03 -05:00 |
|
Matt Nash
|
022e982aae
|
Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321
|
2012-06-11 10:24:35 -05:00 |
|
Matt Nash
|
4b72bb3d8e
|
Issue #703 can change font size in sessions
Former-commit-id: 0e7af586cd96a21540263474f321bd224c45ad54
|
2012-06-11 10:23:45 -05:00 |
|
Matt Nash
|
1f54c2d09d
|
Issue #659 make fixes to float/dock
Former-commit-id: 6ce7d566d2da59436b6d141ad96503873b11f1aa
|
2012-06-11 10:21:40 -05:00 |
|
Nate Jensen
|
14c2b1271e
|
Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8
Former-commit-id: 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a
|
2012-06-08 16:10:57 -05:00 |
|
Nate Jensen
|
28f779e7b9
|
Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74
Former-commit-id: 2306edfd4e11b512a68320ae7dc4edbcfa474934
|
2012-06-08 15:15:03 -05:00 |
|
Steve Harris
|
3904c4ccf5
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
ef669a0297
|
Issue #697 Made multiple editors display on single participant editor properly. Made participant editors more restrictive so they can not be attempted to be used by the perspective since they are perspective agnostic
Change-Id: I6605e82c428bda79162adaccea2808f197eba440
Former-commit-id: 20e6ddde20749721784a80a4bb78736de1140a40
|
2012-06-07 18:22:01 -05:00 |
|
Max Schenkelberg
|
048484f689
|
Issue #697 Fixed recycling of grid vector resource, and made cursor change when drawing and only send clear_all if session leader
Change-Id: I78fbb17c7513e881ddf47d0bcd0ce8333e5740ff
Former-commit-id: 08d8389ea3b23e7fe209d12ff45275f86d3c5883
|
2012-06-07 10:25:03 -05:00 |
|
Max Schenkelberg
|
6a0ed72e5e
|
Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10
Former-commit-id: 695134c3139868d6e9ace9dca7757368e0bfa5ec
|
2012-06-07 09:44:40 -05:00 |
|
Max Schenkelberg
|
0776af95e7
|
Issue #697 Added support for procedure loading which magically made swapping appear to work too
Change-Id: I86c69781514709df4c6a23bdabfb63a2c103a9ed
Former-commit-id: e1bf6a3b576da036478cd1415856a64ebc606640
|
2012-06-06 15:57:16 -05:00 |
|
Matt Nash
|
ed0b70501f
|
Issue #659 fix GFE issue with mouse handlers
Former-commit-id: 43f277de57d148c2d742266d8346b9b93cbcb82f
|
2012-06-06 14:13:55 -05:00 |
|
Max Schenkelberg
|
fbd269f4c7
|
Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35
Former-commit-id: 6588f58c80782f793c3621a2fd7ec81be2d1ead2
|
2012-06-06 12:05:47 -05:00 |
|
Max Schenkelberg
|
8b87b6a0a1
|
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard
Former-commit-id: 5c3d4a7fffe3873afbe8db60310afae2b3f0738b
|
2012-06-05 16:43:27 -05:00 |
|
Brad Gonzales
|
67e225e341
|
Issue #639 fixed archive log view secondary id.
Former-commit-id: 69c774abf417049ffc343ff8ba5d2e44d05bb2e7
|
2012-06-05 15:14:42 -05:00 |
|
Max Schenkelberg
|
85a7897b1e
|
Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937
Former-commit-id: 9a726e2686e7ed79c1a436156a16e98083608e14
|
2012-06-05 13:44:48 -05:00 |
|
Matt Nash
|
e43fee4483
|
Issue #659 toolbar is in session view now
Former-commit-id: a516cc2073fa33c88f13678a55dda4bdbe3ed120
|
2012-06-05 13:25:36 -05:00 |
|
Nate Jensen
|
240dac19ba
|
Issue #427 cleanup
Change-Id: Ieeb03e0f7457ee7dceb6241b61340e364b5aab48
Former-commit-id: 49d468829654697d266a551452edf6a2de66edce
|
2012-06-05 10:50:08 -05:00 |
|
Matt Nash
|
4cc721ebf5
|
Issue #642 fixing merge mistake
Former-commit-id: 2e699d0cd90d2f61ff211b601300ab17cf9c5a40
|
2012-06-04 09:25:13 -05:00 |
|
Matt Nash
|
2935d69e4f
|
Issue #642 removing update code
Former-commit-id: 510ca9d1234dba1b4e76f05536fb24c7fd693a76
|
2012-06-04 09:13:23 -05:00 |
|
Matt Nash
|
c5509344e9
|
Issue #642 alert words now filter what directory is shown
Former-commit-id: df7971ed32994f6ac52ac10fcb03945d57eb5872
|
2012-06-04 07:33:30 -05:00 |
|
Brad Gonzales
|
b0794e5e55
|
Issue #639 fixed the previouse and next selection listeners, and renamed an inner class in the SearchComposite.
Former-commit-id: 31b09e378571ce6f8b4a6bd99cfb49b3d8b51045
|
2012-06-03 10:53:31 -05:00 |
|
Brad Gonzales
|
4e7ce90c42
|
Issue #639 adding new files missed in last commit
Former-commit-id: 26ada47164c9b004cff5e869735ee11655af6a40
|
2012-06-01 18:20:24 -05:00 |
|
Brad Gonzales
|
60276e49e8
|
Issue #639 added view for collaboration chat logs. added search control for logs, sessions, and chats
Former-commit-id: e72e6741925cff7821816daf208cf2a1da5229ce
|
2012-06-01 18:18:11 -05:00 |
|
Max Schenkelberg
|
4dec649a97
|
Issue #664 fixed name vs id text for dam resource
Change-Id: I1fd50dde00cdf7fa35ba9eda93721d132a6dfbd5
Former-commit-id: a0481db7ccee2f656362ba63424af3c4aa49277b
|
2012-06-01 14:36:44 -05:00 |
|
Max Schenkelberg
|
7b95887a24
|
Issue #664 Made hydro dam resource work with collaboration
Change-Id: If6d422a937a549c9f68b8c523553179924ac2d7a
Former-commit-id: a3bfc9f4014a417205c27bbd73fc07556df007bc
|
2012-06-01 14:21:55 -05:00 |
|
Max Schenkelberg
|
052cc81223
|
Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822
Former-commit-id: a375cddf31565d6584256d2ccbe4dbea5a5ec187
|
2012-05-31 16:05:25 -05:00 |
|
Matt Nash
|
cab515cbfd
|
Issue #659 float button for cool detachable functionality
Former-commit-id: 9b1c62c4851f95ad270b58ceacf756a616f7c136
|
2012-05-30 16:13:21 -05:00 |
|
Matt Nash
|
7065ea8107
|
Issue #440 fixes in group view
Former-commit-id: c4123b42e9078f2c5975da38d2aa6737348afa8a
|
2012-05-30 16:13:21 -05:00 |
|
Nate Jensen
|
ac95fde3e5
|
Merge "Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session"." into 11-Collaboration
Former-commit-id: 34be3aaf6ea41ae8366d072723c3beb8151d1f84
|
2012-05-29 17:23:56 -05:00 |
|
Max Schenkelberg
|
76e99b4037
|
Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73
Former-commit-id: 2be9620b338140fa27efba037d0cc321558bec62
|
2012-05-29 15:15:05 -05:00 |
|
Max Schenkelberg
|
c28a586d84
|
Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9
Former-commit-id: 18ca6f058d810781d93ea2d0bad9b2daa161fa3a
|
2012-05-29 15:00:42 -05:00 |
|
Bryan Kowal
|
25b2361923
|
Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session".
Change-Id: Ie7e419bc47a2451eef5a25456fa767fc0156cc27
Former-commit-id: 904a05e94386bd9d71a357e374ed3c757dc08016
|
2012-05-29 13:06:36 -05:00 |
|
Max Schenkelberg
|
fec288d4bd
|
Issue #663 Removed references from ISerializableObject file
Former-commit-id: 95da08aeabcc06f5ab46963cf4be4fb54457ff43
|
2012-05-29 09:10:48 -05:00 |
|
Max Schenkelberg
|
2058b7f0ea
|
Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5
Former-commit-id: 5c240b5224ee93a36c5e05ddb15b373645222081
|
2012-05-25 16:28:53 -05:00 |
|
Max Schenkelberg
|
854f41eb7f
|
Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b
Former-commit-id: 209d658e61d7b595d4effbfb87f65b87a5f196a9
|
2012-05-25 15:24:18 -05:00 |
|
Max Schenkelberg
|
f6f2e1a4fb
|
Issue #663 Fixed clearing of display in D2D, resources can now be specified to be readded when unloaded during a session
Change-Id: I77b448ad4af60bf8d1afb3b50a5575ad82c4ae22
Former-commit-id: d15821c57b49090863e9c22455d06c94da6fcaf9
|
2012-05-25 14:37:25 -05:00 |
|
Bryan Kowal
|
0f0bab6e54
|
Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1
Former-commit-id: f4ac8e99d3f2f98af4ea5f383630395705e6da96
|
2012-05-24 16:51:35 -05:00 |
|
Max Schenkelberg
|
1c11323103
|
Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f
Former-commit-id: 6ddfe51e93d62145678d87ed3db208e90d3146e3
|
2012-05-23 09:14:21 -05:00 |
|
Max Schenkelberg
|
52a78af98c
|
Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5
Former-commit-id: 1f092691e6e43bd8f6d10c2b8fab0a68eca38992
|
2012-05-22 09:56:27 -05:00 |
|
Steve Harris
|
1f542697cb
|
12.5.1-9 baseline
Former-commit-id: 25a4d3ed99c4be73a118b92c230c6365b65b56eb
|
2012-05-21 17:48:55 -05:00 |
|
Max Schenkelberg
|
2bc9a18957
|
Issue #239 Cleaned up DispatchingWireframeShape code to send world coordinates separate from pixel coordinates
Change-Id: I1c7eb9b19ea8d816eb3e81901ecf5574877a5212
Former-commit-id: 0a3d69b5bb8ca31d8db8148225f7e1ef85778919
|
2012-05-21 14:57:37 -05:00 |
|
Matt Nash
|
eabc2032b4
|
Issue #642 match longest keyword
Former-commit-id: 1dc9f3ad1f5c68dbe6a515eb990f23a8f20139d6
|
2012-05-21 11:12:52 -05:00 |
|
Matt Nash
|
8b71b3058b
|
Issue #642 change font changer to FontDialog
Former-commit-id: 8f4c3b9d9769bf34e7c4744dd80b603d445b6270
|
2012-05-21 10:39:03 -05:00 |
|
Matt Nash
|
bed5ec6876
|
Issue #642 fix for finding double instances of words
Former-commit-id: 5d3001a8bdd5ab6b89efe54e7d3c6b3266e880ec
|
2012-05-21 08:43:37 -05:00 |
|
Max Schenkelberg
|
cb4b153cad
|
Issue #239 Added support for rectangle drawing
Change-Id: I38c086a9a80652ce9e5da3ed4db1776877cc4635
Former-commit-id: e4417a1f938ceddcc4d44d45af60b0f2d1b580fd
|
2012-05-18 14:17:43 -05:00 |
|
Max Schenkelberg
|
0c92536bb3
|
Issue #239 Added drawing of lines so baslines would work
Change-Id: Id8ca06b2fc38ab0db5b167d33aeae5af974c30cc
Former-commit-id: 063e7ac34a6b5a6c43cf7927a1a2980f79efb24c
|
2012-05-18 12:34:00 -05:00 |
|
Matt Nash
|
385d7e3d7f
|
Issue #642 remove debugging code
Former-commit-id: 23669c3d390b3cc0aeb6228247ea0b0512bdfb80
|
2012-05-18 11:02:27 -05:00 |
|