Matthew Hodgson
d3d4768ff0
Merge pull request #2175 from matrix-org/travis/build-process
...
Split npm start into an init and watch script
2018-09-25 21:16:36 +01:00
Travis Ralston
c5a2e0b988
Split npm start into an init and watch script
...
This is to better support riot-web's build process without losing the functionality supplied by `npm start`. The watch script no longer performs an initial build and thus `start:init` has been created for this purpose.
2018-09-25 11:07:46 -06:00
Matthew Hodgson
1157320cba
s/canonical address/main address/g for consistency
2018-09-20 11:41:59 +01:00
Matthew Hodgson
a8d224736c
Merge pull request #2171 from matrix-org/matthew/canonical_aliases
...
show canonical aliases in timeline, and set/remove implicit ones
2018-09-20 10:34:12 +01:00
Matthew Hodgson
0f806d5b99
Merge branch 'develop' into matthew/canonical_aliases
2018-09-20 01:45:08 +01:00
Matthew Hodgson
e9806bb147
autocomplete domains on aliases
2018-09-20 01:38:25 +01:00
Matthew Hodgson
1aa85c69e4
fix vector-im/riot-web#7293
2018-09-20 01:23:29 +01:00
Matthew Hodgson
c6fa8ea24c
show canonical aliases in timeline, and set/remove implicit ones
2018-09-20 01:07:01 +01:00
Bruno Windels
b431292f6e
Merge pull request #2168 from matrix-org/bwindels/fixstalerr
...
Fix stale RR and improve LL reliability in RoomView & MemberList.
2018-09-19 13:35:17 +02:00
Bruno Windels
920e0d397c
Merge branch 'develop' into bwindels/fixstalerr
2018-09-19 12:15:41 +02:00
Bruno Windels
93d34e7b3d
fix lint
2018-09-19 12:00:29 +02:00
Bruno Windels
42c148f330
Merge pull request #2170 from matrix-org/bwindels/disablelle2etests
...
pass --travis flag to e2e tests to disable tests known not to work Travis CI
2018-09-19 11:05:05 +02:00
Bruno Windels
8d9850b7e7
pass --travis flag to e2e tests to disable tests known not to work on travis CI because of dinosaur ubuntu version
2018-09-19 10:57:47 +02:00
Bruno Windels
e951a22d31
fix tests
2018-09-18 17:09:14 +02:00
Matthew Hodgson
d39889e2cf
Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases
...
Add m.room.aliases to the timeline
2018-09-18 11:14:44 +01:00
Matthew Hodgson
ece041d059
fix NPE on name (related to LL?)
2018-09-18 00:16:25 +01:00
Matthew Hodgson
fc81dbbfad
remove i18n used by RoomAliasesEvent
2018-09-17 22:40:00 +01:00
Bruno Windels
8c4f4765df
remove initial parameter and show available members on invite instead
2018-09-17 20:03:01 +02:00
Bruno Windels
0727e0f8d3
mounted can be set straight in componentWillMount
2018-09-17 20:02:15 +02:00
Bruno Windels
e8b4770940
fix lint
2018-09-17 20:01:55 +02:00
Bruno Windels
841aa4b800
check LL with client as this takes server support into account
2018-09-17 19:28:06 +02:00
Bruno Windels
0ce7bb8995
pass membersLoaded state to TimelinePanel to force it to re-render
...
... once the members are loaded.
2018-09-17 19:27:25 +02:00
Matthew Hodgson
0e1a814d23
remove RoomAliasesEvent in favour of simpler textual event
2018-09-17 18:27:17 +01:00
Bruno Windels
473f2dd72b
pass room to _loadMembersIfJoined, it's called when newState not applied
...
_loadMembersIfJoined is called from
_onRoomLoaded < _onRoomViewStoreUpdate, before incoming state
from the store is applied to this.state, so looking up the room
with this.state.roomId doesn't always work, which would cause
the members not to be loaded. Pass in the room instead.
2018-09-17 19:24:34 +02:00
Bruno Windels
e0a789f77e
remove untrue comment, as we only load the members when joining
2018-09-17 19:21:22 +02:00
Bruno Windels
e1b9aa9626
better naming and document method
2018-09-17 19:20:26 +02:00
Matthew Hodgson
dc7212ec2b
switch back to simple TextForEvent
...
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
2018-09-17 18:20:12 +01:00
Bruno Windels
d276b17c2a
remove dead code
2018-09-17 19:19:07 +02:00
Bruno Windels
c3914d3493
show empty list as initial state instead of spinner
...
the spinner should only be shown when joined
2018-09-17 19:18:55 +02:00
Bruno Windels
2ed414494f
use Room.myMembership event instead of RoomMember.membership for me
...
This is more reliable with LL enabled as the syncing user is
only known when it was active in the current timeline
or when the members have been loaded
2018-09-17 19:14:52 +02:00
David Baker
f65126119f
Merge pull request #2165 from matrix-org/bwindels/fixllpeeking
...
postpone loading the members until the user joined the room
2018-09-17 10:21:57 +01:00
Matthew Hodgson
003083d9fc
fix plurals
2018-09-16 20:19:02 +01:00
Matthew Hodgson
a4b7348703
fix merge on i18n again
2018-09-16 19:11:11 +01:00
Matthew Hodgson
599697ca2f
fix merge on i18n
2018-09-16 19:08:31 +01:00
Matthew Hodgson
3b868064c7
merge in develop
2018-09-16 19:06:52 +01:00
Bruno Windels
86cbe34181
rerender after members are loaded so pills and RR get rerendered
2018-09-14 18:35:16 +02:00
David Baker
77d5daf9e3
Merge pull request #2166 from matrix-org/dbkr/allow_non_literal_translations
...
Allow translation tags object to be a variable
2018-09-14 15:42:54 +01:00
David Baker
e1394d592a
Allow translation tags object to be a variable
...
Don't try to validate the translation tags if it's not an object literal.
2018-09-14 14:11:59 +01:00
Bruno Windels
27c496aecb
remove unneeded async keywords
2018-09-14 13:55:47 +02:00
Bruno Windels
fe734b944e
remove obsolete warning as peeking will cause the membership to be null
2018-09-13 18:45:38 +02:00
Bruno Windels
f194f323f4
postpone loading the members until the user joined the room
...
when peeking, the members weren't being loaded at all because
the room wasn't available yet,
and the need for loading the members was never re-evaluated after that.
This only loads the members once the user has joined the room,
which also helps to avoid load all the members before an invite
is accepted.
2018-09-13 18:43:24 +02:00
David Baker
518be24a5b
Merge pull request #2164 from matrix-org/dbkr/dont_exit_fullscreen_when_not
...
Don't try to exit fullscreen if not fullscreen
2018-09-11 13:03:09 +01:00
David Baker
d3038ea765
Don't try to exit fullscreen if not fullscreen
...
This was causing annoying exceptions on latest Chrome. Use
document.fullScreenElement to detect if we're fullscreen and don't
try to exit if we aren't.
2018-09-11 11:31:24 +01:00
Bruno Windels
ecaabd6b75
Merge pull request #2161 from matrix-org/bwindels/dontupdatememberlistwhileloading
...
avoid updating the memberlist while the spinner is shown
2018-09-11 10:57:29 +02:00
David Baker
666c9a68e3
Merge pull request #2163 from matrix-org/bwindels/logllfailroomidcorrectly
...
fix logging room id when LL members fail
2018-09-11 09:54:29 +01:00
Bruno Windels
deaad4bcb1
even better as the method called is on room
2018-09-10 18:11:08 +02:00
Bruno Windels
694ee5a2c8
fix logging room id when LL members fail
2018-09-10 18:09:11 +02:00
Bruno Windels
2aaf3e6b89
dont assign member in getInitialState
2018-09-10 17:39:03 +02:00
Bruno Windels
92f7e29132
missed one {} -> [], fix e2e tests
2018-09-10 17:32:40 +02:00
Bruno Windels
f0e33dff24
Merge pull request #2162 from matrix-org/bwindels/dontspinaftermemberserror
...
dont keep the spinner in the memberlist when fetching /members fails
2018-09-10 17:31:31 +02:00
