47 commits

Author	SHA1	Message	Date
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
Atlante45	a6ccfb1685	CR	2016-03-10 15:11:39 -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
Atlante45	7d7a683b18	Add uploadFile method that prompts the user	2016-03-10 14:59:20 -08:00
Stephen Birarda	7f0917ea00	add to world in front of MyAvatar	2016-03-10 14:49:07 -08:00
Stephen Birarda	e227f68353	tweak wording for overwrite dialog	2016-03-10 14:49:07 -08:00
Stephen Birarda	5167cf69b2	fix for add to world and delete dialog	2016-03-10 14:49:07 -08:00
Stephen Birarda	c65b5b63f0	better error handling for asset browser	2016-03-10 14:48:44 -08:00
Stephen Birarda	8cc0ae3148	menu and naming changes for asset server directory	2016-03-10 14:48:44 -08:00
Ryan Huffman	c93ba2752b	Remove rowDelegate styling for asset window	2016-03-10 14:44:53 -08:00
Ryan Huffman	e4b5c14a4c	Merge branch 'atp' of github.com:birarda/hifi into atp-more	2016-03-10 14:20:22 -08:00
Ryan Huffman	ef8c66c1be	Remove commented out code	2016-03-10 14:18:09 -08:00
Ryan Huffman	71bc937533	Remove copy URL button	2016-03-10 13:56:54 -08:00
Ryan Huffman	273acc6a7e	Add context menu to asset manager	2016-03-10 13:55:36 -08:00
Stephen Birarda	99718e9c4e	short circuit the mapping operations for invalid path/hash	2016-03-10 10:52:05 -08:00
Stephen Birarda	b0c326fa2c	Merge pull request #92 from huffman/atp-more ... Atp more	2016-03-10 10:51:12 -08:00
Ryan Huffman	0df05d273d	Implement addToWorld in asset window	2016-03-10 10:25:51 -08:00
Stephen Birarda	899595183e	add reload of mappings on component complete	2016-03-10 09:02:45 -08:00
Stephen Birarda	f1919031de	error message boxes for mapping errors	2016-03-10 08:57:37 -08:00
Ryan Huffman	3e5e2eef17	Add mapping sorting, copying, and isKnownMapping	2016-03-10 08:18:32 -08:00
Ryan Huffman	dd52dd69d9	Fix rename mapping	2016-03-09 16:50:37 -08:00
Ryan Huffman	232bfc9061	Cleanup AssetServer qml	2016-03-09 16:44:31 -08:00
Ryan Huffman	0d2ae4f3a4	Merge branch 'atp' of github.com:birarda/hifi into atp-model	2016-03-09 16:33:53 -08:00
Ryan Huffman	f23057b1c0	Add renaming to Asset qml	2016-03-09 16:29:17 -08:00
Ryan Huffman	f5497aa1e7	Add new AssetMappingsScriptingInterface and add mappings model	2016-03-09 14:53:04 -08:00
Atlante45	6bd7afc7b3	Confirm overrides	2016-03-09 14:19:28 -08:00
Ryan Huffman	4da4fd889a	Add AssetMappingModel	2016-03-09 14:03:56 -08:00
Atlante45	5a0beec1f5	Replace old drag&drop with new UI	2016-03-09 11:47:31 -08:00
Atlante45	380480d4ee	Add a couple more dialogs	2016-03-08 18:19:26 -08:00
Atlante45	169af80bc0	Add a couple dialogs	2016-03-08 17:11:54 -08:00
Atlante45	028c7ab6ba	Add text box	2016-03-08 17:11:54 -08:00
Atlante45	254e04c4b7	UI change	2016-03-08 17:11:54 -08:00
Atlante45	0bed46d43a	Fix typos and file browser directory	2016-03-08 13:24:36 -08:00
Atlante45	74fb1aab55	Add file dialog	2016-03-08 13:15:04 -08:00
Atlante45	e32fd4524c	Start wiring UI	2016-03-08 13:13:45 -08:00
Atlante45	ded449072f	Rename window	2016-03-08 13:13:45 -08:00

Renamed from interface/resources/qml/AssetsManager.qml (Browse further)