Commit Graph

1449 Commits

Author SHA1 Message Date
Bill
de92fc97a9 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 19:05:09 -04:00
Bill
8b1e5dc552 Fix groups on profile 2022-03-16 19:05:07 -04:00
Bill
89efdb9068 Merge branch 'navigator-width-adjustment' into 'dev'
Adjustment to the width of the navigator

See merge request nitro/nitro-react!5
2022-03-16 22:37:32 +00:00
Bill
9a90abe1fc Merge branch 'dev' into 'dev'
disable camera publish option

See merge request nitro/nitro-react!11
2022-03-16 22:36:44 +00:00
Bill
b61ea0b409 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 18:18:48 -04:00
Bill
6516c0b1b1 Fix amount case for bubble alerts 2022-03-16 18:18:46 -04:00
Layne
e5fca84ef7 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 18:18:41 -04:00
Layne
d86b353950 %AMOUNT% fixed 2022-03-16 18:18:20 -04:00
Bill
87ef373e43 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 18:16:59 -04:00
Layne
ebbeb62bcb Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 18:16:29 -04:00
Layne
d721046675 wordquiz z-index 2022-03-16 18:16:21 -04:00
Bill
8b2d9dc098 Fix gift tags 2022-03-16 18:12:17 -04:00
Bill
cecac30562 Switch profile if you click another user 2022-03-16 18:01:57 -04:00
Bill
c27f4d7db1 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 17:46:07 -04:00
Bill
1097cb442e Fix purchasing wall items with extra data 2022-03-16 17:46:04 -04:00
Layne
4aacc61462 mod tools chatlog user click 2022-03-16 17:23:58 -04:00
Layne
545045fe46 Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 17:13:50 -04:00
Bill
d418de458a Merge branch 'dev' into 'dev'
Fixed signs order

See merge request nitro/nitro-react!10
2022-03-16 21:10:12 +00:00
Bill
9bb976a587 Fix trophy overflow 2022-03-16 17:09:25 -04:00
Layne
894f6ddb19 remove console log my bad 2022-03-16 17:03:56 -04:00
Layne
49199361e5 chat bubble clicking 2022-03-16 16:57:56 -04:00
Endrit
268e912c12 disable camera publish option 2022-03-16 21:39:58 +01:00
Bill
21082763ca Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev 2022-03-16 16:27:01 -04:00
Bill
60db79e423 Update card tabs 2022-03-16 16:26:58 -04:00
Layne
967811b84d mod tools alert_only room mod 2022-03-16 15:43:17 -04:00
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