16 commits

Author	SHA1	Message	Date
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
Alexander Ivash	c6764c6244	cherry-picking	2018-11-06 14:21:14 +05:30
Brad Hefta-Gaub	405b1d5725	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
Alexander Ivash	a4987e494a	update imports	2018-10-18 21:05:20 +03:00
Alexander Ivash	cfb820762d	bulk adjusting to coding guidelines	2018-08-22 00:42:01 +03:00
Alexander Ivash	68041dc93c	get rid of TextStyle1..11 per request from Dante	2018-07-06 21:00:55 +03:00
Alexander Ivash	939749e084	The keyboard should appear at the bottom of the screen.	2018-07-06 21:00:55 +03:00
Alexander Ivash	2581157794	"The button changes from Confirm to overwrite, and the button style changes from blue to red"	2018-07-06 21:00:55 +03:00
Alexander Ivash	c7570dbf83	integrate onscreen keyboard	2018-07-06 21:00:54 +03:00
Alexander Ivash	5381dce8d8	get rid of 'isExternal' due to changes requirements ... show avatar thumbnail if url was specified & valid, show 'guy-in-circle' otherwise	2018-07-06 21:00:54 +03:00
Alexander Ivash	ee856266c7	allow updating existing avatars	2018-07-06 21:00:54 +03:00
Alexander Ivash	b7614684de	add check for duplicate names into 'create favorites dialog', style accordingly to mockups	2018-07-06 21:00:54 +03:00
Alexander Ivash	1cc086f9c6	cleanup and bugfixing	2018-07-06 21:00:53 +03:00
Alexander Ivash	fe8bb3c8ea	simplify code a bit ... explicite store attachments in model use models for comparison instead JS Objects	2018-07-06 21:00:53 +03:00
Alexander Ivash	1ddfc87396	wip on avatarapp	2018-07-06 21:00:51 +03:00