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

9674 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
760f21b1d9 Put Tinter loop body in a try/catch 
So whatever other random ways this process fails in don't cause it
to take out the whole app.
 2018-04-12 12:23:33 +01:00
David Baker
5f2d9b6c54 Null check stylesheet href 
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
 2018-04-12 12:23:24 +01:00
Weblate
8a8a37cef0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-12 10:47:27 +00:00
RainSlide
1c7ff85a4c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 79.8% (807 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-04-12 10:47:26 +00:00
Matthew Hodgson
d0827586e6
Merge pull request #1676 from turt2live/travis/remove-presence 
Remove presence management
 2018-04-12 11:47:21 +01:00
Michael Telatynski
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
 2018-04-12 09:48:06 +01:00
Matthew Hodgson
8371774d13 move default ringtones over from riot-web 2018-04-12 00:25:36 +01:00
Matthew Hodgson
8ce4df7ce3 move non-Riot image resources over from riot-web 2018-04-12 00:25:07 +01:00
Matthew Hodgson
848403a0ab move default fonts over from riot-web 2018-04-12 00:24:51 +01:00
Matthew Hodgson
cdb5d489a4 organise themes (even light & dark) in the SDK layer 2018-04-12 00:24:22 +01:00
Matthew Hodgson
79d3cca6e9 move components' CSS to be in the same repo as their JS 2018-04-12 00:23:58 +01:00
Matthew Hodgson
70f3804227 move room directory logic over from riot-web 2018-04-11 23:58:46 +01:00
Matthew Hodgson
178fb647ad move notifications logic over from riot-web 2018-04-11 23:58:37 +01:00
Matthew Hodgson
8ab8f76254 move non-Riot-specific components over from riot-web 2018-04-11 23:58:04 +01:00
Travis Ralston
fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
Weblate
a2a7668840 Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 17:40:48 +00:00
David Baker
979452628f
Merge pull request #1835 from matrix-org/dbkr/fix_firefox_extension_death 
Null check stylesheet href
 2018-04-11 18:40:43 +01:00
David Baker
dbed29a7cc Put Tinter loop body in a try/catch 
So whatever other random ways this process fails in don't cause it
to take out the whole app.
 2018-04-11 18:31:54 +01:00
David Baker
91024007aa Null check stylesheet href 
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
 2018-04-11 18:20:40 +01:00
Weblate
e8e1fd933f Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 14:47:48 +00:00
Luke Barnard
ab578a5c0c
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y 
TopUnreadMessagesBar a11y
 2018-04-11 15:47:43 +01:00
Weblate
1f7ee7cf2c Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:55:35 +00:00
Luke Barnard
1c6c180908 Merge branch 'master' into develop 2018-04-11 11:55:24 +01:00
Luke Barnard
1adb82b985 v0.12.1 2018-04-11 11:54:54 +01:00
Luke Barnard
d392eef6a8 Prepare changelog for v0.12.1 2018-04-11 11:54:53 +01:00
Luke Barnard
478c2bab33 Bump js-sdk version to 0.10.0 2018-04-11 11:51:16 +01:00
Weblate
fd73e8ce9e Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:33:06 +00:00
Luke Barnard
428cae34eb Merge branch 'master' into develop 
(Releasing v0.12.0)
 2018-04-11 11:32:05 +01:00
Luke Barnard
87d0c4b45a v0.12.0 2018-04-11 11:31:31 +01:00
Luke Barnard
f4d3e6fabf Prepare changelog for v0.12.0 2018-04-11 11:31:30 +01:00
Weblate
6b9159f3fa Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:21:24 +00:00
Luke Barnard
d877384d64
Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave 
Use correct 1-1 room avatar after users leave
 2018-04-11 11:21:18 +01:00
Luke Barnard
a142f4405a Revert "Use GeminiScrollbarWrapper in Flair settings of UserSettings" 
This reverts commit 3b5fb3ae30.
 2018-04-11 10:41:11 +01:00
Matthew Hodgson
8b2446f803 rename createGroupButton to not be a total misnomer... 2018-04-11 10:24:28 +01:00
Luke Barnard
3b5fb3ae30 Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-11 10:09:49 +01:00
Weblate
d01751312a Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 08:45:23 +00:00
Tirifto
1eb732b22e Translated using Weblate (Esperanto) 
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/

Superflua akuzativo!
 2018-04-11 08:45:22 +00:00
David Baker
300e6877f5
Merge pull request #1833 from matrix-org/luke/fix-flair-settings-gemini-macOS 
Use GeminiScrollbarWrapper in Flair settings of UserSettings
 2018-04-11 09:45:14 +01:00
Tirifto
787e0f4558 Translated using Weblate (Esperanto) 
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/

»De via servilo« jam diras, ke temas pri certa URL. »La« ne  malĝustas, sed ankaŭ ne necesas (laŭ mi).
 2018-04-11 07:35:55 +00:00
Tirifto
522db0c0fd Translated using Weblate (Esperanto) 
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-04-11 07:35:19 +00:00
Luke Barnard
edb754b76b Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-10 18:08:19 +01:00
Luke Barnard
98c76a891c Change comments 2018-04-10 16:08:09 +01:00
Luke Barnard
b0818df329 Add 500ms delay to show membershipBusy for longer 
to avoid a UI that flashes quickly
 2018-04-10 16:08:02 +01:00
Weblate
ab6ac22a5d Merge remote-tracking branch 'origin/develop' into develop 2018-04-10 15:05:59 +00:00
Luke Barnard
1b01c30fce
Merge pull request #1832 from matrix-org/luke/delay-group-leave-or-join 
Add 500ms delay to show `membershipBusy` for longer
 2018-04-10 16:05:54 +01:00
Luke Barnard
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285 Add 500ms delay to show membershipBusy for longer 
to avoid a UI that flashes quickly
 2018-04-10 15:31:04 +01:00
Luke Barnard
f2e60b1526 v0.12.0-rc.7 2018-04-10 14:27:38 +01:00
Luke Barnard
b4ea03f823 Prepare changelog for v0.12.0-rc.7 2018-04-10 14:27:38 +01:00
Luke Barnard
f721038942 Reword group setting delay 2018-04-10 14:05:53 +01:00