ee6789ed15
change aux order so room settings is top most, forwarding could go weird
...
if you clicked roomsettings whilst forwarding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:22:27 +01:00
baba2e12e2
fix weird indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:21:33 +01:00
ff9141e424
add a hideCancel flag as some things have own cancel etc on RoomHeader
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:20:41 +01:00
accc17a39a
Merge pull request #812 from t3chguy/forward_message
...
Message Forwarding
2017-05-28 02:37:31 +01:00
2d6bf5fa91
Remove messages with HTML formatting
...
The translations strings are not HTML and it gets escaped.
2017-05-25 20:04:28 +01:00
443ab1add7
Put back default strings on dialogs
...
But make them work by calling _t in render rather than
getDefaultProps().
Also sort out some 'Warning!' strings
2017-05-25 18:20:48 +01:00
5c359e63ab
Bulk change counterpart imports
...
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
d419c42a4f
Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801
2017-05-23 15:16:31 +01:00
cc7edbf86d
allow for sending arbitrary events, also override highlight with
...
event currently being forwarded while forwardingEvent is set
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 01:29:11 +01:00
a2ab36f598
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:33:36 +01:00
5e4467adce
hide settings/search appropriately
...
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE
if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:35:06 +01:00
9d92f93fcb
consolidate call onPageUnload handler into RoomView
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-03 16:39:19 +01:00
daae3bd1ec
warn on unload when uploading file(s)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-29 06:27:06 +01:00
8f7359fce1
Only show jumpToReadMarker bar when RM !== RR
...
If RM !== RR, use the pos. of the RM to determine whether it is visible, as before.
2017-04-27 14:03:54 +01:00
96e7479d8b
Show "jump to message" when message is not paginated
2017-04-25 17:19:36 +01:00
bfba25f3da
we don't care about rhs state anymore as we can just restore it sanely
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:10:14 +01:00
ee560a969a
upon forwarding message to current room, explicitly remove clear from aux
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 20:17:29 +01:00
fbca0e0d0d
correct cancel appearing when it shouldn't
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 20:03:07 +01:00
4285c395f5
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into forward_message
...
Conflicts:
src/components/structures/RoomView.js
2017-04-24 18:36:33 +01:00
a2be764681
display err.message to user if available in error msgs
2017-04-23 01:48:27 +01:00
33e841a786
move user settings outward and use built in read receipts disabling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 15:40:29 +01:00
fdc26a490a
On return to RoomView from auxPanel, send focus back to Composer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 18:45:28 +01:00
b6ca16fc2f
add RoomView state for message being forwarded
...
add RoomView action handler for message forward
clear forwardingMessage onCancelClick RoomView
change var into const in render RoomView
load ForwardMessage from rooms.ForwardMessage
if there is a messageForwarding object in state show panel in aux
Create ForwardMessage class
Modify RoomHeader so that it shows the cancel button more greedily
reskindex
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 13:50:22 +01:00
be9b858193
focus on composer after jumping to bottom
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 01:06:00 +01:00
4cebded04f
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 15:06:52 +00:00
17c9fcbb85
Merge branch 'develop' into luke/UDE-file-upload
2017-03-14 13:59:04 +00:00
3aaf37df1a
beautify a tonne more errors
2017-03-12 22:59:41 +00:00
71e0780eee
beautify search fail error
2017-03-12 22:24:16 +00:00
4f7914813d
Make UDD appear when UDE on uploading a file
...
This has highlighted the fact that an unsent image looks very much like a sent image (https://github.com/vector-im/riot-web/issues/3391 ). Also, the "Resend" status bar doesn't appear when an image is unsent.
2017-03-09 10:44:09 +00:00
0035a91596
Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time
...
Warn users about using e2e for the first time
2017-03-02 13:28:15 +00:00
b7bd93c613
var -> const
2017-03-01 15:55:15 +00:00
187c91b76a
Adjust warning message
2017-03-01 15:42:05 +00:00
6d296a0e7a
Warn users about using e2e for the first time
2017-03-01 15:41:13 +00:00
7221900497
Refactor remove resend_all_events and cancel_all_events dispatches
2017-02-27 13:39:12 +00:00
c13ff254b1
Add "Retry" button to UDE
2017-02-22 10:21:43 +00:00
8990e770b7
fix colouring in voip dark theme
2017-02-20 01:43:55 +02:00
de4773ba93
Show when you've been kicked or banned
...
Update the room state when you've been kicked or banned, and show
a message in the preview bar, including the reason.
2017-02-17 15:50:30 +00:00
b2344ceb74
Update the room view on room name change
2017-02-17 11:44:56 +00:00
103710728f
Do not show "+1 other"
...
Instead show a user name or avatar.
2017-02-09 10:30:06 +00:00
e825a4af3c
show better error msg after UnkDevDialog
...
should fix https://github.com/vector-im/riot-web/issues/3122
2017-02-03 00:45:33 +00:00
f462bd8f99
Expand status *area* unless status *bar* not visible ( #655 )
2017-01-26 18:07:42 +00:00
9c99dafba5
Guard onStatusBarVisible/Hidden with this.unmounted
2017-01-26 17:03:01 +00:00
e567162d28
Merge pull request #648 from matrix-org/rav/fix_set_displayname
...
Fix SetDisplayNameDialog
2017-01-25 14:32:52 +00:00
29b4dde878
Fix SetDisplayNameDialog
...
SetDisplayNameDialog got broken by the changes to support asynchronous loading
of dialogs.
Rather than poking into its internals via a ref, make it return its result via
onFinished.
Fixes https://github.com/vector-im/riot-web/issues/3047
2017-01-25 08:01:45 +00:00
7c66d1c867
Sync typing indication with avatar typing indication
...
Follow the same rules for displaying "is typing" as with the typing avatars.
2017-01-24 16:01:39 +00:00
a06ecb87bc
Hide RoomStatusBar when it displays nothing ( #615 )
...
Use CSS class `mx_RoomView_statusArea_expanded` to indicate an expanded status bar. Without this, the status bar may be hidden from view. A 10s debounce will prevent it from bouncing frequently.
2017-01-23 16:01:39 +01:00
18d4d3392a
Fix a bunch of linting errors
...
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
42de77e588
Remove "Cannot re-join empty room" error
...
This is a lying error message. burn it with fire
2016-12-27 19:17:48 +00:00
a008f5010a
Fix the ctrl+e mute camera shortcut
...
* Fixes the altgr+e shortcut on Windows
(Fixes https://github.com/vector-im/vector-web/issues/2561 )
* Fixes the shortcuts to be cmd+e on mac rather than ctrl+e
which is more normal and doesn't clobber ctrl+e which old
school unix types use for go-to-end-of-line.
2016-11-08 18:04:22 +00:00
cb5b311e44
Move saveScrollState into RoomView
...
It fits much more naturally here than in LoggedInView.
2016-11-04 09:28:35 +00:00
Michael Telatynski