Commit Graph

1374 Commits

Author SHA1 Message Date
twanadot
3009cef949 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2022-03-16 20:27:29 +01:00
Layne
6536b36514 optional sounds notif/resp 2022-03-16 15:23:39 -04:00
twanadot
a6d7b72b31 fixed signs order 2022-03-16 20:15:08 +01:00
Bill
c2bee696d2 Fix group members card height 2022-03-16 15:12:30 -04:00
Bill
7546479fab Add friend request close button 2022-03-16 14:52:05 -04:00
Bill
b881241071 Merge branch 'fix-see-furni-id-permission' into 'dev'
Fix issue: room owner can see furni ids

See merge request nitro/nitro-react!9
2022-03-16 18:39:27 +00:00
Bill
d3ebc259dc Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 14:38:12 -04:00
Bill
4025f41ddf Fix avatar editor failing to load some parts 2022-03-16 14:38:09 -04:00
dank074
d8d765a69b Merge branch 'endrit-dev' into dev 2022-03-16 13:34:51 -05:00
Snaiker
abd5828c1d Fix issue: room owner can see furni ids 2022-03-16 18:31:18 +00:00
Endrit
92ad096419 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 19:25:21 +01:00
Bill
a4af61392e Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 14:07:09 -04:00
Bill
db0894a185 Merge branch 'bugfix/select-room-model' into 'dev'
Fix select room model

See merge request nitro/nitro-react!2
2022-03-16 18:06:16 +00:00
Bill
de05736f1c Marketplace css update 2022-03-16 14:06:02 -04:00
Bill
ae349c4d05 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 14:01:43 -04:00
Bill
065bd5562d Merge branch 'marketplace-height-bug' into 'dev'
Fixes a height issue w/ marketplace items.

See merge request nitro/nitro-react!6
2022-03-16 18:01:28 +00:00
Bill
a26084b976 Fix css issue in room rights 2022-03-16 13:58:11 -04:00
Layne
7f3c5eb3d2 listen for open room creator 2022-03-16 13:56:52 -04:00
Bill
ca21e833c8 Fix infostand motto style 2022-03-16 13:34:51 -04:00
Bill
60fe9fe265 Fix alert 2022-03-16 13:15:28 -04:00
Bill
157f687170 Update NavigatorRoomInfoView 2022-03-16 12:47:34 -04:00
Bill
1547c40ff9 Fix width on seasonal currency 2022-03-16 12:36:46 -04:00
Bill
b556723c1a Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 12:25:21 -04:00
Bill
36663a8782 Disable CI for now 2022-03-16 12:25:19 -04:00
Layne
a02696de2d fixed thumbnail button 2022-03-16 12:06:24 -04:00
Endrit
a094206d66 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-16 17:01:55 +01:00
Layne
f85efea758 fix sound settings 2022-03-16 11:56:08 -04:00
Endrit
efa419ae37 fixed badge description 2022-03-16 16:25:41 +01:00
Sledmore
a51ca7682a Adds overflow hidden to marketplace own offers (scroll fix) 2022-03-16 15:14:45 +00:00
Sledmore
4d9e5974c5 Fixes a height issue w/ marketplace items. 2022-03-16 14:49:54 +00:00
jordy
0ee0e9a3f0 Adjusted the width of the navigator to be 30px wider. Some languagues got longer words and therefore would glitch the navigator. 2022-03-16 15:07:35 +01:00
Bill
d0145cc0ed Add rotate & state click on room previewer 2022-03-16 05:38:15 -04:00
Bill
ff46a89e79 Fix floorplan buttons 2022-03-16 05:32:53 -04:00
Bill
900bfc3bac Fix quantity input width 2022-03-16 05:25:45 -04:00
Bill
ef3b094a7c Allow html in bubble alerts 2022-03-16 05:22:58 -04:00
Bill
6394b9d2f4 Fix empty badge name & desc 2022-03-16 05:20:39 -04:00
Bill
6baa7207e1 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 05:00:55 -04:00
Bill
98fb0084d0 Update navigator settings 2022-03-16 05:00:35 -04:00
dank074
2d613df094 Merge branch 'clubgift-notification' into dev 2022-03-16 03:52:43 -05:00
Bill
10ae353c02 Remove size="sm" from buttons 2022-03-16 04:51:05 -04:00
dank074
7a152c9124 Merge branch 'dev' into clubgift-notification 2022-03-16 03:49:15 -05:00
Bill
6b4a9e36e6 Fix dumb dev mode issue 2022-03-16 04:43:52 -04:00
oshawott
75271eda7b Merge branch 'dev' into clubgift-notification 2022-03-16 03:40:21 -05:00
Bill
0d5ad1bc97 Fix button order 2022-03-16 03:31:05 -04:00
oshawott
4a0dd14ba4 Fix opening gift page from Club Gift notification
Didn't use the ui-config value for the HC gift page.
Opens blank catalogue.
2022-03-16 18:23:54 +11:00
Bill
079a57c012 Calendar change 2022-03-16 03:22:01 -04:00
Bill
1d17067b02 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 03:20:13 -04:00
Bill
53f8879fe1 Merge branch 'fix-calendar' into 'dev'
Fix calendar customImage

See merge request nitro/nitro-react!1
2022-03-16 07:19:54 +00:00
Bill
b9b5bafaf3 Add RoomEnterError listener 2022-03-16 02:58:36 -04:00
Bill
2a989bf6ce Fix catalog opening when reset 2022-03-16 02:29:18 -04:00