Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Room permissions, settings and improved entry flow #843

Merged
merged 54 commits into from
Jan 17, 2019
Merged

Room permissions, settings and improved entry flow #843

merged 54 commits into from
Jan 17, 2019

Conversation

brianpeiris
Copy link
Contributor

@brianpeiris brianpeiris commented Jan 16, 2019 •
edited
Loading

You can now change a room's name and scene if you were the creator of the room. We've also improved the room entry flow so that you can hit the back button instead of restarting the entire flow.

pr

This PR is a merge of #823, #832 and #833 see the descriptions those PRs for more technical details.

This PR also adds a permissions token retrieved from reticulum that describes what actions a user can take.

Goes with Hubs-Foundation/reticulum#110

brianpeiris and others added 30 commits January 2, 2019 17:16
@brianpeiris
Revert "Remove roles"
eb343a2 
This reverts commit a711ac4.
@brianpeiris
Revert "Remove postWithAuth"
53de046 
This reverts commit c272bb3.
@brianpeiris
Revert "Remove sign in UI from home page"
1c50ede 
This reverts commit c2b2988.
@brianpeiris
Revert "Remove sign in UI from home page"
3f10142 
This reverts commit 0a570be.
@brianpeiris
Fix link click callback
0355073
@brianpeiris
Fix signin/out on home page
b2ca98a
@brianpeiris
Send auth token in hub channel join payload
5ea75a8
@gfodor
Avatar selection using routes
513b565
@gfodor
Start working on entry flow paths
f949561
@gfodor
Entry flow now using HTML history
0be4bdc
@gfodor
Fix up forced entry mode
5e803c6
@gfodor
Link dialog working
880ad99
@gfodor
Rest of dialogs done
60c173d
@gfodor
Turn off testing for support
70d15fe
@gfodor
Merge masteR
67d4eb9
@gfodor
Refactor const names
9c9f3a4
@gfodor
Fix up comments
04d48c4
@gfodor
Refactor rename constant
28c3767
@gfodor
Translations for Back
f5549d6
@gfodor
Fix race condition on 2d now
9b8f067
@gfodor
Add hacky commands to test out scene update and room rename
35f19b1
@brianpeiris
isOwner instead of roles
ae8784f
@gfodor
Remove gltf-bundle component
309c9e2
@gfodor
Refactor initial load to support changing environment scene URL
bf0de69
@gfodor
WIP
2135cf8
@gfodor
Scene changing command works
2426620
@gfodor
Get /rename command working
300223e
@gfodor
Comment
1cb9b16
@gfodor
Remove logging
4f88edc
@brianpeiris
Merge branch 'master' of github.com:mozilla/hubs into feature/room-ow…
01a2637 
…nership
gfodor and others added 17 commits January 13, 2019 06:28
@gfodor
Remove unneeded code
53fc079
@gfodor
Bump timeout for force entry
b1024d2
@gfodor
Refactor
4b017c2
@gfodor
Fix mic flow
135371d
@gfodor
Fixes for Chrome
73068e8
@gfodor
Refactor and remove the need to keep track of previous history entry …
c17a0c3 
…by just calling goBack when a modal is closed
@gfodor
Fix for forced avatar picker flow
118622f
@gfodor
Fix for chrome for avatar picker flow
5315c07
@gfodor
Merge branch 'feature/react-router' of github.com:mozilla/hubs into f…
8c34484 
…eature/scene-update
@brianpeiris
Rename token to auth_token
60bd1c0
@brianpeiris
Merge branch 'feature/room-ownership' into feature/authed-scene-update
fd3ed31
@brianpeiris
Retrieve and decode permissions on join and sign-in. Enforce permissi…
e406fa9 
…ons on hub mutation commands.
@gfodor
Fix for dev
dfc8562
@gfodor
Fix refresh for dev
534f008
@brianpeiris
Merge branch 'master' of github.com:mozilla/hubs into feature/react-r…
0cc04b0 
…outer
@brianpeiris
Merge branch 'feature/react-router' into feature/scene-update
e767608
@brianpeiris
Merge branch 'feature/scene-update' into feature/authed-scene-update
f8c9bfc
@brianpeiris brianpeiris mentioned this pull request Jan 16, 2019
Closed
This was referenced Jan 16, 2019
Closed
Closed
@buildsize
Copy link

buildsize bot commented Jan 16, 2019

File name Previous Size New Size Change
avatar-selector.html 922 bytes 922 bytes 0 bytes (0%)
favicon.ico 33.69 KB 33.69 KB 0 bytes (0%)
hub-preview.png 16.5 KB 16.5 KB 0 bytes (0%)
hub.html 46.1 KB 46.1 KB 0 bytes (0%)
index.html 695 bytes 695 bytes 0 bytes (0%)
link.html 803 bytes 803 bytes 0 bytes (0%)
LoadingObject_Atom-[hash].glb 27.43 KB 27.43 KB 0 bytes (0%)
waternormals-[hash].jpg 242.98 KB 242.98 KB 0 bytes (0%)
bubble_off-[hash].png 4.22 KB 4.22 KB 0 bytes (0%)
bubble_off-hover-[hash].png 5.85 KB 5.85 KB 0 bytes (0%)
bubble_on-[hash].png 5.65 KB 5.65 KB 0 bytes (0%)
bubble_on-hover-[hash].png 5.46 KB 5.46 KB 0 bytes (0%)
create_object-[hash].png 8.38 KB 8.38 KB 0 bytes (0%)
create_object-hover-[hash].png 10.65 KB 10.65 KB 0 bytes (0%)
freeze_off-[hash].png 7.53 KB 7.53 KB 0 bytes (0%)
freeze_off-hover-[hash].png 9.96 KB 9.96 KB 0 bytes (0%)
freeze_on-[hash].png 7.36 KB 7.36 KB 0 bytes (0%)
freeze_on-hover-[hash].png 9.45 KB 9.45 KB 0 bytes (0%)
mute_off-[hash].png 2.76 KB 2.76 KB 0 bytes (0%)
mute_off-hover-[hash].png 3.65 KB 3.65 KB 0 bytes (0%)
mute_on-[hash].png 5.48 KB 5.48 KB 0 bytes (0%)
mute_on-hover-[hash].png 5.29 KB 5.29 KB 0 bytes (0%)
spawn_photo-[hash].png 3.14 KB 3.14 KB 0 bytes (0%)
tooltip.9-[hash].png 640 bytes 640 bytes 0 bytes (0%)
account-[hash].svg 826 bytes 826 bytes 0 bytes (0%)
daydream_entry-[hash].svg 6.47 KB 6.47 KB 0 bytes (0%)
default_thumbnail-[hash].png 3.02 KB 3.02 KB 0 bytes (0%)
desktop_screen_entry-[hash].svg 376 bytes 376 bytes 0 bytes (0%)
device_entry-[hash].svg 10.48 KB 10.48 KB 0 bytes (0%)
dropdown_arrow-[hash].png 172 bytes 172 bytes 0 bytes (0%)
dropdown_arrow@2x-[hash].png 233 bytes 233 bytes 0 bytes (0%)
gearvr_entry-[hash].svg 574 bytes 574 bytes 0 bytes (0%)
generic_vr_entry-[hash].svg 952 bytes 952 bytes 0 bytes (0%)
giphy_logo-[hash].png 1.02 KB 1.02 KB 0 bytes (0%)
level_background-[hash].png 4.03 KB 4.03 KB 0 bytes (0%)
level_background@2x-[hash].png 4.63 KB 4.63 KB 0 bytes (0%)
level_fill-[hash].png 1.03 KB 1.03 KB 0 bytes (0%)
level_fill@2x-[hash].png 2.02 KB 2.02 KB 0 bytes (0%)
logo-[hash].svg 14.21 KB 14.21 KB 0 bytes (0%)
mic_denied-[hash].png 2.02 KB 2.02 KB 0 bytes (0%)
mic_denied@2x-[hash].png 3.97 KB 3.97 KB 0 bytes (0%)
mic_granted-[hash].png 2.21 KB 2.21 KB 0 bytes (0%)
mic_granted@2x-[hash].png 4.26 KB 4.26 KB 0 bytes (0%)
mic_level-[hash].png 697 bytes 697 bytes 0 bytes (0%)
mic_level@2x-[hash].png 1.48 KB 1.48 KB 0 bytes (0%)
mic_small-[hash].png 234 bytes 234 bytes 0 bytes (0%)
mic_small@2x-[hash].png 370 bytes 370 bytes 0 bytes (0%)
mobile_screen_entry-[hash].svg 914 bytes 914 bytes 0 bytes (0%)
speaker_level-[hash].png 626 bytes 626 bytes 0 bytes (0%)
speaker_level@2x-[hash].png 1.29 KB 1.29 KB 0 bytes (0%)
warning_icon-[hash].png 442 bytes 442 bytes 0 bytes (0%)
warning_icon@2x-[hash].png 699 bytes 699 bytes 0 bytes (0%)
aframe-inspector.min-[hash].js 384.44 KB 384.44 KB 0 bytes (0%)
avatar-selector-[hash].js 54.97 KB 55.33 KB 362 bytes (1%)
avatar-selector-[hash].js.map 134.09 KB 134.47 KB 387 bytes (0%)
engine-[hash].js 1.41 MB 1.41 MB 73 bytes (0%)
engine-[hash].js.map 4.44 MB 4.44 MB 327 bytes (0%)
gifparsing.worker-[hash].js 1.92 KB 1.92 KB 0 bytes (0%)
gifparsing.worker-[hash].js.map 8.33 KB 8.33 KB 0 bytes (0%)
hub-[hash].js 464.1 KB 473.72 KB 9.62 KB (2%)
hub-[hash].js.map 1.2 MB 1.22 MB 23.56 KB (2%)
index-[hash].js 43.86 KB 53.95 KB 10.08 KB (23%)
index-[hash].js.map 89.64 KB 110.17 KB 20.53 KB (23%)
link-[hash].js 34.4 KB 34.75 KB 356 bytes (1%)
link-[hash].js.map 80.31 KB 80.69 KB 387 bytes (0%)
sketchfab-zip.worker-[hash].js 155.05 KB 155.05 KB 0 bytes (0%)
sketchfab-zip.worker-[hash].js.map 774.31 KB 774.31 KB 0 bytes (0%)
vendor-[hash].js 1.44 MB 1.79 MB 367.15 KB (25%)
vendor-[hash].js.map 4.94 MB 6.16 MB 1.22 MB (25%)
quack-[hash].mp3 7.03 KB 7.03 KB 0 bytes (0%)
specialquack-[hash].mp3 11.57 KB 11.57 KB 0 bytes (0%)
tone-[hash].mp3 53.92 KB 53.92 KB 0 bytes (0%)
tone-[hash].wav 385.29 KB 385.29 KB 0 bytes (0%)
tone-[hash].webm 32.04 KB 32.04 KB 0 bytes (0%)
tone-[hash].ogg 32.55 KB 32.55 KB 0 bytes (0%)
avatar-selector-[hash].css 1.15 KB 1.15 KB 0 bytes (0%)
avatar-selector-[hash].css.map 136 bytes 136 bytes 0 bytes (0%)
hub-[hash].css 88.68 KB 89.39 KB 734 bytes (1%)
hub-[hash].css.map 124 bytes 124 bytes 0 bytes (0%)
index-[hash].css 38.74 KB 40.29 KB 1.56 KB (4%)
index-[hash].css.map 126 bytes 126 bytes 0 bytes (0%)
link-[hash].css 6.1 KB 6.1 KB 0 bytes (0%)
link-[hash].css.map 125 bytes 125 bytes 0 bytes (0%)
home-[hash].mp4 2 MB 2 MB 0 bytes (0%)
home-[hash].webm 1.81 MB 1.81 MB 0 bytes (0%)
negx-[hash].jpg 54.45 KB 54.45 KB 0 bytes (0%)
negy-[hash].jpg 50.97 KB 50.97 KB 0 bytes (0%)
negz-[hash].jpg 53.29 KB 53.29 KB 0 bytes (0%)
posx-[hash].jpg 58.64 KB 58.64 KB 0 bytes (0%)
posy-[hash].jpg 19.17 KB 19.17 KB 0 bytes (0%)
posz-[hash].jpg 57.49 KB 57.49 KB 0 bytes (0%)
spawn_pen-[hash].png 2.39 KB 2.39 KB 0 bytes (0%)
spawn_pen-hover-[hash].png 3.07 KB 3.07 KB 0 bytes (0%)
spawn_camera-[hash].png 4.92 KB 4.92 KB 0 bytes (0%)
spawn_camera-hover-[hash].png 5.83 KB 5.83 KB 0 bytes (0%)
scene.html 1.92 KB 1.92 KB 0 bytes (0%)
scene-[hash].js 118.23 KB 118.3 KB 70 bytes (0%)
scene-[hash].js.map 291.2 KB 290.63 KB -579 bytes (0%)
scene-[hash].css 10.91 KB 10.91 KB 0 bytes (0%)
scene-[hash].css.map 126 bytes 126 bytes 0 bytes (0%)
camera_tool-[hash].glb 757.23 KB 757.23 KB 0 bytes (0%)
hub-preview-white-[hash].png 62.76 KB 62.76 KB 0 bytes (0%)
link_dialog_header-[hash].svg 950 bytes 950 bytes 0 bytes (0%)
moz-logo-black-[hash].png 1.71 KB 1.71 KB 0 bytes (0%)
hub-preview-light-no-shadow-[hash].png 9.35 KB 9.35 KB 0 bytes (0%)
spoke.html 1.42 KB 1.42 KB 0 bytes (0%)
spoke-[hash].js 16.71 KB 16.91 KB 205 bytes (1%)
spoke-[hash].js.map 27.9 KB 27.89 KB -12 bytes (0%)
spoke-[hash].css 6.32 KB 6.32 KB 0 bytes (0%)
spoke-[hash].css.map 126 bytes 126 bytes 0 bytes (0%)
spoke_logo-[hash].png 148.82 KB 148.82 KB 0 bytes (0%)
spoke_logo_black-[hash].png 45.87 KB 45.87 KB 0 bytes (0%)
twitter-[hash].svg 869 bytes 869 bytes 0 bytes (0%)
tap_mellow-[hash].wav 624 bytes 624 bytes 0 bytes (0%)
presence_desktop-[hash].png 252 bytes 252 bytes 0 bytes (0%)
presence_phone-[hash].png 237 bytes 237 bytes 0 bytes (0%)
presence_vr-[hash].png 558 bytes 558 bytes 0 bytes (0%)
hub.service.js 1.34 KB 1.34 KB 0 bytes (0%)
spoke-[hash].webm 5.52 MB 5.52 MB 0 bytes (0%)
spoke-[hash].mp4 6.27 MB 6.27 MB 0 bytes (0%)
action_button.9-[hash].png 2.08 KB 2.08 KB 0 bytes (0%)
spawn_message-[hash].png 625 bytes 625 bytes 0 bytes (0%)
share_camera_off-[hash].png 4.08 KB 4.08 KB 0 bytes (0%)
share_camera_on-[hash].png 6.58 KB 6.58 KB 0 bytes (0%)
share_camera_on-hover-[hash].png 4.44 KB 4.44 KB 0 bytes (0%)
share_screen_off-[hash].png 4.22 KB 4.22 KB 0 bytes (0%)
share_screen_on-[hash].png 6.66 KB 6.66 KB 0 bytes (0%)
share_screen_on-hover-[hash].png 6.8 KB 6.8 KB 0 bytes (0%)
share_window_off-[hash].png 4.13 KB 4.13 KB 0 bytes (0%)
share_window_on-[hash].png 6.62 KB 6.62 KB 0 bytes (0%)
share_window_on-hover-[hash].png 6.7 KB 6.7 KB 0 bytes (0%)
A_bendUp-[hash].wav 60.04 KB 60.04 KB 0 bytes (0%)
Eb_blip-[hash].wav 5.88 KB 5.88 KB 0 bytes (0%)
PenDraw1-[hash].wav 16.04 KB 16.04 KB 0 bytes (0%)
PenSpawn-[hash].wav 12.04 KB 12.04 KB 0 bytes (0%)
PicSnapHey-[hash].wav 120.04 KB 120.04 KB 0 bytes (0%)
quickTurn-[hash].wav 16.04 KB 16.04 KB 0 bytes (0%)
share_message-[hash].png 18.9 KB 18.9 KB 0 bytes (0%)
presence-count-[hash].png 1.78 KB 1.78 KB 0 bytes (0%)
pop-[hash].wav 192.54 KB 192.54 KB 0 bytes (0%)
tack-[hash].wav 40.84 KB 40.84 KB 0 bytes (0%)
suspense-[hash].wav 508.04 KB 508.04 KB 0 bytes (0%)
teleportArc-[hash].wav 184.04 KB 184.04 KB 0 bytes (0%)
welcome-[hash].wav 830.82 KB 830.82 KB 0 bytes (0%)
tick-[hash].wav 8.04 KB 8.04 KB 0 bytes (0%)
whats-new.html 721 bytes 721 bytes 0 bytes (0%)
whats-new-[hash].js 49.75 KB 49.75 KB 0 bytes (0%)
whats-new-[hash].js.map 240.13 KB 240.13 KB 0 bytes (0%)
whats-new-[hash].css 2.68 KB 2.68 KB 0 bytes (0%)
whats-new-[hash].css.map 130 bytes 130 bytes 0 bytes (0%)
generic_vr_headset-[hash].svg 950 bytes 950 bytes 0 bytes (0%)

@brianpeiris brianpeiris added the whats new Include this PR on the "What's New" page label Jan 17, 2019
@brianpeiris brianpeiris merged commit 260b935 into master Jan 17, 2019
@brianpeiris brianpeiris removed the whats new Include this PR on the "What's New" page label Jan 18, 2019
@snyk-bot snyk-bot mentioned this pull request Aug 19, 2022
Open
@MarcelRaschke MarcelRaschke mentioned this pull request Aug 19, 2022
Open
This was referenced Aug 19, 2022
Open
Open
@MarcelRaschke MarcelRaschke mentioned this pull request Aug 20, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brianpeiris @gfodor