OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,462 Commits
219 Branches
563 Tags
478 MiB
Commit Graph

5462 Commits (ea83d7eee229e50063d2e8803fc107cb8c1ae913)

Author SHA1 Message Date
Richard van der Hoff 27e5098e00 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-07 15:44:33 +01:00
Richard Lewis a09001933a git status 2017-06-07 15:39:27 +01:00
Richard van der Hoff c1151fd31c Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-07 15:37:38 +01:00
Luke Barnard d4041777f9 Merge pull request #937 from matrix-org/new-guest-access 
New guest access
 2017-06-07 13:39:57 +01:00
Luke Barnard 53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
David Baker d59b0e1595 Merge pull request #1048 from matrix-org/kegan/translation-gibbon 
Translate src/components/structures
 2017-06-07 12:01:52 +01:00
David Baker ccaa55d2c8 Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login 
Cancel 'join room' action if 'log in' is clicked
 2017-06-07 11:59:45 +01:00
David Baker 1dbdbc163b Cancel 'join room' action if 'log in' is clicked 
or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes https://github.com/vector-im/riot-web/issues/4217
 2017-06-07 11:55:24 +01:00
Stanislav N 558f67cb14 Translated using Weblate (Russian) 
Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
 2017-06-07 10:51:18 +00:00
Kegan Dougal 4127e7121c Translate src/components/structures 
Includes some pluralisation! Tested them manually to make sure they work.
 2017-06-07 11:40:46 +01:00
Michael Telatynski 0a2a782d63
track the action of opt-out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-07 11:26:52 +01:00
Michael Telatynski bd948ef915
for riot.im instances, track location.pathname 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-07 11:25:27 +01:00
Michael Telatynski 56df54f946
hardcode logged url to riot.im/app so piwik has a base to work with, it gets confused when a CustomURL isn't actually a URL (like it wasn't after the latest redaction fixes. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-07 11:17:57 +01:00
Richard Lewis c552f7f336 App icon styling 2017-06-07 10:55:49 +01:00
Pitchaya Boonsarngsuk fd8709e434 Translated using Weblate (Thai) 
Currently translated at 39.7% (329 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
 2017-06-07 08:58:53 +00:00
Stanislav N ccb058f4cf Translated using Weblate (Russian) 
Currently translated at 77.4% (641 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
 2017-06-07 08:58:52 +00:00
Szimszon f1fd4e5d26 Translated using Weblate (Hungarian) 
Currently translated at 3.1% (26 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
 2017-06-07 08:58:52 +00:00
Oliver Hunt 3d59d72aaa Fixed pagination infinite loop caused by long messages 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-07 04:49:41 +01:00
Richard Lewis f6f660fa9a Initial app icon tiles 2017-06-06 23:45:17 +01:00
Krombel 096edabd45 Translated using Weblate (German) 
Currently translated at 99.8% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-06 20:01:02 +00:00
Pitchaya Boonsarngsuk bc4c9ec4fd Translated using Weblate (Thai) 
Currently translated at 39.7% (329 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
 2017-06-06 19:48:18 +00:00
Bamstam 0f452062b1 Translated using Weblate (German) 
Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-06 19:48:15 +00:00
Matthew Hodgson 184c2d5e58 Merge pull request #1015 from matrix-org/t3chguy/random_fix_1 
fix copy and paste derp and rip out unused imports
 2017-06-06 18:02:35 +01:00
David Baker 9f15e8e152 Merge branch 'master' into develop 2017-06-06 17:41:05 +01:00
David Baker 31f1e421f2 v0.9.2 2017-06-06 17:40:30 +01:00
David Baker 5191f93432 Prepare changelog for v0.9.2 2017-06-06 17:40:30 +01:00
David Baker 00ccf4bb51 Revert "Call MatrixClient.clearStores on logout" 
This reverts commit c3d37c1ff9.

This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
 2017-06-06 17:33:50 +01:00
David Baker df6940c5f3 Merge pull request #1044 from matrix-org/luke/fix-password-recovery-landing 
Hotfix: Allow password reset when logged in
 2017-06-06 17:27:09 +01:00
Luke Barnard 205fd1fad4 Allow password reset when logged in 2017-06-06 17:22:49 +01:00
RiotTranslate 71c12b0615 Update from Weblate. (#1042) 
* Added translation using Weblate (Thai)

* Translated using Weblate (Thai)

Currently translated at 2.6% (22 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (Thai)

Currently translated at 8.9% (74 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (826 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Swedish)

Currently translated at 35.4% (293 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/

* Translated using Weblate (Thai)

Currently translated at 9.7% (81 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 76.9% (636 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (Hungarian)

Currently translated at 0.1% (1 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Thai)

Currently translated at 39.2% (325 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-06 16:44:28 +01:00
Kegsay 5c1866c1c6 Add get_membership_count scalar API (#1043) 2017-06-06 16:41:08 +01:00
Richard Lewis e8353edb06 Disable test postmessag 2017-06-06 15:57:40 +01:00
Bamstam 1efd3513f2 Translated using Weblate (German) 
Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-06 14:16:53 +00:00
Richard Lewis e9f110a4c5 Don't show add widget if there are more than one existing widgets 2017-06-06 14:50:43 +01:00
RiotTranslate 99178b7932 [WEBLATE] fix th.json merge issues 2017-06-06 13:11:24 +00:00
Kegsay 0b56d33bd2 Null guard all interpolated strings passed to _t (#1035) 2017-06-06 13:56:37 +01:00
Pitchaya Boonsarngsuk 503302fcea Translated using Weblate (Thai) 
Currently translated at 39.2% (325 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
 2017-06-06 11:42:29 +00:00
Vladi 1ad9e6e6fa Translated using Weblate (Russian) 
Currently translated at 76.9% (636 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
 2017-06-06 11:42:28 +00:00
Szimszon da2cca539f Translated using Weblate (Hungarian) 
Currently translated at 0.1% (1 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
 2017-06-06 11:42:28 +00:00
Bitti ccafdfd7d3 Translated using Weblate (German) 
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-06 11:42:25 +00:00
Oliver Hunt dd6171a39e Review changes 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-06 12:34:03 +01:00
Oliver Hunt a640e943f7 Added button that copies code to clipboard 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-06 12:33:44 +01:00
David Baker 9c30de0eaa Merge pull request #1041 from matrix-org/dbkr/reset_first_sync_promise 
Reset 'first sync' flag / promise on log in
 2017-06-06 11:43:28 +01:00
David Baker c27f50207d comment 2017-06-06 11:43:07 +01:00
David Baker 12d2480916 Reset 'first sync' flag / promise on log in 
Otherwise on any logins after the first,we always think the first
sync has completed.
 2017-06-06 11:36:33 +01:00
David Baker 22df03944c Merge branch 'develop' into new-guest-access 2017-06-06 10:35:28 +01:00
David Baker f8198ba9c9 Merge branch 'develop' into new-guest-access 2017-06-06 10:33:01 +01:00
David Baker e7af9bde23 Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again 
Remove DM-guessing code (again)
 2017-06-06 10:20:44 +01:00
Matthew Hodgson ed7c138d91 quick and dirty override to disable MD globally 2017-06-05 21:38:25 +01:00
Matthew Hodgson d77a09adba quick and dirty override to disable MD globally 2017-06-05 21:33:01 +01:00