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

10289 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
a615616ed4 Merge remote-tracking branch 'origin/develop' into develop 2018-05-10 08:18:31 +00:00
Richard Lewis
e5c0b21a28
Merge pull request #1886 from matrix-org/rxl881/widgetFixes 
Fix 'state_key' field name.
 2018-05-10 09:18:26 +01:00
Luke Barnard
6a0bff6685 v0.12.4-rc.2 2018-05-09 17:34:54 +01:00
Luke Barnard
54fdb234d5 Prepare changelog for v0.12.4-rc.2 2018-05-09 17:34:53 +01:00
Luke Barnard
770e2d400e 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 17:28:41 +01:00
Luke Barnard
0a326dc6a0 Take feature_sticker_messagse out of labs 2018-05-09 17:28:29 +01:00
Luke Barnard
97b9316ec7 Fix issue incorrect positioning with widget loading indicator 
by making sure to apply the correct CSS class to the parent
 2018-05-09 17:28:18 +01:00
Weblate
bd2cf3bca8 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 16:12:19 +00:00
Luke Barnard
d304e0a0e7
Merge pull request #1885 from matrix-org/luke/feature-app-tile-spinner-delay2 
Improve appearance of short-lived app loading spinner
 2018-05-09 17:12:14 +01:00
Richard Lewis
44ea11d386 Fix 'state_key' field name. 2018-05-09 16:55:49 +01:00
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
Weblate
fe121d0952 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 15:52:26 +00: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
Weblate
60d85d3a44 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 15:52:16 +00: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
Weblate
147459d338 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 14:20:44 +00:00
Kenneth Larsson
cf77c9ea05 Translated using Weblate (Swedish) 
Currently translated at 58.0% (682 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 14:20:43 +00: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
ddf98705f2 v0.12.4-rc.1 2018-05-09 13:44:42 +01:00
Luke Barnard
7d0f6532ec Prepare changelog for v0.12.4-rc.1 2018-05-09 13:44:41 +01:00
Weblate
9fc3324f55 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 12:32:23 +00:00
Kenneth Larsson
76f1978721 Translated using Weblate (Swedish) 
Currently translated at 57.4% (674 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 12:32:23 +00: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
Michael Telatynski
ee0e6c5913
Remove margins when in a ReplyThread to stop them taking so much space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-09 11:53:37 +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