2412 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
David Gillingham	a325bc28ff	Issue #435: Ensure associated HDF5 data is always captured when ... archiving PDOs, alter binlightning so insert time is based on system time like all other plugins. Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2 Issue #435: Add comment to previous change as requested by peer review, fix binlightning insert time. Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2 Former-commit-id: ae703513d7 [formerly c9d5823d2c] [formerly a9398fe4cd] [formerly ae703513d7 [formerly c9d5823d2c] [formerly a9398fe4cd] [formerly e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]]] Former-commit-id: e0e8e6d00a Former-commit-id: 0fd14b8a0b [formerly 4ff79099ac] [formerly 0f166301c2c892f4b1314f13084e1d03103fbf79 [formerly b4439bc5e8]] Former-commit-id: 9454d16d102c26a98c3e6288eb24e36999eddc13 [formerly 4c01c6d66f] Former-commit-id: 16449705bf	2012-04-03 14:16:33 -05:00
Roger Ferrel	1ec00fdca9	Issue #244 Peer to Peer chat implemented. Change Passwor implemtned. ... Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681 Former-commit-id: ce37b8ff40 [formerly 1db237e408] [formerly 7d7ee81855] [formerly ce37b8ff40 [formerly 1db237e408] [formerly 7d7ee81855] [formerly 9dd257f28a [formerly 7d7ee81855 [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]]]] Former-commit-id: 9dd257f28a Former-commit-id: ca1e1abaee [formerly 034540cb01] [formerly 92524bcc01705c62843e81ef79fc9be0b92157cd [formerly 813e91d1cc]] Former-commit-id: d2d6b69d5117d970c13540cbadab70fbe61abc35 [formerly 0680f7fe4e] Former-commit-id: f8b25156d9	2012-04-03 13:28:40 -05:00
Max Schenkelberg	51d66673fb	Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration ... Former-commit-id: 6a3162d5b8 [formerly ccde60b87e] [formerly e78aad4bc5] [formerly 6a3162d5b8 [formerly ccde60b87e] [formerly e78aad4bc5] [formerly 138114e3dc [formerly e78aad4bc5 [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]]]] Former-commit-id: 138114e3dc Former-commit-id: 228ccb613b [formerly 52d1d31d7b] [formerly f23e954a5d5d3e8f71fa70f6593b6ce00ab3755f [formerly bdc8c572a5]] Former-commit-id: d8722d7959c2537c7fad8822cb7b7585ab87aace [formerly bcf4a5888f] Former-commit-id: 178196ef0e	2012-04-03 13:15:31 -05:00
James Korman	b33fb0f0c0	Issue #232 - Corrected problem using participant identifiers ... Former-commit-id: 32d9bac2c5 [formerly 9387e6154c] [formerly b89a89def3] [formerly 32d9bac2c5 [formerly 9387e6154c] [formerly b89a89def3] [formerly 96cd7bea11 [formerly b89a89def3 [formerly 5b102692838b42ffab97186742338494df78b978]]]] Former-commit-id: 96cd7bea11 Former-commit-id: 5f44b3505b [formerly f86eef9ef6] [formerly f081524b8a1555bd32d5e7d61586122840674ca8 [formerly 46a646f7f7]] Former-commit-id: b788b4da7f03960c27205d22abb0d6884d12fecb [formerly 0ce49560c3] Former-commit-id: b449399206	2012-04-03 12:45:00 -05:00
Matt Nash	b35a748e5c	#429 fix issue where dialog prevents collaboration view from opening, add collaboration drawing layer, use event bus for message handling, prep work for ... Former-commit-id: efea51faca [formerly 217d707198] [formerly 5cb40430a7] [formerly efea51faca [formerly 217d707198] [formerly 5cb40430a7] [formerly 8e16194370 [formerly 5cb40430a7 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]]]] Former-commit-id: 8e16194370 Former-commit-id: 398916d8da [formerly f11fcc7d8e] [formerly e258c6a2303e7abb5e8a1dcd44fafd1f26622886 [formerly ce79d3bec3]] Former-commit-id: 6d4aacaad98a18b05d4ccb1dff57583eef20ce90 [formerly 76adccc98e] Former-commit-id: ea8bbffd0b	2012-04-03 12:23:11 -05:00
Nate Jensen	38243e08be	Issue #427 open editor when joining session ... Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59 Former-commit-id: d75858ffa0 [formerly 19bb87346c] [formerly 223eb82fe0] [formerly d75858ffa0 [formerly 19bb87346c] [formerly 223eb82fe0] [formerly c29a5a75d9 [formerly 223eb82fe0 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]]]] Former-commit-id: c29a5a75d9 Former-commit-id: 7c5b10222e [formerly b740924cdc] [formerly fc1d5c60e4ec9729575efed47af8bb8e49d4f3b5 [formerly 6319166680]] Former-commit-id: 6e1fa133a8684b61cab2e2c8a7bfad9b76152409 [formerly 28ed07b65a] Former-commit-id: cfc10b64f6	2012-04-03 08:44:58 -05:00
Max Schenkelberg	fb2aac38df	Merge branch 'ss_sync (12.3.1)' into 11-Collaboration ... Former-commit-id: 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]] Former-commit-id: 753de872e0 Former-commit-id: f3ff93f96f [formerly c7165384f1] [formerly adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae]] Former-commit-id: fd2fce7269f96cccd09b7c752b9ea972105488bb [formerly 5ebb709ef6] Former-commit-id: 8e521d2c29	2012-04-02 16:15:21 -05:00
Roger Ferrel	00ae91e2d5	Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum. ... Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2 Former-commit-id: f03f683fd1 [formerly 6aa7fb3d65] [formerly 146a421ccb] [formerly f03f683fd1 [formerly 6aa7fb3d65] [formerly 146a421ccb] [formerly dbec72645a [formerly 146a421ccb [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]]]] Former-commit-id: dbec72645a Former-commit-id: bdb0fd86c6 [formerly 63bfc3a073] [formerly a4c58eddc7662ec65730b4e49c7cf78697573cb8 [formerly bd37fffbeb]] Former-commit-id: 290b88478f5b41716a5f7aeaf2cbe20781d057f7 [formerly 7ff96826db] Former-commit-id: 6a9c473b0e	2012-04-02 12:13:26 -05:00
Matt Nash	e414c6c180	Issue #429 fix minor issues with toolbar and updated eraser code ... Former-commit-id: 48eb644d69 [formerly 25a539a1c8] [formerly 27e850d203] [formerly 48eb644d69 [formerly 25a539a1c8] [formerly 27e850d203] [formerly 236ae6f26c [formerly 27e850d203 [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]]]] Former-commit-id: 236ae6f26c Former-commit-id: 8cfbc1e384 [formerly 5e3bebc033] [formerly c7bbc8af81d1470fb9f760fffe73f1516e976a49 [formerly 0a97f20f3a]] Former-commit-id: 94a8ece70e11de0ce034b84f543172f55a0366c8 [formerly e7d6b86a2f] Former-commit-id: 5794564ebd	2012-03-30 16:35:02 -05:00
Roger Ferrel	c2b244db59	Issue #244 Active Sessions node only displays rooms the user is in. ... Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4 Former-commit-id: d0b78dff9e [formerly fac1db8b37] [formerly 442500aeae] [formerly d0b78dff9e [formerly fac1db8b37] [formerly 442500aeae] [formerly 232df64e22 [formerly 442500aeae [formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]]]] Former-commit-id: 232df64e22 Former-commit-id: 5bb351c6a9 [formerly a8b643dc2a] [formerly 8f5c3def1b69709d11f92f1d49bd0b55d0b70089 [formerly 21b19df9db]] Former-commit-id: 54d98d7977c603b82250243ea574f8e6a273959d [formerly cf2054fe6a] Former-commit-id: a866109133	2012-03-30 15:06:35 -05:00
James Korman	529d3554ad	Issue #232 - Modified invitation methods ... Former-commit-id: 80ea4c0104 [formerly a907eeb4ed] [formerly 436b967ff1] [formerly 80ea4c0104 [formerly a907eeb4ed] [formerly 436b967ff1] [formerly 0b6a076129 [formerly 436b967ff1 [formerly 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89]]]] Former-commit-id: 0b6a076129 Former-commit-id: ea6d408a9e [formerly ae115263ce] [formerly 110dbacc4d32bab470b9fd9825b11ea1516e3ff2 [formerly 48fb9fe7e4]] Former-commit-id: 0f4cb887489c8dd70e7ccdb01d47abc6a18ba81f [formerly 58221261f5] Former-commit-id: c4102180c6	2012-03-30 11:27:09 -05:00
Max Schenkelberg	d25bbaaea2	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]] Former-commit-id: 07cf5069ba Former-commit-id: ea7fcde242 [formerly 4234b91d5b] [formerly bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]] Former-commit-id: 28b91cc7176d4b78395f3f59578f0b975773db53 [formerly f20e674318] Former-commit-id: e8bc0cfa66	2012-03-30 10:51:31 -05:00