Matt Nash
|
48a45abcc2
|
Issue #429 drawing additions, code cleanup, toolbar fixes
Former-commit-id: ed088cca79 [formerly df7ddc0fa2] [formerly 8e83184569] [formerly ed088cca79 [formerly df7ddc0fa2] [formerly 8e83184569] [formerly b707408a0a [formerly 8e83184569 [formerly fa78aa2f7f4738770b37beb6b02fe5adbb074fae]]]]
Former-commit-id: b707408a0a
Former-commit-id: 31e9ad5572 [formerly 8a04973191] [formerly ef6d30a7738eb6cb76773ec46f212263d3d1b13c [formerly c6d7a5a69b]]
Former-commit-id: 5347202882b71e8496b5b4ac8449ade22bbb0acf [formerly 660b21f6e5]
Former-commit-id: 3680d09e6f
|
2012-04-11 16:45:28 -05:00 |
|
James Korman
|
0656186428
|
Issue #437 - Add debug output to support roster development
Former-commit-id: 3e7b1a14f3 [formerly 4a22bdb915] [formerly 826105c621] [formerly 3e7b1a14f3 [formerly 4a22bdb915] [formerly 826105c621] [formerly 14b193ad6f [formerly 826105c621 [formerly b502e55a4b95dc0483e5502154ba61f04e9132cc]]]]
Former-commit-id: 14b193ad6f
Former-commit-id: 75bbebd2fa [formerly ba45c3b8c8] [formerly 99e34ab0e7b92840a551a88b16fd8555d21a6228 [formerly 9f05fd9905]]
Former-commit-id: 246194f74ac5bf27d91c33020673c59e9d31366e [formerly 4c8263a3f0]
Former-commit-id: e5f68f34f1
|
2012-04-11 16:23:04 -05:00 |
|
James Korman
|
ede57d068b
|
Issue #437 - Added event notification for roster/roster status updates
Former-commit-id: 60f690d126 [formerly b23bd53519] [formerly d664e77844] [formerly 60f690d126 [formerly b23bd53519] [formerly d664e77844] [formerly f25744ed0f [formerly d664e77844 [formerly 90f4901c8b7f86a8a0da3be7801d3a5b48b284a8]]]]
Former-commit-id: f25744ed0f
Former-commit-id: d66cea837c [formerly 555679afc0] [formerly dc44fb0a4c858381846c3d838d1753d761d66f98 [formerly 14c1af5d72]]
Former-commit-id: e619c37fbb65f8be835ae65fb664e525ccd84dba [formerly b42465f64e]
Former-commit-id: 0a218f0f68
|
2012-04-11 15:37:16 -05:00 |
|
Roger Ferrel
|
b3071095aa
|
Issue #437 Bug fixes to user status
Change-Id: Idd46418cc6f40a1f8a4f247942f5b730b851444f
Former-commit-id: 2e61538905 [formerly 3421463f53] [formerly 74c98303d5] [formerly 2e61538905 [formerly 3421463f53] [formerly 74c98303d5] [formerly d45396d9f0 [formerly 74c98303d5 [formerly 140fa8efdba2cd5c6cf8b2a1c9696e08d1dc931a]]]]
Former-commit-id: d45396d9f0
Former-commit-id: 1da4339131 [formerly b63954e4de] [formerly 1cec54e406153589e76b7d319454697721cb75e5 [formerly eec9b69d47]]
Former-commit-id: c91a4be72358120c68a2eab5d3d33c227ce48d3f [formerly 1cccff5054]
Former-commit-id: 3d1e700e88
|
2012-04-11 12:26:46 -05:00 |
|
Bryan Kowal
|
450c2ed249
|
Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 77dcca12a8 [formerly b561cc5c85] [formerly 58b10dd9ae] [formerly 77dcca12a8 [formerly b561cc5c85] [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 58b10dd9ae [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]]]
Former-commit-id: 25c3f269bf
Former-commit-id: fec3d21677 [formerly 30c2ed6fed] [formerly cd67d08ad844aecd4dce4ee5b42ed767d75185ed [formerly 4dec6ced9f]]
Former-commit-id: cae076d0e6ec70ad21f67d40de60a9a6d163298b [formerly f0524db48b]
Former-commit-id: 7abc0980b4
|
2012-04-11 10:28:30 -05:00 |
|
Max Schenkelberg
|
bb28089fa6
|
Issue #239 Got maps resources syncing across users
Former-commit-id: a94f6388f3 [formerly 60879f83bd] [formerly 8865c35e69] [formerly a94f6388f3 [formerly 60879f83bd] [formerly 8865c35e69] [formerly ea6b58c226 [formerly 8865c35e69 [formerly d3864aaf812ed78137a7c4124515a1f4300cd2b1]]]]
Former-commit-id: ea6b58c226
Former-commit-id: 2d6e1728e9 [formerly 7d84449d7c] [formerly 4695edc590a19b6ea96ba978a4a38e0f613e64c5 [formerly e90693f7d9]]
Former-commit-id: 51f56d4ea1967ff844198715bcbb1c34cffed27a [formerly 65383a8b53]
Former-commit-id: 4036ea2785
|
2012-04-11 09:46:53 -05:00 |
|
Nate Jensen
|
2ea7a555e3
|
Issue #444 some cleanup
Change-Id: Ic790969f95e59fbf16a18d05bcc11cfe09a94916
Former-commit-id: 3b0f399ac7 [formerly da1163d487] [formerly 4405320bc8] [formerly 3b0f399ac7 [formerly da1163d487] [formerly 4405320bc8] [formerly f32611df47 [formerly 4405320bc8 [formerly 7731d22c58ee05a1c663a1d0da8f047ce49aa09c]]]]
Former-commit-id: f32611df47
Former-commit-id: 5fed054bee [formerly e4ea4333eb] [formerly 87fe8cf1b441c0e889ae9fdc70325fbb10687574 [formerly 0286ff10ad]]
Former-commit-id: 7cc221aa4a7ca62adab2a795bf5e538befdf8b43 [formerly d3f9d5fbdf]
Former-commit-id: fd94a0927d
|
2012-04-11 09:33:56 -05:00 |
|
Nate Jensen
|
da9a66cb15
|
Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7
Former-commit-id: 93bfd726cf [formerly ff36181458] [formerly 0f20bba406] [formerly 93bfd726cf [formerly ff36181458] [formerly 0f20bba406] [formerly 9b4b691ca9 [formerly 0f20bba406 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]]]]
Former-commit-id: 9b4b691ca9
Former-commit-id: 1159e2db0e [formerly 929365719e] [formerly d7d801ad3d55a7ba9400082d7d305bd51397d18e [formerly ae769c490b]]
Former-commit-id: 972ef20c417e51050d7a8a1d556421c17436ac28 [formerly a554e754bd]
Former-commit-id: c98cf48092
|
2012-04-10 18:15:36 -05:00 |
|
Bryan Kowal
|
80d7eef4b5
|
Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration
Former-commit-id: 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 3baf9d03c2 [formerly 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]]]
Former-commit-id: 3baf9d03c2
Former-commit-id: bcd015b390 [formerly 929a056e1b] [formerly d378932ad42a50abccb7f393f0d20a538b2651f3 [formerly 61d0a876dd]]
Former-commit-id: 9873ed4d4cd1ce895f3d6cdb3d0d89f8fa5ef773 [formerly c8ae36a6b2]
Former-commit-id: 3806dad754
|
2012-04-10 17:40:58 -05:00 |
|
Brad Gonzales
|
a4a5d19f9d
|
Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: 3a9a646cf7 [formerly 7229f9b92a] [formerly ac35f8f2fb] [formerly 3a9a646cf7 [formerly 7229f9b92a] [formerly ac35f8f2fb] [formerly 107c8ba7b9 [formerly ac35f8f2fb [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]]]]
Former-commit-id: 107c8ba7b9
Former-commit-id: a4a8ae8e18 [formerly 7d7e792ed8] [formerly 06526a885a69fd5ed7b056fb56c936e7962d2a84 [formerly 1b7e35f876]]
Former-commit-id: decd27b1d7ab445f0d7863c8aa63090734c4d762 [formerly c25f8c2ee2]
Former-commit-id: 86360a2744
|
2012-04-10 17:20:38 -05:00 |
|
Roger Ferrel
|
23b700e060
|
Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223
Former-commit-id: d6cd8ffdc1 [formerly ced485f863] [formerly 69ea7c724e] [formerly d6cd8ffdc1 [formerly ced485f863] [formerly 69ea7c724e] [formerly 020be00301 [formerly 69ea7c724e [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]]]]
Former-commit-id: 020be00301
Former-commit-id: 57e9f8fc75 [formerly 40b73d902c] [formerly d420514e04ad2359f559a25fb096aa020b45f47a [formerly 8fa193bcbe]]
Former-commit-id: c40be7e581c9923895e8b1dc17d182c2255c7e12 [formerly ca8d18c8f9]
Former-commit-id: 2327436f8a
|
2012-04-10 16:50:26 -05:00 |
|
Bryan Kowal
|
22218f31bd
|
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]]
Former-commit-id: ce99417a2a
Former-commit-id: 8b08c8308e [formerly 541fe8fbbb] [formerly 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1]]
Former-commit-id: ffb83e28c6229d71093fafcfa99acc4e62dc25af [formerly 47c7cba3f5]
Former-commit-id: 07e4ddc1b9
|
2012-04-10 16:42:36 -05:00 |
|
James Korman
|
b56ed6b1ff
|
Issue #437 - Updates to status handling - Added SessionManager user presence.
Former-commit-id: 64313163fb [formerly 44eae46180] [formerly 7bf01ecbc9] [formerly 64313163fb [formerly 44eae46180] [formerly 7bf01ecbc9] [formerly 07bc1bf83e [formerly 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]]]]
Former-commit-id: 07bc1bf83e
Former-commit-id: b573c1162c [formerly 8afc2bc1a8] [formerly 0784456ab907baca539b6cb36890c1b39ca8354b [formerly 7272ede3c4]]
Former-commit-id: 6b0b550ccb9ccf741a888f3d33f27e780ca103cb [formerly d8e1fad3c0]
Former-commit-id: cb8d2f17ff
|
2012-04-10 15:55:12 -05:00 |
|
Max Schenkelberg
|
57e0dbf2bf
|
Issue #239 Got zoom/pan events working for remote users
Former-commit-id: 7416bd9839 [formerly 65f6c07530] [formerly 6e0c5c3cdf] [formerly 7416bd9839 [formerly 65f6c07530] [formerly 6e0c5c3cdf] [formerly 18e9f2c6ad [formerly 6e0c5c3cdf [formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 2c47c3a99d [formerly 9853d46099] [formerly 651085c3a24f9ed2b19ae0a5cf80b31fa2d7e0be [formerly 0d21a9a35e]]
Former-commit-id: fe6a73e790f39586ffbcd7eb1035a198363895b3 [formerly dbd37bb4ae]
Former-commit-id: 5977b8bcba
|
2012-04-10 14:40:51 -05:00 |
|
Matt Nash
|
be827580d2
|
Issue #429 comment out ability to start in debug mode for the connection
Former-commit-id: 286b51b936 [formerly 62564ebb0c] [formerly 202fe2bb5e] [formerly 286b51b936 [formerly 62564ebb0c] [formerly 202fe2bb5e] [formerly f05b486e33 [formerly 202fe2bb5e [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]]]]
Former-commit-id: f05b486e33
Former-commit-id: e3b73bea8c [formerly 96f45cdb58] [formerly f32eb9eed5a4c3676fc28b4bce1e17de2b7ef30d [formerly 52e27b63f7]]
Former-commit-id: 52a697ae23d4c148ada32bbec100d289d8251ac2 [formerly fb87eac0a7]
Former-commit-id: 4a3b1b2591
|
2012-04-10 13:22:42 -05:00 |
|
Steve Harris
|
80108c0af9
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
|
2012-04-10 12:50:03 -05:00 |
|
Roger Ferrel
|
c0f95c0c57
|
Issue #437 User status now properly displayed and updated in sessions.
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999
Former-commit-id: 9e4ea5bef6 [formerly 7ebea1d964] [formerly d2e2fd8da3] [formerly 9e4ea5bef6 [formerly 7ebea1d964] [formerly d2e2fd8da3] [formerly 3fd25ff1cf [formerly d2e2fd8da3 [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]]]]
Former-commit-id: 3fd25ff1cf
Former-commit-id: 1b246c91c0 [formerly 16857ccb3a] [formerly a7ca24388156c67420d24fca9338db23ba6ad944 [formerly 57e809d913]]
Former-commit-id: 13ac5d76ef19c6fdd5b9d8564751b69fc9c5d9e4 [formerly c259f5c643]
Former-commit-id: 1923bf67ed
|
2012-04-10 11:11:26 -05:00 |
|
Nate Jensen
|
1602e04564
|
Issue #427 cleanup
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024
Former-commit-id: 914012521e [formerly 68a3867d06] [formerly 2e5272cff9] [formerly 914012521e [formerly 68a3867d06] [formerly 2e5272cff9] [formerly ec92c842c4 [formerly 2e5272cff9 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]]]]
Former-commit-id: ec92c842c4
Former-commit-id: 8a67c1211c [formerly a16929c9bc] [formerly f71fb863c9e4b9653e1c9491189ec17650d52a26 [formerly a924bd6489]]
Former-commit-id: cf4ecfa7fcd748e841a9e1f91f716ea5138f60d3 [formerly 4ac068d140]
Former-commit-id: 35316d2fe3
|
2012-04-10 10:35:03 -05:00 |
|
Brad Gonzales
|
f2357bcd06
|
Issue #440 Changed login icon to green.
Former-commit-id: 694c8d99ff [formerly 0eefb140ac] [formerly a378fea5d1] [formerly 694c8d99ff [formerly 0eefb140ac] [formerly a378fea5d1] [formerly ca2a35d77c [formerly a378fea5d1 [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]]]]
Former-commit-id: ca2a35d77c
Former-commit-id: e1329c566e [formerly d7421465f7] [formerly 52517a936fc772f6cc69d253e33a050e945853cc [formerly 8d170cd14b]]
Former-commit-id: ff008b0f33ba4d096a29dc4118ef865520964205 [formerly a18f4944a4]
Former-commit-id: f2f5f2725d
|
2012-04-10 10:01:11 -05:00 |
|
Roger Ferrel
|
d4962cfefa
|
Issue #437 Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164
Former-commit-id: 05d20a70ea [formerly 57abf56e09] [formerly b4c8d3a0d9] [formerly 05d20a70ea [formerly 57abf56e09] [formerly b4c8d3a0d9] [formerly 521127b589 [formerly b4c8d3a0d9 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]]]]
Former-commit-id: 521127b589
Former-commit-id: a043e15035 [formerly 35c753c07f] [formerly ffe3bb947109a3d0dd60988e238123c19981b959 [formerly 946f7963c4]]
Former-commit-id: 2509f8775c43d71c4eff634741bd92c14958d8c3 [formerly 06933e6f92]
Former-commit-id: a7cd6a8ece
|
2012-04-09 16:00:25 -05:00 |
|
Matt Nash
|
fde6de2c0b
|
Issue #429 changing 'private' aspect
Former-commit-id: e94db84585 [formerly eba8ac8dd9] [formerly 9887678590] [formerly e94db84585 [formerly eba8ac8dd9] [formerly 9887678590] [formerly 98350f4ba5 [formerly 9887678590 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]]]]
Former-commit-id: 98350f4ba5
Former-commit-id: bf85a9c5b8 [formerly 1c93a3d702] [formerly 841444a4f8bb6733bfb89cf8569094f97587343f [formerly d6731254d6]]
Former-commit-id: 3648a745fd6c8947e818b0a5a763c405937e0ad9 [formerly f850f8ef2a]
Former-commit-id: b2aa6417c7
|
2012-04-09 15:21:07 -05:00 |
|
Roger Ferrel
|
aed3001803
|
Issue #437 Change to up date Presence in the Group View.
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8
Former-commit-id: 61f3e1fb0e [formerly 225a8762d1] [formerly c5399687bc] [formerly 61f3e1fb0e [formerly 225a8762d1] [formerly c5399687bc] [formerly 2109190752 [formerly c5399687bc [formerly b64a623cda4ec00d555d8542da496286e0210dac]]]]
Former-commit-id: 2109190752
Former-commit-id: e29b208070 [formerly 7be7bceeaa] [formerly 22d05609434586e7662300f737604417f4a3acb6 [formerly 1e4ed16880]]
Former-commit-id: 982d057d2248a5e22c3d4354865924404e4fede4 [formerly c620bc2ef5]
Former-commit-id: 245e7171ac
|
2012-04-09 15:16:19 -05:00 |
|
Slav Korolev
|
a969ff8908
|
Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.
Former-commit-id: 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]]]
Former-commit-id: f02da69ff5
Former-commit-id: c158df01f8 [formerly 45d4f9fb86] [formerly 7c520a3f99ccdf1fa13ed92436ba78b85df449ea [formerly 47ba302180]]
Former-commit-id: c1d0302c1c23c128a04ea83683fe62afda4fd4b2 [formerly d82def7b22]
Former-commit-id: 55a9ed9a51
|
2012-04-09 14:50:19 -04:00 |
|
Bryan Kowal
|
0be0424e8d
|
Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.
Former-commit-id: 1e2c3602c2 [formerly 898487c15c] [formerly 94b327d00f] [formerly 1e2c3602c2 [formerly 898487c15c] [formerly 94b327d00f] [formerly 2386dd5890 [formerly 94b327d00f [formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]]]]
Former-commit-id: 2386dd5890
Former-commit-id: b211dd30d2 [formerly ee210d909f] [formerly 3b24d926ddb3ebbebc0f6748565aa093085dcc7c [formerly 5395b66d6e]]
Former-commit-id: 53f2ab237b11014b164252364af55167c751e8f3 [formerly 1117e40536]
Former-commit-id: f87399d7f8
|
2012-04-09 13:15:50 -05:00 |
|
Matt Nash
|
f270a05653
|
Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: 47a24a20c2 [formerly 2a7698e284] [formerly 42ce0e72f0] [formerly 47a24a20c2 [formerly 2a7698e284] [formerly 42ce0e72f0] [formerly b340718346 [formerly 42ce0e72f0 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]]]
Former-commit-id: b340718346
Former-commit-id: 638bc4ea08 [formerly 80da3ac38f] [formerly 8ffec5acab3087d00d96c6843996f230186044ba [formerly 22aec07dfd]]
Former-commit-id: f2999e7b6f251609ea9a4adff5db83ae4c2e0fa2 [formerly 37671e80ad]
Former-commit-id: a8366aca54
|
2012-04-09 12:42:44 -05:00 |
|
James Korman
|
f5e4f7a17b
|
Issue #437 - Updated Presence - Add properties and new constructor
Former-commit-id: 3e0929bc19 [formerly 9aa0176bb7] [formerly 48397d1d95] [formerly 3e0929bc19 [formerly 9aa0176bb7] [formerly 48397d1d95] [formerly 53dc047d3d [formerly 48397d1d95 [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]]]]
Former-commit-id: 53dc047d3d
Former-commit-id: 4d47a5bd03 [formerly 9a7c440f2d] [formerly 0f523247a9d4006ee425b68577045c883a21f008 [formerly 0d6a5312d1]]
Former-commit-id: 7662523ab57ec218539cbce3240456a4c44bdc8a [formerly 1a5f500029]
Former-commit-id: a2f35b7885
|
2012-04-09 11:42:19 -05:00 |
|
Brad Gonzales
|
f019daf003
|
Issue #440 added login icon. Changed Logon to Login.
Former-commit-id: 5a1970c902 [formerly 008b670b6a] [formerly 44a83e92ed] [formerly 5a1970c902 [formerly 008b670b6a] [formerly 44a83e92ed] [formerly 7937986b11 [formerly 44a83e92ed [formerly d2b9c7981006dad91c5781fe0df96113530491df]]]]
Former-commit-id: 7937986b11
Former-commit-id: faaaedf5a7 [formerly 8084909235] [formerly d66ee38a743e9cdf115c208d9f81a7a986381f5e [formerly 552ce918ef]]
Former-commit-id: b376b9ecd16f2a908c31b5a030edc5be12407b4d [formerly 98d9c96a4f]
Former-commit-id: 9fe4d27470
|
2012-04-09 11:38:08 -05:00 |
|
James Korman
|
214c2e60ec
|
Issue #437 - Add code to update and post roster presence changes.
Former-commit-id: f631252562 [formerly 31a93f32ab] [formerly bb31e9e2ea] [formerly f631252562 [formerly 31a93f32ab] [formerly bb31e9e2ea] [formerly df0cdcb563 [formerly bb31e9e2ea [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]]]]
Former-commit-id: df0cdcb563
Former-commit-id: 799c36fc42 [formerly 5062cfd2a3] [formerly df208c8a5f493e9b29484d90e37b78e16afb2504 [formerly f535049780]]
Former-commit-id: ff6ffb03300428deb2288ea4f6019a87b8a06860 [formerly 21dead0af7]
Former-commit-id: bdf28406dc
|
2012-04-09 10:01:55 -05:00 |
|
Bryan Kowal
|
d484d46519
|
Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
Former-commit-id: 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]]
Former-commit-id: 839d7c886f
Former-commit-id: 438e88cc58 [formerly ab70749ea4] [formerly 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9]]
Former-commit-id: 8311d4eb699b277f616ec522a0769d665dba89b5 [formerly adaa011b1f]
Former-commit-id: 6f9a0e45cb
|
2012-04-09 09:32:45 -05:00 |
|
Bryan Kowal
|
db5981d4cd
|
Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: 4d73e617c8 [formerly 21ff4bf657] [formerly f1e81b1a95] [formerly 4d73e617c8 [formerly 21ff4bf657] [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]]]
Former-commit-id: dcc3c7bb59
Former-commit-id: 0591ab00cc [formerly 774d05de1b] [formerly d309520ea9fa039612c8a81873e58c06eedee69b [formerly 240c3a1806]]
Former-commit-id: 9f2d3acc4e68c9a863a54857e65a398b0ed2b8ba [formerly 64c328e151]
Former-commit-id: 58a8ef45c0
|
2012-04-09 09:19:02 -05:00 |
|
Max Schenkelberg
|
1ade3f1684
|
Issue #239 Fixed D2D context activation so as not to override important
keys when a unrelated view is active such as Product Browser or
Collaboration views.
Former-commit-id: 65e7184cc4 [formerly a5fa19c914] [formerly cbe92bdf32] [formerly 65e7184cc4 [formerly a5fa19c914] [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: c19de5dcc3 [formerly 532f2d691b] [formerly a24149c0db6c44d2a20bc8fb7a45708e704473a7 [formerly 824b24dfcb]]
Former-commit-id: 7994a40c93b0f5a9b6f2414d1ff1061656c15e12 [formerly a6c9c88b4f]
Former-commit-id: 54d8c44956
|
2012-04-06 10:23:24 -05:00 |
|
Matt Nash
|
54018255e1
|
Issue #429 remove unused com.raytheon.viz.drawing plugin
Former-commit-id: 30c3a6b53c [formerly 922fffeeed] [formerly af0513690d] [formerly 30c3a6b53c [formerly 922fffeeed] [formerly af0513690d] [formerly 5bd8e5e47c [formerly af0513690d [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]]]]
Former-commit-id: 5bd8e5e47c
Former-commit-id: 8e9e8b1c18 [formerly 803d45adfe] [formerly 4e43e26431e7cd66057f3709784fff899ebcb823 [formerly 437aa74095]]
Former-commit-id: 93b8fcc3679b1718f7436d362280f4e478755ee2 [formerly 789a792adf]
Former-commit-id: 57d981ed28
|
2012-04-06 07:16:15 -05:00 |
|
Nate Jensen
|
6b2bba618a
|
Issue #444 initial role transfer code and some cleanup
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f
Former-commit-id: e1fb02a18e [formerly 28684fd160] [formerly c1543afc44] [formerly e1fb02a18e [formerly 28684fd160] [formerly c1543afc44] [formerly 0ef84129c4 [formerly c1543afc44 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]]]]
Former-commit-id: 0ef84129c4
Former-commit-id: 788e4610bb [formerly c5130d8361] [formerly 6358fcd88066c928d88642b03cca77b80dc49efc [formerly ac109d3e72]]
Former-commit-id: 39cfa8220ec1b466b29cfbcc9c9522d4dcb7712a [formerly 8cc53dc431]
Former-commit-id: bd482c4334
|
2012-04-05 17:49:12 -05:00 |
|
David Gillingham
|
e188aaa21b
|
Issue #435: Prevent NullPointerExceptions from being thrown when
serializing AirepRecords and NcAirepRecords.
Issue #435: Address peer review comments on previous change.
Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac
Former-commit-id: 3b47db9541 [formerly 5193184abf] [formerly 87142f9f4e] [formerly 3b47db9541 [formerly 5193184abf] [formerly 87142f9f4e] [formerly e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]]
Former-commit-id: e0e57577ff
Former-commit-id: c39ee5a3c0 [formerly bef6e3d504] [formerly f9200a739ae6f82c440eea10738de05476856c19 [formerly 84f0765dba]]
Former-commit-id: 6c141db4a8da864d4f5448d844a3d1627ec7723d [formerly 3c0c8de495]
Former-commit-id: 963a44fec9
|
2012-04-05 15:49:23 -05:00 |
|
Max Schenkelberg
|
e191d8372f
|
Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references
Former-commit-id: e525c9c35d [formerly 48ca9ca105] [formerly 54aaf05209] [formerly e525c9c35d [formerly 48ca9ca105] [formerly 54aaf05209] [formerly 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]]
Former-commit-id: 16056d53c5
Former-commit-id: 4fbb7ea290 [formerly 20ad9fe872] [formerly 265f2d1efade092dd1793dfa515ef1708447df02 [formerly b4b754c7cc]]
Former-commit-id: 64590c6aeb3aeb7336aeaaa39d73b4ea63738378 [formerly 9bcd4b911a]
Former-commit-id: 01bf183cf3
|
2012-04-05 13:52:20 -05:00 |
|
Matt Nash
|
62ed45bc78
|
Issue #429 alert of new messages when in background
Former-commit-id: 7e6c9ae5b2 [formerly 5d0ae7ff9f] [formerly d62a660e52] [formerly 7e6c9ae5b2 [formerly 5d0ae7ff9f] [formerly d62a660e52] [formerly f314b2475d [formerly d62a660e52 [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]]]]
Former-commit-id: f314b2475d
Former-commit-id: 0d348a7133 [formerly 95f85cde78] [formerly 2d3eb9b2cc8eee90ec0b299c23462e14c6474380 [formerly 7edacef530]]
Former-commit-id: 04f66e86e4f65cb862359828ae59e3555fdf827b [formerly 8c2de7189e]
Former-commit-id: 330cf41623
|
2012-04-05 12:38:35 -05:00 |
|
Matt Nash
|
dd506ae46d
|
Issue #429 clear,undo,redo
Former-commit-id: ca62e2ef7f [formerly 52c0508781] [formerly c53719be8a] [formerly ca62e2ef7f [formerly 52c0508781] [formerly c53719be8a] [formerly 328d7e1287 [formerly c53719be8a [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]]]]
Former-commit-id: 328d7e1287
Former-commit-id: c090e70e60 [formerly 27c3cf3f38] [formerly c69a919b5228950032736860af83f5f74049f499 [formerly 7dd1657774]]
Former-commit-id: 9ca48053d7228044554fe02019744b74d4132f6e [formerly fb4d76d08b]
Former-commit-id: 533259729a
|
2012-04-05 11:49:57 -05:00 |
|
Matt Nash
|
80ab52cf86
|
Issue #429 telestrator allows all users to draw
Former-commit-id: 31f63e0cd0 [formerly 916b8428e4] [formerly f200e37a36] [formerly 31f63e0cd0 [formerly 916b8428e4] [formerly f200e37a36] [formerly 09c022bda8 [formerly f200e37a36 [formerly ed59b0803da528f391db3c71aac1184581cc353d]]]]
Former-commit-id: 09c022bda8
Former-commit-id: aa10e7b505 [formerly f985ddaa7e] [formerly 229755d5b98679de40f3d5d0f5e10d09a00c8399 [formerly fd1b123912]]
Former-commit-id: 5c7129d7059521ef1ed7dd5be7b7c271bdab0a6b [formerly 9d21c94293]
Former-commit-id: 9916b2c095
|
2012-04-05 10:27:10 -05:00 |
|
Roger Ferrel
|
705127afbc
|
Issue #439 added filter to prevent illegal characters in the session name. Also made changes to throw exceptions when creation fails.
Change-Id: Ieb5fcbb433f8165d8cd711224dc095fe96e5162c
Former-commit-id: 85b6b8a196 [formerly d197ea6fd2] [formerly afc79a14f3] [formerly 85b6b8a196 [formerly d197ea6fd2] [formerly afc79a14f3] [formerly 72bf5460d7 [formerly afc79a14f3 [formerly 898e1a503af21abef70afc734924332e7de249ee]]]]
Former-commit-id: 72bf5460d7
Former-commit-id: 8b5cc65466 [formerly 98c83d5322] [formerly c32cf26a4426276e64d2389dd034f2f15ecb5f69 [formerly f9aa115a2b]]
Former-commit-id: f3ae4f2a8556572a7438754a1b975c97eff90f73 [formerly 3dbb7266f9]
Former-commit-id: 01fa3302df
|
2012-04-05 08:09:15 -05:00 |
|
Bryan Kowal
|
ad3d889f82
|
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f24e7a4d31 [formerly edb7431d0a] [formerly f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]]
Former-commit-id: 1f75c4defef522fcbd2e5b5755b3202c6dd96d6d [formerly 3db4653b1e]
Former-commit-id: faefa46212
|
2012-04-04 18:29:13 -05:00 |
|
Nate Jensen
|
96d36aefc8
|
Issue #427 fixed subject
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70
Former-commit-id: 956c125095 [formerly d68efe319e] [formerly b084156a30] [formerly 956c125095 [formerly d68efe319e] [formerly b084156a30] [formerly 4999e547a1 [formerly b084156a30 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]]]]
Former-commit-id: 4999e547a1
Former-commit-id: aa0ab9a3ef [formerly a20e542438] [formerly 7eb6f6e7efab34a92a0b53d6fb26d16c6ce23123 [formerly 477d1bb013]]
Former-commit-id: 938578819e5d7425f3b8c1c1f6aadc0dbafa1d97 [formerly 1e29a9f45c]
Former-commit-id: 80914de8cf
|
2012-04-04 17:06:00 -05:00 |
|
Bradley Gonzales
|
88c3278ffa
|
Issue #440 more descriptive login failure message
Former-commit-id: 9d44aabf06 [formerly 391f8e4d58] [formerly 6fc14461ee] [formerly 9d44aabf06 [formerly 391f8e4d58] [formerly 6fc14461ee] [formerly 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 7945fe90e6 [formerly 2d7e2b456e] [formerly 098005964c92d44ded39c3c5e5194fbf5527436a [formerly c345b2614e]]
Former-commit-id: 1eddcc6965e7c22a1738f21ecef6183843d48aa4 [formerly 7a125d179c]
Former-commit-id: 60d8ddce72
|
2012-04-04 16:26:58 -05:00 |
|
Nate Jensen
|
99a7cd1976
|
Issue #427 instantiate collaboration resource
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20
Former-commit-id: bea3b8fb0c [formerly 9c4b29c3aa] [formerly 260c7c10eb] [formerly bea3b8fb0c [formerly 9c4b29c3aa] [formerly 260c7c10eb] [formerly f06338bcd4 [formerly 260c7c10eb [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]]]]
Former-commit-id: f06338bcd4
Former-commit-id: 63e389da6e [formerly a2d7bdb709] [formerly 805a0a7445263fe4b32c76b708b396734638f2b0 [formerly 0f5b0f7e9e]]
Former-commit-id: 07e6d780ae10be21be71bbdebe2ec3482dab5968 [formerly 2f8e80b254]
Former-commit-id: 900ad65c76
|
2012-04-04 14:05:12 -05:00 |
|
James Korman
|
fd783958f8
|
Issue #437 - Corrected venue command message loopback
Former-commit-id: 47c16c8eda [formerly fad1fa7362] [formerly 23a2cd033a] [formerly 47c16c8eda [formerly fad1fa7362] [formerly 23a2cd033a] [formerly e663a9e5dc [formerly 23a2cd033a [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]]]]
Former-commit-id: e663a9e5dc
Former-commit-id: ae78c1b570 [formerly 9c924ccb25] [formerly e217bf264f1ab514e6d3916f5243a815bc38ff93 [formerly 44b07395fb]]
Former-commit-id: 5d937c6daeeb551e00173bf8296a20c245e97e5c [formerly 27c2635ce2]
Former-commit-id: b1ca31467c
|
2012-04-04 13:41:25 -05:00 |
|
Matt Nash
|
f5fb3f962c
|
Issue #429 working telestration collaboration capabilities
Former-commit-id: cb909ce21f [formerly 86e2f1a7ad] [formerly 3c2fcc59d0] [formerly cb909ce21f [formerly 86e2f1a7ad] [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly 3c2fcc59d0 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]]]]
Former-commit-id: c27a3cf672
Former-commit-id: c010118826 [formerly a7544fadf9] [formerly 3c3dd55c6aa4fca138d9d2c15294dd9bfbddabdc [formerly 28df06150e]]
Former-commit-id: 87053566b319dfd521aec186ce155b3310109d04 [formerly 64ef004e78]
Former-commit-id: 0e37e6938f
|
2012-04-04 11:23:34 -05:00 |
|
Roger Ferrel
|
a3113066c8
|
Issue #244 Fix bug in handleInvitationEvent
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9
Former-commit-id: c2b5a62e38 [formerly 7aa926028e] [formerly a39475e04d] [formerly c2b5a62e38 [formerly 7aa926028e] [formerly a39475e04d] [formerly 46ddf008b8 [formerly a39475e04d [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]]]]
Former-commit-id: 46ddf008b8
Former-commit-id: c3b0f8dc27 [formerly d1ce0844e3] [formerly 17eff5c7bcf326f80da2ab7de13763602e79ffb9 [formerly 5145bb9e7e]]
Former-commit-id: 6bd56e8fcad54690a5ba52cabdd9e8c39e21329c [formerly 3afe426ae1]
Former-commit-id: d5bf79f20d
|
2012-04-03 17:28:27 -05:00 |
|
James Korman
|
49ef4ddae2
|
Issue #437 - Adding roster api message handling.
Former-commit-id: ffa4d5377f [formerly dcdb98319d] [formerly 4c7f2465fc] [formerly ffa4d5377f [formerly dcdb98319d] [formerly 4c7f2465fc] [formerly afeea4d9d2 [formerly 4c7f2465fc [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]]]]
Former-commit-id: afeea4d9d2
Former-commit-id: 7a848dae25 [formerly 2307245201] [formerly 77b08819fd1463e43c942fb3612d79bd289af01e [formerly f496523681]]
Former-commit-id: d6ffd7675c26078035132c3e2c7e7a4c119b4146 [formerly 0766652a82]
Former-commit-id: 425edcec63
|
2012-04-03 16:57:27 -05:00 |
|
Roger Ferrel
|
998a1eea4c
|
Issue #244 Change user status now send Presence update to the server.
Change-Id: Id0a455633693db251d03a85343f526905a9c4364
Former-commit-id: 7cc492b43c [formerly 3d9fcb3273] [formerly 78502719e9] [formerly 7cc492b43c [formerly 3d9fcb3273] [formerly 78502719e9] [formerly 46addc13cf [formerly 78502719e9 [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]]]]
Former-commit-id: 46addc13cf
Former-commit-id: 6ca13f94ef [formerly 06b9147bd2] [formerly 806bc0fd135adc0a6dd1389dacfb8fdca37c8725 [formerly 7cf6e6166d]]
Former-commit-id: b1ef627c00582f846a48ac9d79e0405a48f98125 [formerly df0a2b5f4a]
Former-commit-id: cef8c6770b
|
2012-04-03 16:20:07 -05:00 |
|
Roger Ferrel
|
65ee2858ff
|
Merge branch 'new_devel' into 11-Collaboration
Former-commit-id: ea093e60c2 [formerly 6ae33324f3] [formerly b8df9f46e4] [formerly ea093e60c2 [formerly 6ae33324f3] [formerly b8df9f46e4] [formerly 395ae5ae63 [formerly b8df9f46e4 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]]]]
Former-commit-id: 395ae5ae63
Former-commit-id: 5c5f8799fb [formerly 4b49ba50a7] [formerly f40e950bca5418b047772f8ab1a47e5d6a510551 [formerly 5b943096c5]]
Former-commit-id: 1dbe58a7ca78c36ba9deb84ed6c222eae2feb80b [formerly 06eeef6931]
Former-commit-id: f46e457692
|
2012-04-03 15:29:53 -05:00 |
|
Max Schenkelberg
|
46ed965577
|
Issue #239 Start of remote target capabilities
Former-commit-id: 6e94ff6098 [formerly ac1fc79f5b] [formerly 6c411ffb07] [formerly 6e94ff6098 [formerly ac1fc79f5b] [formerly 6c411ffb07] [formerly d2d03e2c64 [formerly 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]]]
Former-commit-id: d2d03e2c64
Former-commit-id: 275030f23b [formerly 3b9699d896] [formerly 320620d9bdec1aae5cb62ad9138b5b802bf7ddf7 [formerly 5d7e504e89]]
Former-commit-id: d641da94e0330770fad1285ac62698679e7102ef [formerly 522382bb0b]
Former-commit-id: 5b50c04d63
|
2012-04-03 15:11:20 -05:00 |
|