OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,170 Commits
200 Branches
547 Tags
421 MiB
Commit Graph

9170 Commits (db9f50e814f57e53274ed0201fbd008389bf0746)

Author SHA1 Message Date
Weblate c68eb57798 Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 11:41:05 +00:00
David Baker ca763faf96
Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2 
Fix custom tags not being ordered manually
 2018-02-14 11:40:59 +00:00
Weblate eb4f5b76b3 Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 11:33:53 +00:00
David Baker 46b8fb9a19
Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets 
Store component state for editors
 2018-02-14 11:33:48 +00:00
Luke Barnard 3020c8cd94 Fix custom tags not being ordered manually 
Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
 2018-02-14 11:23:29 +00:00
Luke Barnard 47c232b5b3 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 11:00:27 +00:00
Weblate 480c046fb1 Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 10:31:43 +00:00
Simó Albert i Beltran db2f6f863a Translated using Weblate (Spanish) 
Currently translated at 58.1% (573 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-02-14 10:31:43 +00:00
Walter ed871cbd83 Translated using Weblate (Russian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-02-14 10:31:43 +00:00
Simó Albert i Beltran 02e0663409 Translated using Weblate (Catalan) 
Currently translated at 88.3% (871 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-02-14 10:31:42 +00:00
Ralitsa Bozhkova bee0a952c3 Translated using Weblate (Bulgarian) 
Currently translated at 0.2% (2 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-14 10:31:42 +00:00
David Baker 7cc82a682c
Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback 
Give the login page its spinner back
 2018-02-14 10:31:36 +00:00
Weblate 24c9a06c80 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 17:28:48 +00:00
Luke Barnard c670b76ec8
Merge pull request #1743 from matrix-org/luke/feature-tag-panel-tile-context-menu 
Add context menu to TagTile
 2018-02-13 17:28:43 +00:00
Ralitsa Bozhkova 06b18dda18 Added translation using Weblate (Bulgarian) 2018-02-13 17:23:42 +00:00
Luke Barnard a34fea8af8 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 16:51:00 +00:00
Weblate 8ae62b8526 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 16:15:55 +00:00
Luke Barnard e0d598fb19
Merge pull request #1748 from matrix-org/luke/fix-manually-ordered-custom-tagged-rooms 
If a tag is unrecognised, assume manual ordering
 2018-02-13 16:15:49 +00:00
Luke Barnard f16bc93fee If a tag is unrecognised, assume manual ordering 
(as we did previously)

Fixes https://github.com/vector-im/riot-web/issues/6135
 2018-02-13 16:09:17 +00:00
Luke Barnard 5af560f625 Make removedTags a Set for perf 2018-02-13 14:43:34 +00:00
Weblate 1cdb1d841d Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 14:18:52 +00:00
David Baker a0aa3df893
Merge pull request #1719 from matrix-org/luke/room-list-flux 
Move RoomList state to RoomListStore
 2018-02-13 14:18:46 +00:00
Luke Barnard 36e8bf1f20 Change CSS class for message panel spinner 
to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event
 2018-02-13 14:13:47 +00:00
Luke Barnard 8377abcd19 Store component state for editors 
to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".

Part of fixing https://github.com/vector-im/riot-web/issues/6019
 2018-02-13 12:01:36 +00:00
Luke Barnard 493116b17e Give the login page its spinner back 2018-02-13 11:43:22 +00:00
Luke Barnard db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
Weblate d28d7d8768 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 10:00:56 +00:00
David Baker 03921bad79
Merge pull request #1744 from matrix-org/luke/move-groups-button-tp 
Move groups button to TagPanel
 2018-02-13 11:00:49 +01:00
Luke Barnard 6d3634a06c Move groups button to TagPanel 2018-02-13 09:44:00 +00:00
Peter Vágner 5e9368e794 Add comments explaining our non standard usage of aria-described-by 2018-02-12 21:13:53 +01:00
Luke Barnard 322012cf88 Add comment to explain hacky optimism 2018-02-12 18:46:36 +00:00
Luke Barnard 3eeef064bf Remove unused asyncId 2018-02-12 18:37:54 +00:00
Luke Barnard 7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness 2018-02-12 18:35:13 +00:00
Luke Barnard e3f68f12c8 Add context menu to TagTile 
With two options: View Community and Remove, which
removes the tag from the panel.
 2018-02-12 18:01:08 +00:00
Weblate 66de16e31f Merge remote-tracking branch 'origin/develop' into develop 2018-02-12 10:23:14 +00:00
Oskars 0f5dc5a7e4 Translated using Weblate (Latvian) 
Currently translated at 96.5% (952 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
 2018-02-12 10:23:14 +00:00
David Baker b4aa9f37f6
Merge pull request #1738 from tulir/timestamp-hover-seconds 
Add seconds to timestamp on hover
 2018-02-12 11:23:08 +01:00
Aidan Gauland 0fd9b3e9b2 Avoid doubling up username in read receipt view 
In the ReadReceiptMarker title, use the RoomMember.rawDisplayName because
RoomMember.name may already include the username, which we are going to add
ourselves.
 2018-02-11 16:27:07 +13:00
Aidan Gauland 97ce84c8e3 Add display name to the read receipt view 
Show the user's display name (aka nick) in the ReadReceiptMarker
title (mouseover text), and then the user ID in parentheses.
 2018-02-11 16:14:17 +13:00
Weblate f2da24533c Merge remote-tracking branch 'origin/develop' into develop 2018-02-10 18:38:48 +00:00
Oskars e141075560 Translated using Weblate (Latvian) 
Currently translated at 90.3% (891 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
 2018-02-10 18:38:47 +00:00
Matthew Hodgson 40cee9bb02
Merge pull request #1739 from matrix-org/luke/fix-autocomplete-truncated-users 
Do not truncate autocompleted users in composer
 2018-02-10 18:38:43 +00:00
Richard Lewis 55593416fa Hide apps drawer when viewining room settings. 2018-02-09 13:23:34 +00:00
Weblate 70be1f4596 Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:34:56 +00:00
Tirifto 9dba4ab569 Translated using Weblate (Esperanto) 
Currently translated at 97.1% (958 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-02-09 12:34:55 +00:00
David Baker 100a5ba96a Merge branch 'master' into develop 2018-02-09 12:34:44 +00:00
David Baker 4bf5e44b20 v0.11.4 2018-02-09 12:34:00 +00:00
David Baker e9e0d65401 Prepare changelog for v0.11.4 2018-02-09 12:33:59 +00:00
Weblate 338c9f7fbd Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:24:49 +00:00
Марко М. Костић 22aedb6075 Translated using Weblate (Serbian) 
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-02-09 12:24:49 +00:00