mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-10-05 12:31:22 +02:00
Code Issues Projects Releases Wiki Activity
41,965 Commits 297 Branches 611 Tags
Commit Graph

41965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
e15c581f6a Merge remote-tracking branch 'origin/develop' into develop 2018-09-20 09:34:18 +00:00
Victor Grousset
4d34f5f966 Translated using Weblate (Esperanto) 
Currently translated at 87.5% (1100 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-09-20 09:34:17 +00: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
Slavi Pantaleev
805c856324 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-09-20 08:14:16 +00: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
Weblate
abe6d72125 Merge remote-tracking branch 'origin/develop' into develop 2018-09-19 11:35:23 +00: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
random
909e4052bc Translated using Weblate (Italian) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-09-19 09:21:23 +00:00
Weblate
4d3afd1dc1 Merge remote-tracking branch 'origin/develop' into develop 2018-09-19 09:05:12 +00:00
Victor Grousset
1020580653 Translated using Weblate (Esperanto) 
Currently translated at 87.5% (1100 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-09-19 09:05:11 +00: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
64608af0b2
Merge pull request #26 from matrix-org/bwindels/disablelltests 
disable LL tests on travis CI
 2018-09-19 11:04:55 +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
13b20bb192 pass parameters through instead of hardcoding --travis 2018-09-19 10:56:39 +02:00
Kévin C
e5b151ea26 Translated using Weblate (French) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-09-18 21:48:21 +00:00
Szimszon
c2c735d521 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1257 of 1257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-09-18 18:48:51 +00:00
Bruno Windels
e951a22d31 fix tests 2018-09-18 17:09:14 +02:00
Bruno Windels
fec1447e8f
Merge pull request #28 from matrix-org/revert-25-bwindels/fixadminapiusage 
Revert "use patched synapse so admin rest api works with python 2.7.6"
 2018-09-18 16:52:05 +02:00
Bruno Windels
70eb480553
Revert "use patched synapse so admin rest api works with python 2.7.6" 2018-09-18 16:51:50 +02:00
Bruno Windels
6e9721523d
Merge pull request #27 from matrix-org/revert-24-bwindels/increaseservernoticetimeout 
Revert "increase timeout for server notices room"
 2018-09-18 16:51:34 +02:00
Bruno Windels
d47f782c21
Revert "increase timeout for server notices room" 2018-09-18 16:51:22 +02:00
Bruno Windels
cf397efed5 disable LL tests on travis CI 2018-09-18 16:50:33 +02:00
David Baker
5ba45a71e8 Remove SuggestKeyRestoreHandler 
Didn't end up using it for this iteration
 2018-09-18 15:32:33 +01:00
Bruno Windels
1c85536414
Merge pull request #25 from matrix-org/bwindels/fixadminapiusage 
use patched synapse so admin rest api works with python 2.7.6
 2018-09-18 16:11:44 +02:00
Bruno Windels
a84162ede8 use patched synapse so admin rest api works with python 2.7.6 2018-09-18 16:11:07 +02:00
David Baker
2cef0f7f72 lint 2018-09-18 15:04:51 +01:00
Weblate
042bbca473 Merge remote-tracking branch 'origin/develop' into develop 2018-09-18 10:14:50 +00: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
Bruno Windels
d1d886508b
Merge pull request #24 from matrix-org/bwindels/increaseservernoticetimeout 
increase timeout for server notices room
 2018-09-18 11:13:30 +02:00
Bruno Windels
0d86b82e3a increase timeout for server notices room 2018-09-18 11:13:02 +02:00
Bruno Windels
3de9f6efae
Merge pull request #23 from matrix-org/bwindels/restlogs 
spit out logs for creating REST users to figure out what is going on …
 2018-09-18 10:17:31 +02:00
Bruno Windels
42c1b95b7c spit out logs for creating REST users to figure out what is going on with the CI server 2018-09-18 10:17:03 +02:00
Weblate
c78ccd7856 Merge remote-tracking branch 'origin/develop' into develop 2018-09-17 23:16:36 +00:00
Moo
23c91f22ef Translated using Weblate (Lithuanian) 
Currently translated at 69.4% (870 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2018-09-17 23:16:35 +00:00
Victor Grousset
719f7c6d01 Translated using Weblate (Esperanto) 
Currently translated at 87.8% (1100 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-09-17 23:16:35 +00: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