Commit graph

60 commits

Author SHA1 Message Date
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
64d17f101a obfuscate set access token from AM log 2015-04-17 10:44:01 -07:00
Seth Alves
cb7ff86386 put networking library into its own QLoggingCategory 2015-04-06 15:11:48 -07:00
Andrew Meadows
b9b2c30bba use QObject::deleteLater() not explicit delete 2015-03-27 09:01:44 -07:00
Stephen Birarda
4bf8e9f625 change AccountManager request API, leverage in networking and DS 2015-03-25 12:04:04 -07:00
Stephen Birarda
df8864f9b0 Revert "make sure UserActivityLogger::close() waits for the pending log message to complete"
This reverts commit 3bd3f5a6d2.
2015-03-12 15:04:51 -07:00
ZappoMan
3bd3f5a6d2 make sure UserActivityLogger::close() waits for the pending log message to complete 2015-03-10 14:23:23 -07:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
dc84c336ea handle login failure, have AccountManager generate keypair 2015-02-03 16:09:06 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
2015-01-30 13:49:45 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
Stephen Birarda
d420674edd apply orientation change to listening position for audio 2015-01-27 14:50:02 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Stephen Birarda
5b81fa27fc fix for DEFAULT_NODE_AUTH_URL 2015-01-23 13:05:02 -08:00
Stephen Birarda
e34fb66be7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-21 12:41:20 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Stephen Birarda
466ea12d0f turn off verbose HTTP request debug 2015-01-20 15:44:14 -08:00
Stephen Birarda
94a9bf52fa handle gvr-interface address lookup 2015-01-20 14:38:33 -08:00
Stephen Birarda
cd23876afc fix QHttpMultiPart destroy from AccountManager 2015-01-20 11:00:08 -08:00
Stephen Birarda
a66888939c add some debugging for domain switch 2015-01-20 10:51:11 -08:00
Stephen Birarda
483d072709 handle override path from address bar 2015-01-20 10:47:57 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Stephen Birarda
fce239fb70 replace auto_ptr with unique_ptr 2014-11-17 14:17:50 -08:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
Stephen Birarda
e4b19545b0 generate a new keypair if one isn't found in settings 2014-10-15 10:36:21 -07:00
Stephen Birarda
46fb7fb4a9 return QNetworkReply for AccountManager callbacks 2014-10-14 16:12:04 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Stephen Birarda
f8c89d0790 upload the generated public key to data-web, add getter for private key 2014-10-14 13:51:41 -07:00
Stephen Birarda
7ce806b746 fire off generation of key-pair in conjunction with login, store private key 2014-10-14 12:12:32 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
Stephen Birarda
78f8aba504 fix for NetworkAccessManager getInstance return 2014-10-06 09:44:47 -07:00
Stephen Birarda
970ba2296a initial response from ice server to nodes 2014-10-02 14:50:48 -07:00
Stephen Birarda
15156519b3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-01 16:19:16 -07:00
Stephen Birarda
ac4a767d60 include memory for auto_ptr 2014-09-30 15:25:40 -07:00
Stephen Birarda
fed7dad2b6 use an auto_ptr to be able to reset the AccountManager 2014-09-30 14:36:32 -07:00
Stephen Birarda
3969c8bfe0 don't allow a username and password for domain auth, require access token 2014-09-30 12:23:04 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Stephen Birarda
9ee063bdc1 remove the access token from API urls and put in Authorization header 2014-09-17 16:00:20 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
Stephen Birarda
e1ba076a71 complete redemption of signed transactions from octree server 2014-07-31 11:03:12 -07:00
Stephen Birarda
eadae8ed1a allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
Atlante45
1815472c6b Modified recently added case to AccountManager 2014-07-02 16:12:39 -07:00
Atlante45
106e5b578b Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 16:06:41 -07:00
Ryan Huffman
70121357be Update JSONCallbackParameters to take params in constructor 2014-07-02 11:12:06 -07:00
Atlante45
7c3292a41b Switched AccountManager to NetworkAccessManager 2014-07-01 17:47:31 -07:00
Ryan Huffman
50e77be406 Add DELETE to AccountManager 2014-06-26 16:07:02 -07:00