Steve Harris
|
5d7a28156d
|
Merge branch 'master' into ss_sync
Former-commit-id: a18fd2f871 [formerly 5a5db8dc6a] [formerly d507f3b71d] [formerly 645359deaf [formerly d507f3b71d [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]]
Former-commit-id: 645359deaf
Former-commit-id: faa52b5e6af76bc7945f0e7bfd703b9788e135ca [formerly c778c97bd6]
Former-commit-id: 0c29bee8e1
|
2012-06-13 14:56:52 -05:00 |
|
Matt Nash
|
cd82be177f
|
Issue #711 add roles and site capability
Former-commit-id: e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly 032827aa1b [formerly a9d225066a [formerly a49eee36dac39f172d7c4fa723a297d7cf94d5db]]]
Former-commit-id: 032827aa1b
Former-commit-id: 088352035d7c18e15170c346ce036e12429d923d [formerly 13a1fa879e]
Former-commit-id: 4cd558c1ca
|
2012-06-13 12:58:11 -05:00 |
|
Matt Nash
|
455ac1faf9
|
Issue #659 fix floating view issue when minimize happened
Former-commit-id: 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly b65a0f124e [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]
Former-commit-id: b65a0f124e
Former-commit-id: d25734d06b93a1a330c627b9c997a28dbfb4665a [formerly 3bd1a43af2]
Former-commit-id: 9e81392638
|
2012-06-13 10:04:12 -05:00 |
|
Nate Jensen
|
f6e823019d
|
Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575
Former-commit-id: 653dca2e66 [formerly eedc68c32c] [formerly e6cb5f906cd6dd5a39d198e94ab967dec1a2a172 [formerly 619d3062c2]] [formerly 47e8561dd0 [formerly 619d3062c2 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]]]
Former-commit-id: 47e8561dd0
Former-commit-id: 2308c40a943076535f277701e53e28c076040f00 [formerly 2cf220ff0c]
Former-commit-id: 3b8b89fc84
|
2012-06-13 09:39:19 -05:00 |
|
Steve Harris
|
1dfba0c41c
|
Removed duplicate method created by merge
Former-commit-id: 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 308737bff8 [formerly 5f66b0995a [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]
Former-commit-id: 308737bff8
Former-commit-id: 193d13e25a301eced23e253c03817720893c41dc [formerly 55b4d7c5da]
Former-commit-id: 383f9d2d56
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
6c0d8be39e
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]
Former-commit-id: d7a4853091
|
2012-06-12 14:37:12 -05:00 |
|
Nate Jensen
|
0ea1d3d522
|
Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba
Former-commit-id: c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly cd14177a84 [formerly 07d44ae528 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]]]
Former-commit-id: cd14177a84
Former-commit-id: 55fa3a0d6686e52246676ff642dd31616024215b [formerly 090bb2918b]
Former-commit-id: 37342dd500
|
2012-06-11 17:34:21 -05:00 |
|
Nate Jensen
|
df09de658a
|
Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602
Former-commit-id: 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 0c869f599e [formerly d2bb1b6e0c [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]]]
Former-commit-id: 0c869f599e
Former-commit-id: 4c1efdb14c6c9055c3df149ffd219afabd6b73a7 [formerly ea33fc82fe]
Former-commit-id: 38a3e93585
|
2012-06-11 17:33:48 -05:00 |
|
Matt Nash
|
f632b29005
|
issue #693 always allow to invite users after opening create session dialog
Former-commit-id: be806cfe61 [formerly 179f2d7ffe] [formerly 9f2d97fa68] [formerly b78d86bf04 [formerly 9f2d97fa68 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]]
Former-commit-id: b78d86bf04
Former-commit-id: 573ee429242ddd058ed5a3d6a8f2cfdb13e96669 [formerly 03ee9d8a90]
Former-commit-id: 4b5af450d1
|
2012-06-11 15:34:49 -05:00 |
|
Steve Harris
|
5e0e2d2c48
|
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: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]
Former-commit-id: 23c34c469a
|
2012-06-11 15:24:03 -05:00 |
|
Matt Nash
|
c2612e2dde
|
Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: f3203fa469 [formerly c3b17038f9] [formerly 07a2ceefbfacb0b101ebf629c19283e548db474c [formerly 73da2b1fe8]] [formerly 022e982aae [formerly 73da2b1fe8 [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]]]
Former-commit-id: 022e982aae
Former-commit-id: 861d32c390a280d83c199cb720b2c6374e7bc9b5 [formerly d5e3c97d98]
Former-commit-id: 945b47e29e
|
2012-06-11 10:24:35 -05:00 |
|
Matt Nash
|
aa8e09eece
|
Issue #703 can change font size in sessions
Former-commit-id: 5ebc7109a7 [formerly 73ad806eb2] [formerly 9d187cc362] [formerly 4b72bb3d8e [formerly 9d187cc362 [formerly 0e7af586cd96a21540263474f321bd224c45ad54]]]
Former-commit-id: 4b72bb3d8e
Former-commit-id: c2017b77c052809d1df4e0528806f872af4bbb29 [formerly 4453a06f31]
Former-commit-id: 11f07ec579
|
2012-06-11 10:23:45 -05:00 |
|
Matt Nash
|
a45f167db2
|
Issue #659 make fixes to float/dock
Former-commit-id: 8acb6d3be2 [formerly 5accda84c9] [formerly cc5c172a77] [formerly 1f54c2d09d [formerly cc5c172a77 [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: 89258ee3faab44a96efb6b9c4e30d16189f39336 [formerly ae53309d60]
Former-commit-id: b55c763a34
|
2012-06-11 10:21:40 -05:00 |
|
Nate Jensen
|
12349cb28c
|
Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8
Former-commit-id: 0898ad6970 [formerly 1b03a14b23] [formerly db3027c0d6] [formerly 14c2b1271e [formerly db3027c0d6 [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]]]
Former-commit-id: 14c2b1271e
Former-commit-id: 5ee879b8b797327bc67609b7ff31f3add788ec9a [formerly 680325f03c]
Former-commit-id: 00d6ab7011
|
2012-06-08 16:10:57 -05:00 |
|
Nate Jensen
|
532dea1d07
|
Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74
Former-commit-id: f23374c349 [formerly 8d741bc4a1] [formerly 05389dac56] [formerly 28f779e7b9 [formerly 05389dac56 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]]]
Former-commit-id: 28f779e7b9
Former-commit-id: 6cae7cb8d33deb749c2a7e78231ac292ef8fc2fa [formerly 0271c9762d]
Former-commit-id: d1f42605dd
|
2012-06-08 15:15:03 -05:00 |
|
Steve Harris
|
1f521a70b3
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
1986b9d6a4
|
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: 8e6f278c38 [formerly b6a93f9d41] [formerly 49fa818762] [formerly ef669a0297 [formerly 49fa818762 [formerly 20e6ddde20749721784a80a4bb78736de1140a40]]]
Former-commit-id: ef669a0297
Former-commit-id: 8f1b1c169c1de0ff617c7d8862e91d6e58d12b04 [formerly 8a19179310]
Former-commit-id: e01ed896d7
|
2012-06-07 18:22:01 -05:00 |
|
Max Schenkelberg
|
9a15a558d4
|
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: 74b2579091 [formerly 9d96a272ec] [formerly e10ece6081] [formerly 048484f689 [formerly e10ece6081 [formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]]]
Former-commit-id: 048484f689
Former-commit-id: 59103a0ff7438a9a26c1fc5ba0937180579bbe64 [formerly 7df41dbc88]
Former-commit-id: 6e55d73543
|
2012-06-07 10:25:03 -05:00 |
|
Max Schenkelberg
|
e215aa65cb
|
Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10
Former-commit-id: f7dfbc11f1 [formerly 0adccb8b12] [formerly 7d5d086fe1] [formerly 6a0ed72e5e [formerly 7d5d086fe1 [formerly 695134c3139868d6e9ace9dca7757368e0bfa5ec]]]
Former-commit-id: 6a0ed72e5e
Former-commit-id: 6f71405b33f53ae3c5d3ed12feb49683cc8698c2 [formerly 70461db99f]
Former-commit-id: 57af7d8bdc
|
2012-06-07 09:44:40 -05:00 |
|
Max Schenkelberg
|
32fe5ad6ff
|
Issue #697 Added support for procedure loading which magically made swapping appear to work too
Change-Id: I86c69781514709df4c6a23bdabfb63a2c103a9ed
Former-commit-id: 1c36bb0a04 [formerly 492adb92ae] [formerly e0b7693686] [formerly 0776af95e7 [formerly e0b7693686 [formerly e1bf6a3b576da036478cd1415856a64ebc606640]]]
Former-commit-id: 0776af95e7
Former-commit-id: efc77b17d107a2e211c557e51b3d4c280bb5087f [formerly d5fd024fd6]
Former-commit-id: e682032d0c
|
2012-06-06 15:57:16 -05:00 |
|
Matt Nash
|
c4db1d3d30
|
Issue #659 fix GFE issue with mouse handlers
Former-commit-id: 45cb41faed [formerly 0e3b539ada] [formerly c4d26f8b1b] [formerly ed0b70501f [formerly c4d26f8b1b [formerly 43f277de57d148c2d742266d8346b9b93cbcb82f]]]
Former-commit-id: ed0b70501f
Former-commit-id: be9d7bfb290d8dd29973c5e43b3df9db459cc72a [formerly e99cd89281]
Former-commit-id: fef4b5d8af
|
2012-06-06 14:13:55 -05:00 |
|
Max Schenkelberg
|
a5ad37d88e
|
Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35
Former-commit-id: d1f1f5106c [formerly 2750c4ba08] [formerly b8bedd1247] [formerly fbd269f4c7 [formerly b8bedd1247 [formerly 6588f58c80782f793c3621a2fd7ec81be2d1ead2]]]
Former-commit-id: fbd269f4c7
Former-commit-id: 48f93d8d755b8432050fe2aca67e0fe5ae3bf206 [formerly 13bd18829f]
Former-commit-id: 66f39cc77b
|
2012-06-06 12:05:47 -05:00 |
|
Bryan Kowal
|
1397ac4ae6
|
Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.
Former-commit-id: 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly c0db02e377 [formerly b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]
Former-commit-id: c0db02e377
Former-commit-id: b02340a5b6e6f0e27447ad5a1f532ed0a3b37d18 [formerly d92eb0c227]
Former-commit-id: 733b34202f
|
2012-06-05 16:55:52 -05:00 |
|
Max Schenkelberg
|
4fe4709862
|
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard
Former-commit-id: 603726498f [formerly f0e2ef8c91] [formerly b5da470e0a] [formerly 8b87b6a0a1 [formerly b5da470e0a [formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]]
Former-commit-id: 8b87b6a0a1
Former-commit-id: 1b3f753ea0cf2015ee33e8f1e26d5a3ddf66eec2 [formerly a6ca2ee4f6]
Former-commit-id: af72c6411a
|
2012-06-05 16:43:27 -05:00 |
|
Brad Gonzales
|
3e52d57e9b
|
Issue #639 fixed archive log view secondary id.
Former-commit-id: 49d56f5c0e [formerly 9c099c7931] [formerly 40a0e03b2d] [formerly 67e225e341 [formerly 40a0e03b2d [formerly 69c774abf417049ffc343ff8ba5d2e44d05bb2e7]]]
Former-commit-id: 67e225e341
Former-commit-id: 5594404e690dce440a5b135f298b8663ebe62f57 [formerly 6be2a8435a]
Former-commit-id: b8d677faf0
|
2012-06-05 15:14:42 -05:00 |
|
Max Schenkelberg
|
74dd7173a0
|
Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937
Former-commit-id: dc92eaa3f0 [formerly dbb8a6b93d] [formerly 3cd4f75170] [formerly 85a7897b1e [formerly 3cd4f75170 [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]]]
Former-commit-id: 85a7897b1e
Former-commit-id: 14b5ed35874d5152f32ea760356e95afc51ea0f1 [formerly f5c8240c92]
Former-commit-id: a8e2e4c8c1
|
2012-06-05 13:44:48 -05:00 |
|
Matt Nash
|
75ed94c837
|
Issue #659 toolbar is in session view now
Former-commit-id: ca96492c0e [formerly 373db85359] [formerly 00f55c1d80] [formerly e43fee4483 [formerly 00f55c1d80 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]]
Former-commit-id: e43fee4483
Former-commit-id: da5e2155fd0c122d5fa28bd9148319c145e52549 [formerly 304970e9a9]
Former-commit-id: f2d8da6b3d
|
2012-06-05 13:25:36 -05:00 |
|
Nate Jensen
|
6990dca585
|
Issue #427 cleanup
Change-Id: Ieeb03e0f7457ee7dceb6241b61340e364b5aab48
Former-commit-id: db2ec4654a [formerly 9d713d849c] [formerly 7f6bc2df93] [formerly 240dac19ba [formerly 7f6bc2df93 [formerly 49d468829654697d266a551452edf6a2de66edce]]]
Former-commit-id: 240dac19ba
Former-commit-id: daca464091d7f32b740299264679b52db6886081 [formerly 6557fe0688]
Former-commit-id: dcfbaad52e
|
2012-06-05 10:50:08 -05:00 |
|
Matt Nash
|
a20d265fdb
|
Issue #642 fixing merge mistake
Former-commit-id: 0e17f1ac3e [formerly e27578206e] [formerly a7dd5817f83fcd1e172c69d77f808643ed989aa6 [formerly 77d150bf6c]] [formerly 4cc721ebf5 [formerly 77d150bf6c [formerly 2e699d0cd90d2f61ff211b601300ab17cf9c5a40]]]
Former-commit-id: 4cc721ebf5
Former-commit-id: 6e0940e296eb339f268b6cfe24ad0db3aacc0f55 [formerly 7915f5edf2]
Former-commit-id: 414845eda9
|
2012-06-04 09:25:13 -05:00 |
|
Matt Nash
|
eaa81cca2a
|
Issue #642 removing update code
Former-commit-id: 8dc41a6113 [formerly 8f16eecde5] [formerly acc5d69e59] [formerly 2935d69e4f [formerly acc5d69e59 [formerly 510ca9d1234dba1b4e76f05536fb24c7fd693a76]]]
Former-commit-id: 2935d69e4f
Former-commit-id: d623d1048c42e0acf912eb320e867173ced61e5b [formerly 2a476c6ce8]
Former-commit-id: c3732cc601
|
2012-06-04 09:13:23 -05:00 |
|
Matt Nash
|
b7c717e60b
|
Issue #642 alert words now filter what directory is shown
Former-commit-id: 7bd08cc999 [formerly e8355a9a2b] [formerly 82cad97932] [formerly c5509344e9 [formerly 82cad97932 [formerly df7971ed32994f6ac52ac10fcb03945d57eb5872]]]
Former-commit-id: c5509344e9
Former-commit-id: 3b35f9e8cdbc0d41118da9922d21f05d946a56ec [formerly b3a948cca6]
Former-commit-id: 925c06ed36
|
2012-06-04 07:33:30 -05:00 |
|
Brad Gonzales
|
adb5d60788
|
Issue #639 fixed the previouse and next selection listeners, and renamed an inner class in the SearchComposite.
Former-commit-id: 623186f036 [formerly 08ad661af4] [formerly 4135176198] [formerly b0794e5e55 [formerly 4135176198 [formerly 31b09e378571ce6f8b4a6bd99cfb49b3d8b51045]]]
Former-commit-id: b0794e5e55
Former-commit-id: e111f61c472e5446d0b577b82b6c74cd62b64d5e [formerly 52ae0ebb1a]
Former-commit-id: 97602f8882
|
2012-06-03 10:53:31 -05:00 |
|
Brad Gonzales
|
31bbb10f1f
|
Issue #639 adding new files missed in last commit
Former-commit-id: d668776eac [formerly 00d014b2f2] [formerly 3795f90712] [formerly 4e7ce90c42 [formerly 3795f90712 [formerly 26ada47164c9b004cff5e869735ee11655af6a40]]]
Former-commit-id: 4e7ce90c42
Former-commit-id: c550c28b269dfe2d3ee94db9f77d29835fff2e35 [formerly 48f639d9ac]
Former-commit-id: c4f46ca508
|
2012-06-01 18:20:24 -05:00 |
|
Brad Gonzales
|
bd3166956e
|
Issue #639 added view for collaboration chat logs. added search control for logs, sessions, and chats
Former-commit-id: 4b92af0873 [formerly d8c4230045] [formerly 78e44746d6] [formerly 60276e49e8 [formerly 78e44746d6 [formerly e72e6741925cff7821816daf208cf2a1da5229ce]]]
Former-commit-id: 60276e49e8
Former-commit-id: cc745f96beaef57be56ad7d90c157f71cc100639 [formerly 66040f56b4]
Former-commit-id: 476aa27464
|
2012-06-01 18:18:11 -05:00 |
|
Max Schenkelberg
|
9aeaa9e747
|
Issue #664 fixed name vs id text for dam resource
Change-Id: I1fd50dde00cdf7fa35ba9eda93721d132a6dfbd5
Former-commit-id: d4a11987b2 [formerly 6bd5b967bf] [formerly 5057c05529] [formerly 4dec649a97 [formerly 5057c05529 [formerly a0481db7ccee2f656362ba63424af3c4aa49277b]]]
Former-commit-id: 4dec649a97
Former-commit-id: a7503690f1b4eb563beaab057b085fd5aebd0f2a [formerly 8480dbbd75]
Former-commit-id: af62a3ef80
|
2012-06-01 14:36:44 -05:00 |
|
Max Schenkelberg
|
1d189e46be
|
Issue #664 Made hydro dam resource work with collaboration
Change-Id: If6d422a937a549c9f68b8c523553179924ac2d7a
Former-commit-id: 2b2d629341 [formerly b5d8d071de] [formerly b0f729ceb2] [formerly 7b95887a24 [formerly b0f729ceb2 [formerly a3bfc9f4014a417205c27bbd73fc07556df007bc]]]
Former-commit-id: 7b95887a24
Former-commit-id: 0d1c1dded3d77399e1810864ba8858e4d528e324 [formerly 9c3805b762]
Former-commit-id: cc74f57e1b
|
2012-06-01 14:21:55 -05:00 |
|
Max Schenkelberg
|
64e44d4a74
|
Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822
Former-commit-id: 7ae9376eb0 [formerly 1d9ccb6bd3] [formerly fde1e68df6] [formerly 052cc81223 [formerly fde1e68df6 [formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]]
Former-commit-id: 052cc81223
Former-commit-id: 9c9fd2fe958ad90f7350440a18275599b07f8a98 [formerly d4dcc0e12e]
Former-commit-id: 86f03dfdc3
|
2012-05-31 16:05:25 -05:00 |
|
Matt Nash
|
0a225b2540
|
Issue #659 float button for cool detachable functionality
Former-commit-id: bfcfcba572 [formerly 2b1ce9e674] [formerly 855193aa77] [formerly cab515cbfd [formerly 855193aa77 [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]]
Former-commit-id: cab515cbfd
Former-commit-id: 8443892ca2884191c2aab260370223421cc04482 [formerly 633fd997e5]
Former-commit-id: 945095e345
|
2012-05-30 16:13:21 -05:00 |
|
Matt Nash
|
0935b78c81
|
Issue #440 fixes in group view
Former-commit-id: 934b5548e8 [formerly 414c552462] [formerly ad3f6cd8ad] [formerly 7065ea8107 [formerly ad3f6cd8ad [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]]]
Former-commit-id: 7065ea8107
Former-commit-id: a53bf12b6e9857192417b7b103e70c8c8a489e51 [formerly 2f7a2747aa]
Former-commit-id: dbcb9b7b87
|
2012-05-30 16:13:21 -05:00 |
|
Nate Jensen
|
f158a33f6e
|
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: 97f3b93b17 [formerly 06970f4d82] [formerly 8eb5665591] [formerly ac95fde3e5 [formerly 8eb5665591 [formerly 34be3aaf6ea41ae8366d072723c3beb8151d1f84]]]
Former-commit-id: ac95fde3e5
Former-commit-id: fa4b356a7701d47af73e47d0df7aae4c3477a883 [formerly d4ba003ce0]
Former-commit-id: 71d38a3598
|
2012-05-29 17:23:56 -05:00 |
|
Max Schenkelberg
|
5e035d82b0
|
Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73
Former-commit-id: 5ecc2f0362 [formerly 71fe0a468a] [formerly 1934bfa28c] [formerly 76e99b4037 [formerly 1934bfa28c [formerly 2be9620b338140fa27efba037d0cc321558bec62]]]
Former-commit-id: 76e99b4037
Former-commit-id: 60d885f3aac6c4e8e800d995c806f7287cce1bd5 [formerly 8f377d3fb8]
Former-commit-id: 4c65ff8c20
|
2012-05-29 15:15:05 -05:00 |
|
Max Schenkelberg
|
0deb0c8ad7
|
Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9
Former-commit-id: 729765ef7c [formerly fe9de50746] [formerly 34a71dbee8] [formerly c28a586d84 [formerly 34a71dbee8 [formerly 18ca6f058d810781d93ea2d0bad9b2daa161fa3a]]]
Former-commit-id: c28a586d84
Former-commit-id: c5e0680df1ac06ccbd3c1d516375f8cc28eaa8e3 [formerly 2cde39bc63]
Former-commit-id: ddfb7e038a
|
2012-05-29 15:00:42 -05:00 |
|
Bryan Kowal
|
128cdfd0e7
|
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: c4855990d1 [formerly af04bfc6d8] [formerly 14386ad818] [formerly 25b2361923 [formerly 14386ad818 [formerly 904a05e94386bd9d71a357e374ed3c757dc08016]]]
Former-commit-id: 25b2361923
Former-commit-id: 551d648482741f13c7f568f5f2f17971e861b7c2 [formerly 0692230344]
Former-commit-id: 961d5976d1
|
2012-05-29 13:06:36 -05:00 |
|
Max Schenkelberg
|
1ead64f31d
|
Issue #663 Removed references from ISerializableObject file
Former-commit-id: 937d320dee [formerly d071f7ea11] [formerly 76db032da7] [formerly fec288d4bd [formerly 76db032da7 [formerly 95da08aeabcc06f5ab46963cf4be4fb54457ff43]]]
Former-commit-id: fec288d4bd
Former-commit-id: ab7adbd50e845f6abb7bab9d48313acb940d1a4e [formerly 5e8f886155]
Former-commit-id: 643c262998
|
2012-05-29 09:10:48 -05:00 |
|
Max Schenkelberg
|
ff48e60e71
|
Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5
Former-commit-id: 36e108140d [formerly 04c9f3a1c8] [formerly 8c9c33ef9f] [formerly 2058b7f0ea [formerly 8c9c33ef9f [formerly 5c240b5224ee93a36c5e05ddb15b373645222081]]]
Former-commit-id: 2058b7f0ea
Former-commit-id: f9f5faca5e4cc74eac5d37b68930a1ee8dc9cbd2 [formerly 11cb7bafb0]
Former-commit-id: ea408d8f42
|
2012-05-25 16:28:53 -05:00 |
|
Max Schenkelberg
|
e9635706b2
|
Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b
Former-commit-id: 3b97bf162d [formerly f7183f8212] [formerly 7bae56e8b5] [formerly 854f41eb7f [formerly 7bae56e8b5 [formerly 209d658e61d7b595d4effbfb87f65b87a5f196a9]]]
Former-commit-id: 854f41eb7f
Former-commit-id: 68a5acf2c3b4dc3c78c038bc3a9aa7431b0ede69 [formerly d380895c56]
Former-commit-id: e4350ca0ae
|
2012-05-25 15:24:18 -05:00 |
|
Max Schenkelberg
|
77d88a48fd
|
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: d0b1715059 [formerly 2838c08685] [formerly 8773dbdf62] [formerly f6f2e1a4fb [formerly 8773dbdf62 [formerly d15821c57b49090863e9c22455d06c94da6fcaf9]]]
Former-commit-id: f6f2e1a4fb
Former-commit-id: 388e4b65631b714ebb63610982ae70dc006d8f39 [formerly dec7ce3551]
Former-commit-id: c2c035a2e0
|
2012-05-25 14:37:25 -05:00 |
|
Bryan Kowal
|
304ce341b8
|
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: 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 1d8ed9e871f8274a9db57fa6db67ccd77f68abfa [formerly 0211167d87]
Former-commit-id: b817484c67
|
2012-05-24 16:51:35 -05:00 |
|
David Gillingham
|
c4330c67df
|
Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.
Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e
Former-commit-id: 46fbfbfeb5 [formerly ff34c58b1b] [formerly 09dcd35e4a] [formerly db75f1860b [formerly 09dcd35e4a [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]]
Former-commit-id: db75f1860b
Former-commit-id: f7afd5d624653b95848fcb61d09be11d28dfd125 [formerly 6efe780ad6]
Former-commit-id: f1343b9a6e
|
2012-05-24 14:54:17 -05:00 |
|
David Gillingham
|
0f2ea852c0
|
Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.
Former-commit-id: 343f42b325 [formerly 855745db06] [formerly 95e1582a22] [formerly 34303477ac [formerly 95e1582a22 [formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]]
Former-commit-id: 34303477ac
Former-commit-id: b60770ef8afdb543546f259cf39a697319e6bd73 [formerly 9dabcca4f8]
Former-commit-id: 031558955d
|
2012-05-23 15:49:49 -05:00 |
|