Commit graph

1275 commits

Author SHA1 Message Date
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463)
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Stephen Birarda
57a92adc73 flag node as local by sending address, not by local from packet 2017-09-18 15:39:51 -07:00
Brad Hefta-Gaub
7cce45017b Merge pull request #11244 from birarda/bug/ice-dns-fail
add a timeout for ICE server DNS lookup
2017-09-07 11:09:05 -07:00
Stephen Birarda
3003f64514 add debug for ice server lookup fail 2017-08-24 16:42:53 -07:00
Stephen Birarda
c7affea411 add a timeout for ICE server DNS lookup 2017-08-24 16:40:16 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
Liv
b63fcc329e localhost default can change settings 2017-08-07 17:28:49 -07:00
Liv
d2abc42e8f Update domain server to include permissions 2017-08-07 12:43:54 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Liv
eb1b7e52df restore original files that had erroneous whitespace changes to reduce diff 2017-07-26 09:00:51 -07:00
Stephen Birarda
dd3755596c fix typo in comment in DomainGatekeeper header 2017-07-25 15:43:34 -07:00
Stephen Birarda
e9845784d5 don't return error decrypting for optimistic public keys 2017-07-25 15:28:05 -07:00
Stephen Birarda
2d0c5ff37a remove preloading of allowed user keys since it happens on connect 2017-07-25 11:41:34 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
utkarshgautamnyu
5771ee27e1 Update DomainGatekeeper.cpp 2017-07-24 17:33:01 -07:00
utkarshgautamnyu
884bdb3b7e Update DomainGatekeeper.cpp 2017-07-24 14:57:22 -07:00
utkarshgautamnyu
7c62ed6dac made sendRequest depend on hasValidAccessToken being true 2017-07-24 14:46:32 -07:00
Liv
4ba9b08125 first attempt at url handling in octree server 2017-07-20 14:00:51 -07:00
Liv
e0fd391766 Add permission level for replacing domain content 2017-07-18 14:34:22 -07:00
Stephen Birarda
d22b146370 Merge pull request #10845 from birarda/bug/domain-cookie-restart
fix for OAuth OPTIONS firing every XHR 302
2017-07-06 17:22:03 -07:00
Stephen Birarda
6d98d20b12 cleanup bad QEventLoop::exec() OAuth handling code 2017-07-06 16:19:47 -07:00
utkarshgautamnyu
d961a0c4ad Merge pull request #10887 from highfidelity/bug/5950
Bug/5950
2017-07-06 14:04:38 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
utkarshgautamnyu
d5c88bc6de Merge branch 'master' into bug/5950 2017-07-06 12:52:13 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
utkarshgautamnyu
9d2fe8da9c Update DomainServer.cpp 2017-07-05 18:02:44 -07:00
utkarshgautamnyu
8c96d00f14 Update DomainServerSettingsManager.cpp 2017-07-05 16:59:47 -07:00
utkarshgautamnyu
c069c13ebb Update DomainServerSettingsManager.cpp 2017-07-05 14:12:18 -07:00
utkarshgautamnyu
1385ef80a7 Update DomainServerSettingsManager.cpp 2017-07-05 13:56:40 -07:00
Clément Brisset
8744b8e58d Merge pull request #10859 from Atlante45/fix/ac-cleanup
Fix AC cleanup
2017-06-30 16:42:15 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
utkarshgautamnyu
5f123018a4 Update DomainMetadata.cpp 2017-06-29 10:38:33 -07:00
Stephen Birarda
cf92144748 fix for OAuth OPTIONS firing on XHR 302 2017-06-28 14:13:09 -07:00
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -07:00
Seth Alves
8510b60a87 Merge pull request #10789 from sethalves/fix-domain-server-ice-messages
fix the messages printed by domain-server about which name it's using to find ice-servers
2017-06-22 17:59:09 -07:00
Seth Alves
f1c7d54010 fix the messages printed by domain-server about which name it's using to find ice-servers 2017-06-22 13:53:06 -07:00
Stephen Birarda
0c7baa3ce4 remove an extra blank line 2017-06-22 13:36:58 -07:00
Stephen Birarda
dd44a81791 verify that replication server type is also present 2017-06-22 13:36:24 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
seefo
48b5989b60 add upstream nodes to domain nodelist 2017-06-22 13:33:57 -07:00
Stephen Birarda
01d9812247 Merge pull request #10772 from birarda/bug/domain-double-connect
use existing node ID during repeated connect requests
2017-06-22 13:16:33 -07:00
Stephen Birarda
c516dd06e4 Merge pull request #10714 from highfidelity/replicants
add broadcasting/replication to downstream avatar mixers and audio mixers
2017-06-21 17:55:07 -07:00
Stephen Birarda
e39e5c8c3b simplify lambda capture in gate keeper 2017-06-21 16:21:40 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
Stephen Birarda
9285c88e46 check if usernames do not match before using hint ID 2017-06-21 15:34:43 -07:00
Stephen Birarda
3e97b07fc2 Revert "force domain-server to use new ID if node requests connect"
This reverts commit cd023e0384.
2017-06-21 15:14:16 -07:00
seefo
0c7f1cda0f Added a restart button to domain server settings page 2017-06-19 15:01:50 -07:00
Stephen Birarda
ea6a38148c Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-15 14:30:08 -07:00
Ryan Huffman
330a27b3a0 Fix removing all downstream nodes in settings not killing nodes 2017-06-15 14:27:01 -07:00
Stephen Birarda
94abfc2d6b nomenclature changes from replication to broadcast 2017-06-15 11:47:13 -07:00
Stephen Birarda
10649c8f6e change new Node flag to isForcedNeverSilent 2017-06-14 17:20:37 -07:00
Stephen Birarda
224a559602 keep downstream nodes around in domain, alive in upstream 2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Stephen Birarda
e818a511b9 cleanup debug in updateReplicatedNodes 2017-06-14 15:07:48 -07:00
Stephen Birarda
54832d995d fix a typo in shouldReplicateNode 2017-06-14 15:05:58 -07:00
Ryan Huffman
67113330b3 Make replicated username list case insensitive 2017-06-14 15:03:54 -07:00
Ryan Huffman
8d5dc21de8 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 15:03:53 -07:00
Ryan Huffman
7f75a5f7f5 Make replicated username list case insensitive 2017-06-14 13:57:04 -07:00
Ryan Huffman
59a420a358 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 13:53:50 -07:00
Ryan Huffman
029e6de2a0 Fix replicated users not being checked after username verified 2017-06-13 17:18:29 -07:00
Ryan Huffman
2e23230e82 Remove DomainServer qualification inside header 2017-06-13 17:18:29 -07:00
Ryan Huffman
ea56c568a7 Add support for replicating by username 2017-06-13 17:18:28 -07:00
Ryan Huffman
84e1a6f893 Rename isReplicant to isReplicated 2017-06-12 13:38:58 -07:00
Ryan Huffman
ff2800e8d5 Add isReplicant to Node 2017-06-12 13:37:49 -07:00
seefo
8a8f971186 empty passwords will no longer allow any password to pass DS HTTP auth 2017-05-23 12:01:00 -07:00
Stephen Birarda
9bc0609b1e address code review comments 2017-04-28 10:17:48 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Stephen Birarda
cd023e0384 force domain-server to use new ID if node requests connect 2017-04-25 13:10:54 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Davis
4367e3d036 PR comments 2017-03-15 18:13:10 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
David Kelly
a8831e89ff Ban only by machine fingerprint, when possible 2017-02-16 09:50:56 -07:00
Howard Stearns
34a4770ffa Merge pull request #9669 from davidkelly/dk/2656
inform gatekeeper immediately when kicking someone
2017-02-15 15:13:10 -08:00
Stephen Birarda
27412080dd return an empty descriptors map when empty 2017-02-14 15:39:59 -08:00
David Kelly
3b344ca01a inform gatekeeper immediately when kicking someone 2017-02-13 18:25:00 -07:00
David Kelly
45cb11f38a Don't allow a ban of any node on same machine as domain-server 2017-02-13 14:38:21 -07:00
Stephen Birarda
4bbd823a5a remove open hours from domain settings 2017-02-06 10:50:59 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Stephen Birarda
9b8cbba53f add isInInterestSet to DomainServer for extra checks 2017-01-24 18:32:33 -08:00
Stephen Birarda
e511b6e84c cleanup connect check in DomainServer 2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94 don't tell ESS about script Agents that won't talk to it 2017-01-24 17:10:05 -08:00
Stephen Birarda
1802e1520d change some dynamic_cast to static_cast for DomainServerNodeData 2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb fix needless reinterpret_cast for DomainServerNodeData 2017-01-23 13:14:53 -08:00
Ryan Huffman
b6893a0100 Keep Agents and EntityScriptServers from connecting if lacking permissions 2017-01-19 14:35:27 -08:00
Zach Fox
44eaa64a1d It was writeString() all along! 2017-01-19 11:25:17 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Zach Fox
1175752e1d Cleanup after rebase 2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Zach Fox
e22c1ac30e Fix the bug 2017-01-16 11:48:51 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS
Adding Machine Fingerprint to Domain Server permissions
2016-12-19 11:49:33 -08:00
Zach Fox
4bfc04a6ec Small CR changes 2016-12-19 10:41:18 -08:00
Zach Fox
ee2f600d2e Fix username display bug 2016-12-19 10:20:08 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
2016-12-14 16:09:13 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Stephen Birarda
dec4ce79b2 fix comment in mac permission unpack 2016-11-18 14:42:29 -08:00
Stephen Birarda
143225a74c add MAC permission table to domain-server and leverage 2016-11-18 14:40:22 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
Stephen Birarda
39afb24982 explictly remove Agent from NIS for other Agents 2016-11-15 10:37:19 -08:00
Stephen Birarda
1791a1c1fe never send agents to other agents 2016-11-15 10:15:17 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226
Add ability to mute user
2016-11-11 16:02:08 -08:00
Ryan Huffman
528b8e93f0 Remove extraneous logging in DomainServer for whitelist 2016-11-11 14:33:34 -08:00
Ryan Huffman
fc1a7255f6 Remove unneeded 'this->' 2016-11-11 14:24:28 -08:00
Ryan Huffman
e177004d71 Fix ds not restarting when changing ac whitelist 2016-11-11 14:23:16 -08:00
Ryan Huffman
d522d03bd2 Add repeated message suppression to request assignment packets 2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4 whitespace 2016-11-11 11:24:06 -08:00
Ryan Huffman
bd1bcaf1a4 Clean up subnet whitelist implementation 2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302 Update naming for subnet whitelist in ds 2016-11-11 10:32:45 -08:00
Ryan Huffman
ca6a74d63d Add whitelist filtering to assignment requests 2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca Add ip address whitelist processing to domain server 2016-11-11 10:19:21 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer
since we can get the canKick there too.  (doh)
2016-11-11 09:30:58 -08:00
David Kelly
285520dff7 Initial cut
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
humbletim
bf93483f87 allow assignment client scripts to create ATP assets 2016-10-26 11:22:33 -04:00
Stephen Birarda
5562d7e7a6 add a filter operator to decide if connections are created 2016-10-14 14:46:58 -07:00
Ryan Downe Karpf
397816679d Merge pull request #8790 from huffman/feat/reliable-path-queries
Update ds path queries to be reliable
2016-10-13 09:21:44 -07:00
Ryan Huffman
a44653db57 Update ds path queries to be reliable 2016-10-12 10:47:42 -07:00
Atlante45
5bae69bb51 Fix DS 2016-10-12 10:20:19 -07:00
Atlante45
d5429e76da Warnings fixes and cleanup 2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Seth Alves
e9961110e9 if we have new ice-server information, retry right away, even if the previous attempt failed 2016-10-10 15:40:59 -07:00
Seth Alves
9712301172 avoid a race that can cause metaverse to not have correct ice-server information about a domain 2016-10-10 11:54:33 -07:00
Brad Hefta-Gaub
41e90eda49 Merge pull request #8648 from sethalves/no-groups-no-log-spam
don't check for user membership in a null list of groups
2016-09-30 11:23:30 -07:00
Thijs Wenker
7e3073e163 fix spelling bugs 2016-09-29 22:13:27 +02:00
Seth Alves
8cadd299a2 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-23 13:16:26 -07:00
Seth Alves
f546524c1f don't checkout for user membership in a null list of groups 2016-09-23 09:46:10 -07:00
Seth Alves
bd2ee56a27 fix domain-server command-line arguments 2016-09-22 12:45:49 -07:00
Seth Alves
d2c5378627 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-22 11:44:23 -07:00
Seth Alves
c43c83019d Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Seth Alves
7dc8a48dba Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles-1 2016-09-21 10:08:17 -07:00
Seth Alves
b9ea93de57 use qWarning rather than qCritical because qCritical may exit 2016-09-21 10:08:02 -07:00
Seth Alves
a3aea774fe tell metaverse ice-server is 0.0.0.0 when domain-server doesn't have one 2016-09-21 10:07:12 -07:00
Seth Alves
ba8aa5b50c fix camelcase 2016-09-19 16:38:34 -07:00
Seth Alves
571aaac4d7 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-19 15:37:53 -07:00
Seth Alves
8108557e10 whitespace 2016-09-19 15:37:50 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Seth Alves
45b48c01bf command-line arguments to control ice-server ip address and domain-server ID 2016-09-19 13:39:42 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port
Add settings to change local port
2016-09-08 18:10:32 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Stephen Birarda
43b8e01d46 don't force auto networking on non metaverse domains 2016-08-23 11:21:15 -07:00
Stephen Birarda
d098a1ae28 allow temporary domains to use an access token when present 2016-08-22 10:50:39 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Stephen Birarda
5bac88c004 default domain-server permissions to connect for standard 2016-08-11 10:52:36 -07:00
Zander Otavka
3df8aa0dba Suppress repeated ice server connection messages 2016-08-08 17:01:32 -07:00
Brad Hefta-Gaub
652bea8cd0 Merge pull request #8363 from birarda/no-temp-ice-update
Avoid DS heartbeats with non-metaverse domain ID
2016-08-05 16:48:00 -07:00
Seth Alves
3ca1ee1d82 Fix some group-related code to handle CamelCase usernames 2016-08-04 17:39:41 -07:00
Stephen Birarda
f3e30221f0 only force a new temp name if already a temp domain-server 2016-08-04 09:33:31 -07:00
Stephen Birarda
ba49fd2c61 don't heartbeat immediately unless metaverse domain 2016-08-04 09:33:31 -07:00
Stephen Birarda
a1220b87f1 set key ID for verified user in right place 2016-08-02 14:35:51 -07:00
Stephen Birarda
760223a550 check for existing public key with lowercase username 2016-08-02 14:35:51 -07:00
Stephen Birarda
5eb890e4f5 add a simple IP address sanitizer for DS settings save 2016-08-02 14:35:51 -07:00
Stephen Birarda
39e6ac0974 cleanup API for HifiConfigVariantMap after migration 2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 2016-08-02 14:35:11 -07:00
Stephen Birarda
285478f1b2 don't repack the same permissions after kick 2016-08-02 14:35:11 -07:00
Stephen Birarda
5b04ab6d53 add node kick request handling to DS 2016-08-02 14:35:11 -07:00
Stephen Birarda
eaf52ae111 default kick perms for localhost 2016-08-02 14:35:11 -07:00
Stephen Birarda
5d69c9c81e fix sockaddr choice for local nodes 2016-08-02 14:35:11 -07:00
Stephen Birarda
b1e0e6d708 use replacement for IP address perms, not additive 2016-08-02 14:35:11 -07:00
Stephen Birarda
f7298ef767 add packing of IP perms, small cleanup in packing 2016-08-02 14:35:11 -07:00
Stephen Birarda
cd436355fc cleanup handling of defaults for standard user perms 2016-08-02 14:35:11 -07:00
Stephen Birarda
a674c843c2 add unpack for IP, DRYup unpackPermissions 2016-08-02 14:35:11 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Seth Alves
c72cfb165c damnit 2016-07-29 18:33:06 -07:00
Seth Alves
2443166d78 update for new friends api 2016-07-29 16:41:17 -07:00
Seth Alves
ebdfede89f switch to new friends api 2016-07-29 16:34:59 -07:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Seth Alves
390ee9aaeb clean up some code, add some debugging prints 2016-07-27 14:03:32 -07:00
Seth Alves
3a3b1489c6 code review 2016-07-27 11:46:52 -07:00
Seth Alves
8663b260f6 code review -- applyPermissionsForUser to setPermissionsForUser, don't take input permissions as an argument 2016-07-27 10:14:18 -07:00
Seth Alves
d69d5bff28 remove redundant call to userPerms.setVerifiedUserName 2016-07-27 10:06:02 -07:00
Seth Alves
a2d35df34e fix a couple of mistakes made during code-review response 2016-07-27 09:57:57 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00
Seth Alves
148793011d code review 2016-07-27 07:55:09 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
Seth Alves
82dfdebd46 move permissions for specific-users below groups. turn debug-prints back off 2016-07-22 14:14:03 -07:00
Seth Alves
8e5262872e fix bug that was losing verified status for users with permissions specific to their account 2016-07-22 14:00:46 -07:00
Seth Alves
6ec8aff645 remove group-related debug prints 2016-07-22 12:02:17 -07:00
Seth Alves
96fd1cb841 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b book-keeping around groups and ranks 2016-07-22 11:40:23 -07:00
Seth Alves
97b40ab87d adapting to api changes 2016-07-21 14:04:55 -07:00
Howard Stearns
51bc3c51ca less logging, change constant name. 2016-07-21 08:35:21 -07:00