PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
9820 commits 1 branch 0 tags 338 MiB
Commit graph

9820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
0c1846630c Improve appearance of short-lived app loading spinner 
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
 2018-05-09 16:54:01 +01:00
Luke Barnard
7d0406b430
Merge pull request #1883 from matrix-org/luke/cement-sticker-messages 
Take feature_sticker_messagse out of labs
 2018-05-09 16:52:20 +01:00
Luke Barnard
bcf003757c
Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner 
Fix issue incorrect positioning with widget loading indicator
 2018-05-09 16:52:11 +01:00
Luke Barnard
59cbaf67bb Fix issue incorrect positioning with widget loading indicator 
by making sure to apply the correct CSS class to the parent
 2018-05-09 15:48:53 +01:00
Richard Lewis
c81e1ec535
Merge pull request #1879 from matrix-org/rxl881/widgetPermissions 
Users should always be able to edit their user/non-room  widgets
 2018-05-09 15:20:39 +01:00
Luke Barnard
e10e659457 Take feature_sticker_messagse out of labs 2018-05-09 14:59:35 +01:00
Luke Barnard
76a8b61772 Merge branch 'master' into develop 2018-05-09 13:31:42 +01:00
Richard Lewis
9ef0813da4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetPermissions 2018-05-09 12:03:47 +01:00
Luke Barnard
17598d09b7
Merge pull request #1881 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-05-09 11:59:52 +01:00
Richard Lewis
b930088b27 Bump travis-ci rebuild 2018-05-09 11:53:56 +01:00
Weblate
91b93921a9 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 10:50:48 +00:00
Kenneth Larsson
6fdd952510 Translated using Weblate (Swedish) 
Currently translated at 55.4% (651 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-09 10:50:47 +00:00
Andrey
edc70c9f11 Translated using Weblate (Russian) 
Currently translated at 99.7% (1171 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-05-09 10:50:47 +00:00
Sven Thomsen
8bddbea236 Translated using Weblate (German) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-05-09 10:50:47 +00:00
David Baker
a7f9f7ae3a
Merge pull request #1880 from matrix-org/luke/pin-lolex-at-2.3.2 
Pin lolex at 2.3.2 to avoid bug causing tests to fail
 2018-05-09 11:50:43 +01:00
Luke Barnard
3d20bd00a2 Pin lolex at 2.3.2 to avoid bug causing tests to fail 
See https://github.com/sinonjs/lolex/issues/170
 2018-05-09 11:43:02 +01:00
Richard Lewis
8e1ba6d139 Always allow users to edit their user widgets. 2018-05-08 22:44:49 +01:00
Richard Lewis
b5320444a9 Fix current user and creator user ID properties. 2018-05-08 22:05:53 +01:00
Krombel
8d2b5de4ff Translated using Weblate (German) 
Currently translated at 99.9% (1173 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-05-08 20:47:27 +00:00
Weblate
03c6d424bd Merge remote-tracking branch 'origin/develop' into develop 2018-05-08 13:16:06 +00:00
Peter Vágner
61343e8a70 Translated using Weblate (Slovak) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-05-08 13:16:05 +00:00
Luke Barnard
337af1643f
Merge pull request #1878 from matrix-org/t3chguy/m.relates_to 
Replies: un-break click-to-mention on SenderProfile for reply&preview
 2018-05-08 14:15:59 +01:00
Peter Vágner
def6329b6a Translated using Weblate (Slovak) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-05-08 10:30:36 +00:00
Osoitz
e5021f368b Translated using Weblate (Basque) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-05-08 09:26:45 +00:00
Weblate
cd45f400a8 Merge remote-tracking branch 'origin/develop' into develop 2018-05-08 08:50:18 +00:00
strix aluco
f76191b0a2 Translated using Weblate (Ukrainian) 
Currently translated at 22.5% (265 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-05-08 08:50:18 +00:00
Szimszon
961dc11a70 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-05-08 08:50:17 +00:00
RainSlide
03c7b7ef65 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-05-08 08:50:17 +00:00
Matthew Hodgson
afb9e1f5f4 blind fix to the overlapping sticker bug 2018-05-08 09:50:06 +01:00
Michael Telatynski
f0b7fd58b9
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-06 19:28:18 +01:00
Michael Telatynski
f68036a4fb
Replies: un-break click-to-mention on SenderProfile for reply&preview 
Fixes #6670

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-06 19:18:41 +01:00
Weblate
8fbc87b6cf Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 23:22:23 +00:00
Matthew Hodgson
8a1bd8da69 tell eslint to ignore viewAvatarOnClick being unused 2018-05-06 00:22:14 +01:00
Weblate
67b29bb02f Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 22:25:58 +00:00
Matthew Hodgson
500f58a963 fix deeply irritating react warning about viewAvatarOnClick on BaseAvatar 2018-05-05 23:25:50 +01:00
Weblate
d421c031fc Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 21:28:18 +00:00
Matthew Hodgson
af5be5c36c appease the fascist linter 2018-05-05 22:28:09 +01:00
Matthew Hodgson
ccd99f4a49 increase max-warnings temporarily 2018-05-05 22:27:54 +01:00
Weblate
a2c75e776a Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 21:08:48 +00:00
Matthew Hodgson
14bcfdd5c6 fix NPE 2018-05-05 22:08:37 +01:00
Weblate
287a0de1df Merge remote-tracking branch 'origin/develop' into develop 2018-05-04 12:58:03 +00:00
Kenneth Larsson
224e905cae Translated using Weblate (Swedish) 
Currently translated at 55.3% (650 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-04 12:58:03 +00:00
Jeff Huang
d4f4ebae14 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-05-04 12:58:02 +00:00
RainSlide
5691b78591 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-05-04 12:58:02 +00:00
Luke Barnard
aa370b3b67
Merge pull request #1877 from matrix-org/luke/test-room-list 
Add tests for RoomList
 2018-05-04 13:57:57 +01:00
Jeff Huang
91a68822ed Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-05-03 23:55:07 +00:00
Weblate
3cc21d5701 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 17:46:25 +00:00
Luke Barnard
b08abd3d8b
Merge pull request #1874 from matrix-org/luke/fix-analytics-crash 
Fix crash when browser doesn't report page change measurement
 2018-05-03 18:46:20 +01:00
Luke Barnard
3ba51ba695 Null check before accessing _paq 2018-05-03 18:25:00 +01:00
Weblate
5854b82074 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 17:14:22 +00:00