550 commits

Author	SHA1	Message	Date
David Rowe	bef8c5a807	Fix some QML warnings	2016-03-17 09:51:32 +13:00
David Rowe	48d4316714	Fix typo	2016-03-17 09:34:21 +13:00
David Rowe	5faa7b3e87	Merge branch 'master' into 20851 ... Conflicts: interface/resources/qml/dialogs/MessageDialog.qml	2016-03-17 09:29:56 +13:00
Andrew Meadows	6028c3e841	Merge pull request #7318 from birarda/atp ... Asset Transfer Protocol Mappings	2016-03-15 16:52:36 -07:00
Atlante45	03efde5b3c	Change text in case of drag and drop.	2016-03-15 13:53:13 -07:00
Atlante45	4a90ec303c	Fix drag&drop	2016-03-15 11:22:42 -07:00
Clément Brisset	17e5b441cf	Merge pull request #111 from huffman/atp-manager-name ... Add atp filename to entities added to world	2016-03-15 10:19:53 -07:00
Ryan Huffman	1b81b4f01b	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-15 10:19:20 -07:00
Atlante45	07d2213628	Remove debug	2016-03-15 09:14:22 -07:00
Atlante45	9b8b1d41e3	Edit in place	2016-03-15 09:14:22 -07:00
Stephen Birarda	72c64532f5	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-15 09:12:49 -07:00
Ryan Huffman	7823882aa1	Add atp filename to entities added to world	2016-03-14 16:13:33 -07:00
David Rowe	ab963b4a4b	Fix up script editor's "reload script?" message box	2016-03-15 09:04:23 +13:00
Mark Johnson	2834ff2935	Change Q: -> Pending:	2016-03-14 11:45:05 -07:00
David Rowe	f75aa97728	Grow width of QML message box to accommodate wide title if necessary	2016-03-15 07:22:21 +13:00
Ryan Huffman	4b6dd4636f	Merge branch 'atp' of github.com:birarda/hifi into atp-upload	2016-03-13 21:32:25 -07:00
Ryan Huffman	960047f412	Remove right click selection	2016-03-13 21:06:52 -07:00
Ryan Huffman	6c27bd9eb2	Update upload flow and make asset list dynamically sized	2016-03-13 21:04:07 -07:00
Mark Johnson	47d3f418e3	Merge remote-tracking branch 'highfidelity/master'	2016-03-12 17:30:22 -08:00
Mark Johnson	00829db375	Fill in the downloads line of the stats window ... Will show the active download, current download limit and how many pending requests	2016-03-12 17:27:43 -08:00
David Rowe	3deb30d699	Remove no longer need font type	2016-03-12 13:06:29 +13:00
David Rowe	3bf1afb80b	HMD submenus not allcaps	2016-03-12 12:56:38 +13:00
David Rowe	9da64e540d	Add shortcut keys to HMD menu	2016-03-12 12:53:16 +13:00
Stephen Birarda	890266e0bd	shrink message dialog to contentWidth	2016-03-11 15:45:57 -08:00
Stephen Birarda	188712a55b	select a right-clicked item in asset browser	2016-03-11 15:45:57 -08:00
Stephen Birarda	31f0e4a919	disable the rename and delete buttons if nothing selected	2016-03-11 15:45:57 -08:00
Stephen Birarda	6d6a53a69a	use timer for upload click handle to avoid focus issue	2016-03-11 15:45:57 -08:00
David Rowe	ecf67282d5	Add separators to HMD menus	2016-03-12 12:29:52 +13:00
Stephen Birarda	e51aedeb35	fix error handling for diff request types	2016-03-11 11:36:52 -08:00
David Rowe	e175c19754	Style checkbox for menu items	2016-03-11 15:51:27 +13:00
Stephen Birarda	7ccba8b406	remove debug for selected index crash	2016-03-10 18:36:12 -08:00
Stephen Birarda	7675c83f92	clear selection on reload	2016-03-10 18:34:28 -08:00
Stephen Birarda	8e2b06a8e5	use an explicit selection model for treeview	2016-03-10 18:32:18 -08:00
David Rowe	fb0f97264c	Style HMD menu items	2016-03-11 15:24:35 +13:00
Stephen Birarda	39e869fdfd	append a trailing slash for folder rename	2016-03-10 17:54:38 -08:00
Stephen Birarda	625032f748	fix for add to world after upload name change	2016-03-10 17:10:49 -08:00
Stephen Birarda	52ee2499fc	add trim prior to rename in AssetServer	2016-03-10 16:57:39 -08:00
Stephen Birarda	ed4df72eed	cleanup logging for asset browser	2016-03-10 16:57:39 -08:00
Atlante45	4a9d88d213	CR	2016-03-10 16:55:51 -08:00
Atlante45	16287b7040	Disable add to world for uncompatible files	2016-03-10 16:44:39 -08:00
Atlante45	35f5ebb938	Don't allow folder overwrite	2016-03-10 16:44:39 -08:00
Stephen Birarda	2fb478ff3c	Merge pull request #99 from huffman/atp-more ... Atp more	2016-03-10 16:22:05 -08:00
Ryan Huffman	2d4864ed33	Merge branch 'atp' of github.com:birarda/hifi into atp-more	2016-03-10 15:40:07 -08:00
Ryan Huffman	76ed16314a	Add prepended slash on rename if missing	2016-03-10 15:38:20 -08:00
Stephen Birarda	e29565a717	don't default to yes when prompted for overwrite	2016-03-10 15:32:12 -08:00
Stephen Birarda	672bafc09d	Merge pull request #95 from Atlante45/feat/atp ... Wire upload	2016-03-10 15:30:53 -08:00
Atlante45	a6ccfb1685	CR	2016-03-10 15:11:39 -08:00
Stephen Birarda	cf12a8d396	always center the text in the message dialog	2016-03-10 15:02:19 -08:00
Atlante45	63571a7c36	Make sure Upload is not clicked several times	2016-03-10 14:59:20 -08:00
Atlante45	548d826a4e	Couple bug fixes	2016-03-10 14:59:20 -08:00