Michael Telatynski
4b34a2b169
modernize imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-15 19:57:48 +01:00
Michael Telatynski
a0a4fe62d5
make hide joins/parts work for MELS and highlighted/permalink event
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-15 19:53:34 +01:00
Michael Telatynski
c1cbdbcc4f
Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/UserSettings.js
2017-06-12 13:22:52 +01:00
Richard van der Hoff
cc74a09abd
Remove start_upgrade_registration dispatch handler
...
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
Richard van der Hoff
e6d7eedbe6
Remove NeedToRegisterDialog
...
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
Richard van der Hoff
9e96e8e87f
Remove guest-only bits of UserSettings
...
There is now no way to open UserSettings as a guest, so we might as well lose
the dead code.
2017-06-12 08:36:41 +01:00
Richard van der Hoff
56efe7d2f2
Merge pull request #1064 from matrix-org/rav/delinting
...
Delinting
2017-06-12 08:34:58 +01:00
Will Hunt
3ddbf83c62
Add userid back
2017-06-11 07:13:50 +01:00
Will Hunt
f940d2c100
Add reason for ban in room settings
2017-06-10 16:57:09 +01:00
Matthew Hodgson
3b7ce49eab
Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons
...
adds mx_filterFlipColor so that the dark theme will invert this image
2017-06-10 01:06:31 +01:00
Michael Telatynski
34caf5586f
adds mx_filterFlipColor so that the dark theme will invert this image
...
making it more suitable for the said theme
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-10 00:08:40 +01:00
Matthew Hodgson
a4a0acc28d
fullstop fails
2017-06-09 22:19:14 +01:00
Luke Barnard
ecc8abbfc9
When ChatCreateOrReuseDialog is cancelled by a guest, go home
2017-06-09 13:46:45 +01:00
David Baker
924c08b143
Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room
...
Goto /home when forgetting the last room
2017-06-09 11:03:14 +01:00
Luke Barnard
19bb879fbf
Handle only 1 room in the list
2017-06-09 10:54:42 +01:00
Luke Barnard
c7229967a6
Goto /home when forgetting the last room
2017-06-09 10:28:45 +01:00
Luke Barnard
a21b6e61a6
Default to home page when settings is closed
...
If the current room isn't set.
2017-06-09 10:08:26 +01:00
Richard van der Hoff
105c6b2b87
delint MatrixChat
...
once more. with feeling.
2017-06-09 03:09:03 +01:00
Richard van der Hoff
20bdae6079
delint UserSettings.js
2017-06-09 03:08:57 +01:00
Luke Barnard
ce0977373e
Merge pull request #1058 from matrix-org/luke/fix-event-id-state
...
Control currently viewed event via RoomViewStore
2017-06-08 18:10:29 +01:00
Luke Barnard
5588e115eb
Clarify doc for highlighted
2017-06-08 17:57:37 +01:00
Luke Barnard
9892566007
Highlighted means highlighted
2017-06-08 17:54:41 +01:00
Matthew Hodgson
df625b0d31
hit MemberInfo with Gemini to fix vector-im/riot-web#4223
2017-06-08 17:26:40 +01:00
Luke Barnard
c02dbd1cdc
Rename initial state variables
2017-06-08 17:26:08 +01:00
David Baker
3d59fe58dc
Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message
...
Better error messages for login
2017-06-08 16:57:40 +01:00
David Baker
5e55b6a643
PR feedback
2017-06-08 16:23:43 +01:00
David Baker
9def0bb5c2
Oops, fix email check
2017-06-08 16:08:19 +01:00
David Baker
8dc20606c8
Use comma for list of three things
2017-06-08 16:07:29 +01:00
Luke Barnard
000a045e35
Rename RVS state (event -> initialEvent) and redocument
2017-06-08 15:52:21 +01:00
David Baker
d691c891e7
Move all login error string generation into view
...
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
2017-06-08 15:49:48 +01:00
Luke Barnard
1792fa45f4
Null-guard roomId before sending a dispatch to update scroll state
...
Otherwise we pointlessly assign the null key to something
2017-06-08 15:45:50 +01:00
Luke Barnard
59e649f326
Add comment about roomId potentially not being resolved following an update from RoomViewStore
2017-06-08 15:43:45 +01:00
Luke Barnard
e58e4db628
Explain why search results are cleared when eventId changes
2017-06-08 15:38:58 +01:00
Luke Barnard
dca2be6325
Add RoomView initial state and docs
2017-06-08 15:37:30 +01:00
Luke Barnard
2e82bf40fb
Explain setting of highlighted in room/$eventId showScreen handling.
2017-06-08 15:34:20 +01:00
Luke Barnard
8ddc38c9b1
Doc _viewRoom highlighted
2017-06-08 15:32:31 +01:00
Luke Barnard
aa20ad706e
Remove redundant currentRoomAlias
2017-06-08 15:30:43 +01:00
Matthew Hodgson
f26aeef2bf
Merge pull request #1056 from matrix-org/kegan/translation-tamarin
...
Add remaining translations
2017-06-08 15:06:26 +01:00
Kegan Dougal
9baaf5499f
Linting
2017-06-08 14:58:54 +01:00
David Baker
71eb405859
Add comments & remove redundant check
2017-06-08 14:53:21 +01:00
Kegan Dougal
f2efdf8a4f
Review comments
2017-06-08 14:45:59 +01:00
David Baker
b40636a425
Merge pull request #1040 from ollieh/issues/1974
...
Added button that copies code to clipboard
2017-06-08 14:45:58 +01:00
Matthew Hodgson
c173861b27
Merge pull request #1021 from Bitim/feature/rtl-languages-support
...
Better RTL support
2017-06-08 14:43:18 +01:00
Kegan Dougal
e3ac78bd28
Self-review
2017-06-08 14:36:20 +01:00
Luke Barnard
ea97d16aa2
Merge branch 'develop' into luke/fix-event-id-state
...
Conflicts:
src/components/structures/MatrixChat.js
2017-06-08 14:33:58 +01:00
Luke Barnard
f320f7d475
Remove redundant action id
2017-06-08 14:30:45 +01:00
Matthew Hodgson
29e792b642
make mels emoji capable
2017-06-08 14:21:14 +01:00
Kegan Dougal
c57823a31d
Merge branch 'develop' into kegan/translation-tamarin
2017-06-08 14:19:56 +01:00
Luke Barnard
d3cf78ff5a
Control currently viewied event via RoomViewStore
...
Fix for https://github.com/vector-im/riot-web/issues/4224
Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).
This required a few changes:
- The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
- The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
2017-06-08 14:17:49 +01:00
David Baker
6d1fa775a0
Formatting
2017-06-08 14:14:45 +01:00
