Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,740 Commits 206 Branches 552 Tags 519 MiB
0838ef3299
Commit Graph

8740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Simó Albert i Beltran
52181fde95 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-09 12:24:48 +00:00
David Baker
3d174b0207 Merge branch 'release-v0.11.4' into develop 2018-02-09 12:24:36 +00:00
David Baker
3e4175f3e0 Add isUrlPermitted function 2018-02-09 12:20:05 +00:00
Osoitz
cf0d45a65b Translated using Weblate (Basque) 
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/eu/
 2018-02-09 10:28:52 +00:00
Марко М. Костић
16049bff3d 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-08 21:16:29 +00:00
Luke Barnard
c5da1015fe Do not truncate autocompleted users in composer 
so that disambiguation is possible at a glance.

Fixes https://github.com/vector-im/riot-web/issues/6024
 2018-02-08 17:47:36 +00:00
lukebarnard
9b0df19149 Make RoomListStore aware of sub list orderings 
so that it can do optimistic updates of ordered lists.
 2018-02-08 16:20:37 +00:00
Luke Barnard
21d70125e4 Dispatch MatrixActions synchronously 
Otherwise we risk blocking the dispatches on other work, and they
do not need to be done asynchronously.

This emerged as a bug where the room list appeared empty until
MatrixActions.sync dispatches all occured in one big lump, well
after the sync events being emitted by the js-sdk.
 2018-02-08 16:17:26 +00:00
Tulir Asokan
7a594ce08d Add seconds to formatFullDate() 
Fixes vector-im/riot-web#6055

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2018-02-08 18:09:04 +02:00
Weblate
8b693c08b7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-08 10:31:18 +00:00
Марко М. Костић
5cf3d3176f Translated using Weblate (Serbian) 
Currently translated at 91.1% (899 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-02-08 10:31:18 +00:00
Luke Barnard
754b7fbad5
Merge pull request #1737 from matrix-org/rav/roomview_unmounted 
RoomView: guard against unmounting during peeking
 2018-02-08 10:31:12 +00:00
Richard van der Hoff
5823b32ab1
RoomView: guard against unmounting during peeking 
it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
 2018-02-08 10:01:24 +00:00
Weblate
b3cd0d6da0 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 16:09:51 +00:00
David Baker
d51f6ceea2
Merge pull request #1736 from matrix-org/luke/fix-hs-is-urls-reset 
Fix HS/IS URL reset when switching to Registration
 2018-02-07 16:09:43 +00:00
lukebarnard
45ad46b468 Fix HS/IS URL reset when switching to Registration 2018-02-07 15:58:29 +00:00
Weblate
cc30f0c15a Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 12:04:39 +00:00
Robert A. Viana
34eae0fbde Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 67.0% (661 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2018-02-07 12:04:38 +00:00
Jeff Huang
8d21803df5 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2018-02-07 12:04:37 +00:00