41dee71d38
Merge branch 'master' into develop
David Baker
2018-06-29 11:52:20 +01:00
2dc94ac277
v0.12.8
David Baker
2018-06-29 11:40:18 +01:00
66b17d9120
Prepare changelog for v0.12.8
David Baker
2018-06-29 11:39:35 +01:00
30ddc9610a
Released js-sdk
David Baker
2018-06-29 11:34:56 +01:00
a1fcff8bb8
Revert "affix copyButton so that it doesn't get scrolled horizontally"
Michael Telatynski
2018-06-25 16:31:43 +01:00
21978b18df
when the user switches room, close room settings this is especially annoying if they choose Leave Room which indirectly switches room
Michael Telatynski
2018-06-26 17:07:39 +01:00
c4b6b458f2
don't fire share dialog when clicking timestamp of event, it was tripping people up and broke search permalinks
Michael Telatynski
2018-06-26 16:59:49 +01:00
d91730d930
Translated using Weblate (Slovak)
Peter Vágner
2018-06-26 16:12:22 +00:00
10e39d5a5d
Merge pull request #2019 from matrix-org/t3chguy/room_settings_leave_room
David Baker
2018-06-26 17:15:19 +01:00
a548c83647
when the user switches room, close room settings this is especially annoying if they choose Leave Room which indirectly switches room
Michael Telatynski
2018-06-26 17:07:39 +01:00
19e948155c
Redact pathnames with origin file://
Luke Barnard
2018-06-26 17:06:12 +01:00
cef624d6be
Translated using Weblate (Slovak)
Peter Vágner
2018-06-26 15:52:27 +00:00
e1afe2a469
Translated using Weblate (Russian)
Andrey
2018-06-25 17:15:53 +00:00
b1b140d7aa
Translated using Weblate (Czech)
Marek Lach
2018-06-26 12:19:40 +00:00
1c6e5e1cc1
Merge pull request #2015 from matrix-org/dbkr/widgets_refactor
David Baker
2018-06-26 16:59:58 +01:00
67f803bc5f
don't fire share dialog when clicking timestamp of event, it was tripping people up and broke search permalinks
Michael Telatynski
2018-06-26 16:59:49 +01:00
4fb4589ebd
Translated using Weblate (Slovak)
Marek Lach
2018-06-26 12:14:37 +00:00
0ee8d18f5a
More code de-duping
David Baker
2018-06-26 16:41:44 +01:00
c780cd05a8
Change argument order of setRoomWidget
David Baker
2018-06-26 16:33:28 +01:00
a88297d7a6
More code reuse
David Baker
2018-06-26 16:27:17 +01:00
9539a749e5
More refactoring
David Baker
2018-06-26 16:03:58 +01:00
cb89406d3e
Indent
David Baker
2018-06-26 15:42:29 +01:00
4a39297e65
PR feedback
David Baker
2018-06-26 15:41:43 +01:00
c971b685ad
Translated using Weblate (German)
Krombel
2018-06-26 14:35:43 +00:00
0a6450507e
Bits of PR feedback
David Baker
2018-06-26 15:21:22 +01:00
b6f3b2f594
More code re-use
David Baker
2018-06-26 12:28:59 +01:00
ca8a4a0c3f
Remove unused function
David Baker
2018-06-26 12:08:33 +01:00
6cf11a15e6
Move WidgetUtils to utils dir
David Baker
2018-06-26 11:59:16 +01:00
0f2c47937c
Merge the two different widget utils files
David Baker
2018-06-26 11:52:21 +01:00
069080e7ed
lint
David Baker
2018-06-26 09:41:20 +01:00
abd37d141e
clear up if statement to make it more readable
Michael Telatynski
2018-06-26 07:54:38 +01:00
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist
Michael Telatynski
2018-06-26 07:51:16 +01:00