From 9a0163f404e304c22f1df69cecd108de76f002a0 Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Tue, 19 Feb 2019 10:36:35 -0800 Subject: [PATCH 1/3] Add README.md file to tools/jsdoc/out directory to prevent jsdoc generation failures during build --- tools/jsdoc/.gitignore | 6 +++++- tools/jsdoc/out/README.md | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 tools/jsdoc/out/README.md diff --git a/tools/jsdoc/.gitignore b/tools/jsdoc/.gitignore index 148363ca03..b64f841525 100644 --- a/tools/jsdoc/.gitignore +++ b/tools/jsdoc/.gitignore @@ -1,2 +1,6 @@ -out +out/* +!out/README.md + + + diff --git a/tools/jsdoc/out/README.md b/tools/jsdoc/out/README.md new file mode 100644 index 0000000000..3f9519555e --- /dev/null +++ b/tools/jsdoc/out/README.md @@ -0,0 +1 @@ +This is the output directory for the JavaScript API documentation generated by jsdoc. \ No newline at end of file From bf8c671cd60a8f371cbc61277c9c2515cc1cf2d4 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 20 Feb 2019 10:54:03 -0800 Subject: [PATCH 2/3] keyboard setting --- interface/src/ui/Keyboard.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/src/ui/Keyboard.h b/interface/src/ui/Keyboard.h index 1ff1cda1b9..627eb68dfd 100644 --- a/interface/src/ui/Keyboard.h +++ b/interface/src/ui/Keyboard.h @@ -179,7 +179,12 @@ private: mutable ReadWriteLockable _handLaserLock; mutable ReadWriteLockable _preferMalletsOverLasersSettingLock; mutable ReadWriteLockable _ignoreItemsLock; + +#ifdef Q_OS_ANDROID + Setting::Handle _use3DKeyboard { "use3DKeyboard", false }; +#else Setting::Handle _use3DKeyboard { "use3DKeyboard", true }; +#endif QString _typedCharacters; TextDisplay _textDisplay; From adb6f559dc2dee33d46428f92459eb21ca602ad1 Mon Sep 17 00:00:00 2001 From: shanzzam Date: Wed, 20 Feb 2019 18:31:32 -0800 Subject: [PATCH 3/3] Changing twitter handle from inc to VR --- scripts/system/html/js/SnapshotReview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/html/js/SnapshotReview.js b/scripts/system/html/js/SnapshotReview.js index 91866605a4..1e8be9d644 100644 --- a/scripts/system/html/js/SnapshotReview.js +++ b/scripts/system/html/js/SnapshotReview.js @@ -450,7 +450,7 @@ function updateShareInfo(containerID, storyID) { facebookButton.setAttribute("href", 'https://www.facebook.com/dialog/feed?app_id=1585088821786423&link=' + shareURL); twitterButton.setAttribute("target", "_blank"); - twitterButton.setAttribute("href", 'https://twitter.com/intent/tweet?text=I%20just%20took%20a%20snapshot!&url=' + shareURL + '&via=highfidelityinc&hashtags=VR,HiFi'); + twitterButton.setAttribute("href", 'https://twitter.com/intent/tweet?text=I%20just%20took%20a%20snapshot!&url=' + shareURL + '&via=highfidelityVR&hashtags=VR,HiFi'); hideUploadingMessageAndMaybeShare(containerID, storyID); }