Matthew Hodgson
bc60435750
improve settings layout and fix FF bugs
2016-01-24 18:15:08 +00:00
Matthew Hodgson
3da76192a1
title attr
2016-01-24 02:01:45 +00:00
Matthew Hodgson
f15564074c
track whether we're scrolled to bottom or not and display UI for warning & jumping there if needed.
2016-01-24 01:51:01 +00:00
Matthew Hodgson
24225af416
work around history visibility roomsetting UI some more
2016-01-22 17:01:15 +00:00
Matthew Hodgson
0a32874b39
oops, reset truncate state on hide, not collapse
2016-01-22 16:09:06 +00:00
Matthew Hodgson
0bef94a6ce
fudge around https://github.com/vector-im/vector-web/issues/731
2016-01-22 15:51:27 +00:00
Kegan Dougal
302c63058b
Invoke onShowMoreRooms to allow parents to kick their scrollbars..
2016-01-22 15:46:58 +00:00
Matthew Hodgson
0ee1892a0b
truncate room list
2016-01-22 15:31:42 +00:00
David Baker
4d4c6e06ec
Merge remote-tracking branch 'origin/develop' into unread_sync
2016-01-21 10:39:35 +00:00
David Baker
2d917910da
Merge pull request #556 from vector-im/notif_sync
...
Use unread count for room highlight state
2016-01-21 10:31:46 +00:00
David Baker
99a491bb0e
Merge pull request #68 from matrix-org/notif_sync
...
Set room highlight from unread_notification_count
2016-01-21 10:31:42 +00:00
David Baker
acce08194d
Apply patch to the right branch: update for new count format
2016-01-21 10:23:18 +00:00
David Baker
a08d00c672
Apply patch to the right branch: update for new count format
2016-01-21 10:20:45 +00:00
David Baker
1c54c64850
Merge pull request #99 from matrix-org/user_settings_on_register
...
Show user settings screen on registration
2016-01-21 10:11:28 +00:00
David Baker
a0cc3720a9
Merge pull request #106 from matrix-org/dbkr/dont_spam_read_receipts
...
Don't spam the same RR at the server until it acks it.
2016-01-21 10:01:30 +00:00
Matthew Hodgson
9bbb9f7b29
pretty invites!
2016-01-21 00:45:22 +00:00
Matthew Hodgson
deca90d0a7
fix up Start Chat behaviour as per Amandine's feedback
2016-01-21 00:16:10 +00:00
Matthew Hodgson
35c141cda9
reduce size of auxpanel when editing roomsettings
2016-01-20 23:09:36 +00:00
David Baker
ac2e69ba28
Use new unread count methods
2016-01-20 17:20:19 +00:00
Matthew Hodgson
442e090f37
button layout
2016-01-20 17:09:46 +00:00
Matthew Hodgson
76b7788ba6
usersettings rhs button
2016-01-20 17:07:00 +00:00
David Baker
0052fbd6cb
Don't spam the same RR at the server until it acks it.
2016-01-20 16:39:25 +00:00
David Baker
eb62456007
Update for new unread count format
2016-01-20 15:58:21 +00:00
David Baker
83634bf930
Update for new unread count format
2016-01-20 15:56:11 +00:00
Kegan Dougal
b296d05b35
Fix finally NPE
2016-01-20 15:38:34 +00:00
Kegan Dougal
8dc21ec837
Fix race condition when joining rooms
...
Problem: Hitting join on a room invite would show spinner, then join room screen
then the messages.
Cause: The UI to show a spinner is set via the "joining" flag. This flag was
only set for the duration of the /join HTTP request. This is insufficient
because it races with actual room info arriving from /sync. If this info does
not arrive before the /join HTTP request returns, "joining" is false but the
current membership state of the user is still invite.
Fix: The "joining" flag is still set when the /join HTTP request is made, but
it is only turned off when the join event arrives from /sync.
Extras: This fix should also work when joining a room not from an invite.
2016-01-20 15:25:40 +00:00
Matthew Hodgson
60a084bdbd
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:22:09 +00:00
David Baker
c4d4e9c46e
Terminate promise chain
2016-01-19 17:20:23 +00:00
David Baker
4ed130ceac
Implement adding email addresses to your profile.
2016-01-19 16:36:54 +00:00
Kegan Dougal
84608ba156
Fix syntax error
2016-01-19 16:18:08 +00:00
Matthew Hodgson
db7d863ce4
set autoPeekDone on finally
2016-01-19 15:18:16 +00:00
Matthew Hodgson
c29ec28dfd
fix layout for blunt join msgs
2016-01-18 20:15:12 +00:00
Matthew Hodgson
f22519f10c
factor out the peek rule calculation so that we can do it both onNewRoom and if there's a room already. I guess we could do it in react's onStateUpdate too
2016-01-18 20:05:33 +00:00
Matthew Hodgson
765174a600
merge conflict
2016-01-18 19:56:35 +00:00
Matthew Hodgson
491ba94230
WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted.
2016-01-18 17:39:23 +00:00
Matthew Hodgson
d6f6f32c74
WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now
2016-01-18 17:37:13 +00:00
manuroe
33edeccb43
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/component-index.js
# src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
David Baker
0ac997491e
Clarify comment
2016-01-18 14:23:31 +00:00
Matthew Hodgson
51648b9bf0
merge develop
2016-01-18 14:02:19 +00:00
Matthew Hodgson
6e3245a3b0
make linkify userid jump to memberinfo
2016-01-18 01:26:15 +00:00
Matthew Hodgson
f3aeda7af9
merge develop
2016-01-17 23:31:21 +00:00
Matthew Hodgson
1467aacfa4
support saving tag changes (untested)
2016-01-17 12:27:21 +00:00
Matthew Hodgson
5b5bd9aef1
remove create_room for now. lots of stupid bugfixes across the board.
2016-01-17 03:59:31 +00:00
Matthew Hodgson
82a159d651
make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board
2016-01-17 02:48:55 +00:00
David Baker
7045906d5d
Show user settings screen on registration instead of the PostRegister stuff.
2016-01-15 18:58:18 +00:00
David Baker
a90f63f72c
null check
2016-01-15 18:49:12 +00:00
David Baker
a849955c51
Merge pull request #93 from matrix-org/registration_field_validate
...
Do (more) client side validation of registration parameters.
2016-01-15 16:38:46 +00:00
Matthew Hodgson
f476150591
fix changeavatar to avoid duplicate click on label
2016-01-15 16:33:34 +00:00
Matthew Hodgson
293f5c7120
shrink auxpanel a bit for roomsettings
2016-01-15 15:53:53 +00:00
Matthew Hodgson
1fcb4ba94f
droptarget and usersettings and roomsettings layout tweaks
2016-01-15 15:26:00 +00:00