OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
11,937 Commits
205 Branches
546 Tags
416 MiB
Commit Graph

11937 Commits (0bd1d6b778f9fc89e0f7e75557f8e7acf576be92)

Author SHA1 Message Date
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
random 7fcedbc65d Translated using Weblate (Italian) 
Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-09-14 15:00:51 +00:00
Weblate 8121fbe428 Merge remote-tracking branch 'origin/develop' into develop 2018-09-14 14:43:00 +00:00
Milena Brum 8ed411cd43 Translated using Weblate (Spanish) 
Currently translated at 99.7% (1249 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-14 14:42:59 +00:00
Victor Grousset 62c763da60 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-14 14:42:59 +00: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
Weblate b4815d1a07 Merge remote-tracking branch 'origin/develop' into develop 2018-09-11 12:03:14 +00: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
Weblate 1e6e82c3cf Merge remote-tracking branch 'origin/develop' into develop 2018-09-11 08:57:34 +00: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
Weblate e99f42a743 Merge remote-tracking branch 'origin/develop' into develop 2018-09-11 08:54:34 +00:00
Milena Brum cf591244e6 Translated using Weblate (Spanish) 
Currently translated at 99.6% (1248 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-11 08:54:34 +00: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
Weblate ca771ec912 Merge remote-tracking branch 'origin/develop' into develop 2018-09-10 15:31:37 +00: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
Weblate e5d334a4e8 Merge remote-tracking branch 'origin/develop' into develop 2018-09-10 15:30:48 +00:00
Kenneth Larsson 2f6b529eb3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-09-10 15:30:47 +00:00
Victor Grousset 1a4a22d13c 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-10 15:30:46 +00:00
Bruno Windels ab931e0f62
Merge pull request #2160 from matrix-org/bwindels/selfmembershipaction 
only dispatch an action for self-membership
 2018-09-10 17:30:41 +02:00
Bruno Windels dcc8a45aa1 add final return for clarity 2018-09-10 16:55:24 +02:00
Bruno Windels 5044d4f2d6 dont keep the spinner in the memberlist when fetching /members fails 2018-09-10 14:56:10 +02:00
Kenneth Larsson 78e258eb8d Translated using Weblate (Swedish) 
Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-09-10 12:19:09 +00:00
Weblate d0391a3f26 Merge remote-tracking branch 'origin/develop' into develop 2018-09-10 10:41:17 +00:00
Moo d3f86aad10 Translated using Weblate (Lithuanian) 
Currently translated at 68.0% (852 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2018-09-10 10:41:16 +00:00
Victor Grousset 39f56af21f 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-10 10:41:15 +00:00
David Baker 832a73d47a Merge branch 'master' into develop 2018-09-10 11:40:58 +01:00
David Baker 60e55594dd Merge branch 'release-v0.13.4' 2018-09-10 11:39:50 +01:00
David Baker 405f0bcf98 v0.13.4 2018-09-10 11:38:53 +01:00
David Baker bb37e36e71 Prepare changelog for v0.13.4 2018-09-10 11:38:52 +01:00
David Baker f99aef8ede js-sdk v0.11.0 2018-09-10 11:36:06 +01:00
Weblate 839d4ba41b Merge remote-tracking branch 'origin/develop' into develop 2018-09-09 17:38:31 +00:00
Matthew Hodgson ef20813f2e remove layering warnings 2018-09-09 18:38:21 +01:00
Weblate 88cc8f89d0 Merge remote-tracking branch 'origin/develop' into develop 2018-09-09 09:49:14 +00:00
Matthew Hodgson 86c92ee56d downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 2018-09-09 10:49:02 +01:00
Weblate 370223eace Merge remote-tracking branch 'origin/develop' into develop 2018-09-09 09:26:27 +00:00
Milena Brum 85df81b220 Translated using Weblate (Spanish) 
Currently translated at 99.6% (1248 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-09 09:26:27 +00:00