Stephen Birarda
|
6d500d64d1
|
fix floats that aren't actually floats
|
2014-05-22 17:12:22 -07:00 |
|
Stephen Birarda
|
fc9d850c40
|
output when pay-for-assignments is on
|
2014-05-22 15:33:06 -07:00 |
|
Stephen Birarda
|
40c59a3589
|
fix rate of payment for assignments
|
2014-05-22 15:10:41 -07:00 |
|
Stephen Birarda
|
e3ac7c5eec
|
rename assignment payment method for clarity
|
2014-05-21 12:07:23 -07:00 |
|
Stephen Birarda
|
98d1146e90
|
rename the pay for assignments option
|
2014-05-21 11:04:00 -07:00 |
|
Stephen Birarda
|
b7727f0b16
|
require a flag to enable payment to assigned nodes
|
2014-05-21 11:02:02 -07:00 |
|
Stephen Birarda
|
1dddabb691
|
send and confirm transactions to assigned nodes from DS
|
2014-05-21 10:58:41 -07:00 |
|
Stephen Birarda
|
908eb5cc4f
|
use OAuth provider URL for transaction login
|
2014-05-21 10:04:48 -07:00 |
|
Stephen Birarda
|
981f9df6b3
|
add option to pass data server username and password to DS
|
2014-05-21 09:53:09 -07:00 |
|
Stephen Birarda
|
ee67c64b76
|
stub sending of transactions to server
|
2014-05-21 09:26:17 -07:00 |
|
Stephen Birarda
|
5b3b19011e
|
display pending credits in DS web page
|
2014-05-20 17:04:41 -07:00 |
|
Stephen Birarda
|
99a3fde8fa
|
accumulate credits to pay nodes, return in assignments JSON
|
2014-05-20 16:57:19 -07:00 |
|
Stephen Birarda
|
8fb85110ac
|
add a timer to initiate payment to assigned nodes
|
2014-05-20 15:59:00 -07:00 |
|
Stephen Birarda
|
072343ce79
|
associate assignment wallet UUID with node via DomainServerNodeData
|
2014-05-20 15:50:09 -07:00 |
|
Stephen Birarda
|
b42e005cdb
|
add pending assignment purgatory for assignees
|
2014-05-20 15:28:45 -07:00 |
|
Stephen Birarda
|
8a1fdf3486
|
pass wallet UUID from AC to DS, cleanup noisy timer
|
2014-05-20 14:38:51 -07:00 |
|
Stephen Birarda
|
a9c2e3fe71
|
put back ssize_t definition
|
2014-05-20 11:56:06 -07:00 |
|
Stephen Birarda
|
2ef822d19d
|
remove more gnutls includes
|
2014-05-20 11:26:22 -07:00 |
|
Stephen Birarda
|
f22aaf21d2
|
remove GnuTLS include across repo
|
2014-05-20 10:56:34 -07:00 |
|
Stephen Birarda
|
e3dd6509d8
|
remove dependency on GnuTLS for later replacement with OpenSSL
|
2014-05-20 10:47:11 -07:00 |
|
Stephen Birarda
|
0e7615391c
|
don't look for GnuTLS from cmake
|
2014-05-20 10:35:04 -07:00 |
|
Stephen Birarda
|
72dd26acbe
|
only require OAuth authentication with a list of allowed roles
|
2014-05-02 10:47:59 -07:00 |
|
Stephen Birarda
|
aa2931d9bb
|
resolve conflicts on merge with upstream/master
|
2014-05-02 10:39:17 -07:00 |
|
Stephen Birarda
|
709bcdb148
|
handle interface client connection to DS with user roles
|
2014-05-01 16:18:07 -07:00 |
|
Stephen Birarda
|
b14d543701
|
retreive user profile and enumerate roles
|
2014-05-01 15:46:09 -07:00 |
|
Stephen Birarda
|
a49668031d
|
send a request for an access token after receiving auth code
|
2014-05-01 14:49:58 -07:00 |
|
Stephen Birarda
|
a826f3817b
|
fix assignment json for fulfilled assignments
|
2014-05-01 13:56:45 -07:00 |
|
Stephen Birarda
|
7a1aa7ec89
|
keep track of all assignments to stop double agents
|
2014-05-01 13:50:39 -07:00 |
|
Stephen Birarda
|
d942054015
|
cleanup re-display of OAuthWebView
|
2014-05-01 12:44:42 -07:00 |
|
Stephen Birarda
|
56c24ce8b7
|
present QWebView for OAuth authorization in interface
|
2014-05-01 11:09:35 -07:00 |
|
Stephen Birarda
|
2f0e311a99
|
return OAuth URL to interface clients when OAuth enabled
|
2014-05-01 10:19:05 -07:00 |
|
ZappoMan
|
aac42058ac
|
first cut at modelserver
|
2014-04-30 09:25:52 -07:00 |
|
Stephen Birarda
|
1c2032790a
|
allow passing of OAuth client secret to DS on command-line
|
2014-04-25 17:02:19 -07:00 |
|
Stephen Birarda
|
86f3cf2a75
|
allow passing of oauth info to DS
|
2014-04-25 16:39:45 -07:00 |
|
Stephen Birarda
|
e50e4d33be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into oauth-ds
|
2014-04-25 16:10:55 -07:00 |
|
Atlante45
|
8b4a910040
|
Fix timestamp timer not fired
|
2014-04-25 12:19:18 -07:00 |
|
Stephen Birarda
|
c26fc7a838
|
pull OAuth code from URL in domain-server
|
2014-04-24 15:05:41 -07:00 |
|
Stephen Birarda
|
4a68c2e9c4
|
allow DS to handle incoming HTTPS requests
|
2014-04-24 14:58:08 -07:00 |
|
Stephen Birarda
|
96de0c1af1
|
setup the domain-server HTTPS server
|
2014-04-24 14:13:17 -07:00 |
|
Stephen Birarda
|
260966915a
|
add HTTPS versions of webserver classes
|
2014-04-24 14:06:24 -07:00 |
|
Clément Brisset
|
d441e6a453
|
Merge pull request #2717 from AndrewMeadows/inertia
avatar bounding capsule collision against voxels
|
2014-04-23 16:06:14 -07:00 |
|
Andrew Meadows
|
da5ac3d664
|
remove warning about signed/unsigned comparison
|
2014-04-23 08:47:25 -07:00 |
|
Atlante45
|
3eeb3a539d
|
Fixed lack of resolution in usecTimestampNow()
|
2014-04-22 11:48:43 -07:00 |
|
Stephen Birarda
|
07387a132e
|
fix broken DS build
|
2014-04-21 09:31:21 -07:00 |
|
Stephen Birarda
|
cc7d986398
|
don't make scripts statically assigned
|
2014-04-21 09:29:08 -07:00 |
|
Stephen Birarda
|
419e092858
|
rename matching static method in DS
|
2014-04-21 08:48:29 -07:00 |
|
Stephen Birarda
|
c9b0444310
|
correct re-assignment of static assignments
|
2014-04-21 08:47:14 -07:00 |
|
Stephen Birarda
|
c64ae35374
|
remove an extra bracket
|
2014-04-21 01:01:38 -07:00 |
|
Stephen Birarda
|
36b58b178c
|
have scripted assignments added via config be static
|
2014-04-21 01:00:56 -07:00 |
|
Stephen Birarda
|
e9768ca4fc
|
add missing pool handling to DS
|
2014-04-18 13:34:30 -07:00 |
|