wmwragg
4a2c899d05
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:22:26 +01:00
wmwragg
48a2567b82
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:19:30 +01:00
wmwragg
85084f5fd7
Fixed spacing on multiline messages
2016-08-19 16:46:15 +01:00
wmwragg
993333490d
Removal of the mini avatars for action (info) messages
2016-08-19 16:38:05 +01:00
wmwragg
78692c83a6
Removal of the mini avatars for action (info) messages
2016-08-19 16:37:45 +01:00
wmwragg
173e6011e8
Alignment tweak to the readAvatars
2016-08-19 11:12:06 +01:00
wmwragg
9e542ba232
Alignment adjustment so that the readAvatars sit in the center of the top line in a new message
2016-08-19 10:58:51 +01:00
wmwragg
5005675561
Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message
2016-08-18 22:50:40 +01:00
wmwragg
afd1ab1582
Comment to describe what info messages are
2016-08-18 22:19:23 +01:00
wmwragg
ddda435e9e
Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not
2016-08-18 22:15:53 +01:00
wmwragg
29759ca71e
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
2016-08-18 21:54:07 +01:00
wmwragg
a55c4a2a52
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
2016-08-18 21:53:37 +01:00
Aviral Dasgupta
be28a96d8d
add fancy changelog dialog
2016-08-18 22:53:47 +05:30
David Baker
d23ed642a0
Merge pull request #421 from matrix-org/dbkr/fix_mute_to_all_messages
...
Only try to delete room rule if it exists
2016-08-18 17:11:57 +01:00
David Baker
5495cfaca9
Only try to delete room rule if it exists
2016-08-18 16:59:25 +01:00
Matthew Hodgson
9b5e5c9acb
squidge video icon a bit
2016-08-18 16:48:28 +01:00
David Baker
fbbbd44dc3
Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:24:14 +01:00
Richard van der Hoff
e29be619c9
Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:23:45 +01:00
David Baker
d08f716681
Comment override rule stuff
2016-08-18 15:21:46 +01:00
David Baker
fc2c62e896
We can use the new consts here
2016-08-18 15:19:24 +01:00
David Baker
bab2f23db3
Oops, missed a constant
2016-08-18 15:18:02 +01:00
David Baker
af48b8920e
Various PR feedback
2016-08-18 14:00:14 +01:00
David Baker
0bb3eaaf67
Use constants
2016-08-18 13:46:47 +01:00
David Baker
9e45279894
Use enumalike thing
2016-08-18 13:44:58 +01:00
David Baker
e48d68a449
PR feedback
2016-08-18 13:11:57 +01:00
David Baker
73e486cc58
Hide red highlight badge in mute mode
2016-08-18 11:58:27 +01:00
wmwragg
67175c5a72
Positional tweaks, and font standardisation, so all browser now use ttf, so sizing is the same across all browsers
2016-08-18 11:15:42 +01:00
David Baker
dd088794c2
Remove the mute toggle from room settings
...
As it now incorrectly represents the mute as a binary toggle rather than a quad-state
2016-08-17 18:50:34 +01:00
David Baker
6b0aeefc66
RoomNotifs.js moved to react-sdk
...
Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing
2016-08-17 18:29:38 +01:00
David Baker
87f94bde62
Fix up notification setting listener in roomtile
...
The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere.
Also add util functions used here for getting the notif state and in vector for both getting and setting it.
2016-08-17 18:26:37 +01:00
Luke Barnard
46d306a217
Change register response access_token to scalar_token
2016-08-17 17:16:19 +01:00
Richard van der Hoff
69e8cb6f44
Merge branch 'rav/no_deviceload_if_disabled' into develop
2016-08-17 14:41:18 +01:00
Richard van der Hoff
0356f04b9c
MemberInfo: initialise _enableDevices in componentWillMount
...
... to avoid referencing it in render() before it is set
2016-08-17 14:40:10 +01:00
Aviral Dasgupta
e173900808
Update autocomplete design and scroll it correctly
2016-08-17 17:27:19 +05:30
Aviral Dasgupta
9a7f5388d9
Update autocomplete design
2016-08-17 17:27:01 +05:30
Richard van der Hoff
30168a1b9c
Don't download E2E devices if feature disabled
...
If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
2016-08-17 09:57:06 +01:00
wmwragg
d1649771cc
Images now slighlty set in so they don't appear under the context button, and give a margin to the right of the image
2016-08-16 17:41:54 +01:00
wmwragg
08e5f61b10
Image button now has cursor set to pointer
2016-08-16 17:41:09 +01:00
wmwragg
52f5061cc5
Made the menu button a clickable image rather than an input element
2016-08-16 17:34:33 +01:00
wmwragg
012f085f33
alignment tweaks and persistent highlight when meni clicked, plus menu button no longer an input item
2016-08-16 17:33:37 +01:00
wmwragg
9f570152e5
Altered message composer size to match that of the message timeline messages
2016-08-16 16:20:38 +01:00
wmwragg
3099ef68a9
Added linked message styling
2016-08-16 16:17:15 +01:00
wmwragg
58d9789645
Increase main avatar size
2016-08-16 16:03:34 +01:00
wmwragg
f0bac3a3b0
Design tweaks
2016-08-16 16:03:10 +01:00
David Baker
cd0ed879e3
Make the slider work
...
Still WIP though: need to make vector work with the 'contains display name' rule being an override
2016-08-16 15:54:28 +01:00
wmwragg
95418089f3
Updating timestamp format
2016-08-16 15:01:25 +01:00
wmwragg
8e8e6fd5fe
formatTime for use with new timestamp format
2016-08-16 15:01:01 +01:00
wmwragg
c359358101
Initial context menu positioning and style change
2016-08-16 11:59:26 +01:00
wmwragg
650a0f1c1f
Added context button, and initial highlighting and readReceipts positioning
2016-08-16 11:58:52 +01:00
wmwragg
757e885abc
Initial reposition of the read avatars
2016-08-16 10:59:04 +01:00
