mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 17:51:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
10813 commits 219 branches 562 tags 474 MiB
Commit graph

10813 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
85a0736c78
update wording as per D4ve's feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 19:16:56 +01:00
Michael Telatynski
2c537a8dff
update styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 15:28:36 +01:00
Michael Telatynski
36ace9dcb9
using map-i18n remap all changed %(...)s => <...> to keep i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 15:21:44 +01:00
Michael Telatynski
6021c3a634
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev 2018-06-29 14:56:18 +01:00
Michael Telatynski
dddf7991b9
create map-i18n to aid with transforming the i18n entries not to waste them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 14:56:06 +01:00
Michael Telatynski
1d91469104
switch to <ClickableUsername> and use <a> over <span> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 14:52:25 +01:00
Jeff Huang
e93171831c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-06-29 13:14:54 +00:00
Weblate
00d6ac6c4b Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 10:52:40 +00:00
David Baker
41dee71d38 Merge branch 'master' into develop 2018-06-29 11:52:20 +01:00
David Baker
2dc94ac277 v0.12.8 2018-06-29 11:40:18 +01:00
David Baker
66b17d9120 Prepare changelog for v0.12.8 2018-06-29 11:39:35 +01:00
David Baker
30ddc9610a Released js-sdk 2018-06-29 11:34:56 +01:00
Michael Telatynski
a1fcff8bb8 Revert "affix copyButton so that it doesn't get scrolled horizontally" 2018-06-29 11:28:25 +01:00
Michael Telatynski
21978b18df when the user switches room, close room settings 
this is especially annoying if they choose Leave Room
which indirectly switches room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 11:28:15 +01:00
Michael Telatynski
c4b6b458f2 don't fire share dialog when clicking timestamp of event, 
it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 11:28:03 +01:00
Weblate
c3766181b5 Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 09:49:19 +00:00
David Baker
80a9bc3f2a
Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout 
Fix layout bug introduced by #2025
 2018-06-29 10:49:15 +01:00
Weblate
15506ab5e8 Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 09:46:52 +00:00
David Baker
b07a2cb09a
Merge pull request #2028 from matrix-org/luke/fix-room-settings-editable-text-resets 
Fix room topics/names resetting when UserSetting re-renders
 2018-06-29 10:46:48 +01:00
Weblate
9b9f744a44 Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 09:44:24 +00:00
Andrey
1539180cdc Translated using Weblate (Russian) 
Currently translated at 99.8% (1206 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-06-29 09:44:24 +00:00
David Baker
053a46a5e0
Merge pull request #2027 from matrix-org/luke/track-uisis-piwik-improved 
Improve tracking of UISIs
 2018-06-29 10:44:17 +01:00
Szimszon
fcc9479c1d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-06-29 08:56:33 +00:00
Luke Barnard
ad5f1bf180 Fix layout bug introduced by #2025 
Fixes https://github.com/vector-im/riot-web/issues/6958

(https://github.com/matrix-org/matrix-react-sdk/pull/2025)
 2018-06-29 09:46:01 +01:00
Luke Barnard
016e9176f6 Fix room topics/names reseting when UserSetting re-renders 
This reverts a fix to EditableText introduced in
    https://github.com/matrix-org/matrix-react-sdk/pull/1445
which introduced a bug that causes room name and topic to
reset when UserSettings is rerendered because
    `initialValue != this.value`

This also fixes the same bug originally fixed by #1445:
 >fix entering the same thing twice (which had the bug of not
 >emptying the "new" field)

which, in other words meant that clicking "+" when adding a room
alias would not reset the contents of the bottom-most alias in the
list.

The fix is to increment the `key` of the element, causing a new
instance to be mounted instead of passing new props to the existing
one.
 2018-06-28 18:11:52 +01:00
Luke Barnard
3846aef8a1 Alter docs, add comments 2018-06-28 16:06:12 +01:00
Luke Barnard
ab990d8cec Increase grace period to allow time for key sharing 2018-06-28 15:07:58 +01:00
Luke Barnard
01dd387970 Track UISIs in bulk 
Piwik supports sending an event value, which we can use to indicate
cardinality of UISIs to be tracked instead of tracking them individually.

This means we can track them at a lower frequency of (fairly arbitrary)
60s.
 2018-06-28 15:07:27 +01:00
Osoitz
fc841d2dc5 Translated using Weblate (Basque) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-28 07:12:38 +00:00
Kévin C
2e892fa399 Translated using Weblate (French) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-06-27 21:34:59 +00:00
Weblate
96877022ac Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 16:22:26 +00:00
David Baker
48f03bfd86
Merge pull request #2026 from matrix-org/dbkr/share_icons 
Replace share icons
 2018-06-27 17:22:21 +01:00
David Baker
7bce29db6e Replace share icons 
with ones that look a bit more like the actual logos those sites use now
 2018-06-27 17:17:44 +01:00
Krombel
b5266f0f51 Translated using Weblate (German) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-06-27 16:07:20 +00:00
Weblate
d3e90de328 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 14:40:25 +00:00
Andrey
239b973df3 Translated using Weblate (Russian) 
Currently translated at 99.8% (1205 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-06-27 14:40:24 +00:00
David Baker
74770acf73
Merge pull request #2025 from matrix-org/luke/fix-status-bar-consent-error 
Improve status bar errors (namely the consent error)
 2018-06-27 15:40:18 +01:00
Luke Barnard
66002a4c00 Fix status bar element positioning 2018-06-27 15:19:27 +01:00
Luke Barnard
8be173cae3 Show nicer error when receiving a consent error after sending a message 2018-06-27 15:17:57 +01:00
Weblate
0fe851585f Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 10:37:26 +00:00
Luke Barnard
a0871116d8
Merge pull request #2023 from matrix-org/luke/fix-copy-button-position 
Fix incorrectly positioned copy button on `<pre>` blocks
 2018-06-27 11:37:22 +01:00
Luke Barnard
6345fcb8f2 Fix incorrectly positioned copy button on <pre> blocks 2018-06-27 11:31:55 +01:00
Weblate
6fe889fae2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:40:22 +00:00
Luke Barnard
4c575bb1ca
Merge pull request #2018 from matrix-org/luke/fix-piwik-path-reporting 
Redact pathnames with origin `file://`
 2018-06-27 10:40:17 +01:00
Weblate
680b0fdd0e Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:33:45 +00:00
Luke Barnard
cf24427d12
Merge pull request #2022 from matrix-org/dbkr/update_package_lock 
Update package-lock.json
 2018-06-27 10:33:41 +01:00
Luke Barnard
483edb8211 pathname is not constant 2018-06-27 10:31:51 +01:00
Weblate
2c9dd9469e Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:29:26 +00:00
David Baker
6fb57c0c66
Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click 
on room sub list badge click goto first relevant room
 2018-06-27 10:29:22 +01:00
Weblate
fd40e21175 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:27:38 +00:00