3529 commits

Author	SHA1	Message	Date
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
John Conklin II	b314d496ec	Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode ... MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 15:22:41 -07:00
Zach Fox	53fe0bc616	MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 14:08:21 -07:00
Zach Fox	e48d39ec38	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 10:10:48 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
vladest	53350b471b	Merge branch 'master' into menu-updates	2018-05-02 19:02:11 +02:00
vladest	ea66e04ab8	Removed unwanted code	2018-05-02 18:58:40 +02:00
vladest	aef62d09c7	Merge branch 'master' into menu-updates	2018-05-01 21:47:46 +02:00
John Conklin II	250aa3ab43	Merge pull request #13027 from jherico/fix/web_crash2 ... Some fixes for QML surfaces	2018-05-01 12:39:46 -07:00
vladest	617b49fe14	Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode	2018-05-01 21:22:48 +02:00
Zach Fox	9b80c500e3	Merge pull request #13039 from zfox23/sideloadAppJson ... Enable sideloading .app.json Apps from local disk	2018-04-30 11:14:24 -07:00
John Conklin II	b6afaccdf3	Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix ... New model dialog fix	2018-04-30 10:08:54 -07:00
vladest	a16b2c0d20	Restore preferences dialogs buttons spacing	2018-04-29 12:38:37 +02:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
Brad Davis	8e42bb8c87	Restore the stop functionality for a browser view when it's being destroyed	2018-04-27 17:35:38 -07:00
RebeccaStankus	269a7f0e15	Changed maximum line count for warning message	2018-04-27 14:34:08 -07:00
Zach Fox	dbd7d7e2b4	Small cleanup	2018-04-27 14:19:58 -07:00
Zach Fox	ea716f2a1e	Enable sideloading .app.json Apps from local disk	2018-04-27 14:08:53 -07:00
Zach Fox	c0fe504713	Merge pull request #13030 from zfox23/finalize_14295_14559 ... Finalize work on MS14295 and MS14559	2018-04-27 13:49:02 -07:00
Howard Stearns	f8ad36afd0	Merge pull request #13028 from zfox23/updateCommerceFor67 ... Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 11:55:40 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub	e4f5eb9cca	Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes ... MS14295: Fix lingering Gifts UI Bugs	2018-04-27 07:30:14 -07:00
Zach Fox	e3b14bf478	MS14295: Fix lingering Gifts UI Bugs	2018-04-26 15:57:37 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	60115752ad	Fixed saving after editing	2018-04-21 20:18:24 +02:00
vladest	2b716f051c	Merge branch 'master' into menu-updates	2018-04-20 19:34:15 +02:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
vladest	b8577bd791	Merge branch 'master' into fix_spinbox	2018-04-20 18:09:16 +02:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
vladest	ab1a89a6f9	Merge branch 'master' into menu-updates	2018-04-19 21:02:30 +02:00
Howard Stearns	6d151f022d	Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix ... Only dismiss letterbox when clicking on grey areas	2018-04-19 11:47:10 -07:00
vladest	663af09605	Fix SpinBox. attempt 1	2018-04-19 20:43:48 +02:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
vladest	60d53359bb	Fix Toolbar vertical position	2018-04-19 11:39:58 +02:00
Zach Fox	e01e7cc7bc	Be a bit more efficient	2018-04-18 16:34:02 -07:00
vladest	7b21b36d3c	Disable menu button in Toolbar mode	2018-04-18 22:19:54 +02:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
vladest	b5071d28e8	Merge branch 'master' into menu-updates	2018-04-18 21:10:57 +02:00
vladest	cacb9359c2	Toolbar at bottom	2018-04-18 20:57:28 +02:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
vladest	bb7eb90f58	Merge branch 'master' into menu-updates	2018-04-17 19:55:11 +02:00
vladest	c402cb2c19	Fix Desktop double windows	2018-04-17 19:51:43 +02:00
Zach Fox	93cf399fd6	Only dismiss letterbox when clicking on grey areas	2018-04-16 15:09:19 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00