10 commits

Author	SHA1	Message	Date
David Rowe	8e56e0bf18	Fix QML warning	2016-08-10 10:41:37 +12:00
Triplelexx	fd4d9761ce	merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping	2016-06-24 03:34:39 +01:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
Triplelexx	11af0a421b	Merge branch 'master' into 20769	2016-04-03 22:57:55 +01:00
David Rowe	51728d14a7	Miscellaneous improvements to Attachments dialog	2016-03-24 21:17:36 +13:00
Stephen Birarda	34fb06a7bd	changes to attachments dialog from contractor	2016-03-23 13:52:47 -07:00
timemarkov	160b4e7ba2	Implement new design of attachment dialog	2016-03-18 12:11:00 +01:00
Bradley Austin Davis	320c4d27b5	Force Qt (rather than OS) rendering in a number of places	2016-02-03 14:51:05 -08:00
Brad Davis	2956557c5f	Adding overlay compatible combo-box	2016-01-26 21:55:41 -08:00
Brad Davis	664100b9b1	Attachment dialog	2016-01-26 21:55:40 -08:00