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

6900 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
668e096194 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-09-19 16:36:51 +01:00
Luke Barnard
7414d4d1f9 Fix issue with "props.aux" being inserted instead of e.g. "sent an image" 2017-09-19 16:36:30 +01:00
carlos-am
077d4aafe2 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-09-19 15:06:24 +00:00
carlos-am
d221b20721 Translated using Weblate (Portuguese) 
Currently translated at 99.1% (848 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-09-19 15:00:08 +00:00
David Baker
d38e950f8b Merge pull request #1400 from matrix-org/dbkr/flair_bluebird 
Fix promise error in flair
 2017-09-19 16:00:02 +01:00
David Baker
80e0205b78 Fix promise error in flair 
Import bluebird other wise it gets a native promise on my dev box
which does not have a finally method
 2017-09-19 15:53:54 +01:00
carlos-am
4d127db358 Translated using Weblate (Portuguese) 
Currently translated at 92.7% (793 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-09-19 14:05:44 +00:00
Luke Barnard
b4ed9d7c87 Merge pull request #1351 from matrix-org/luke/feature-flair 
Flair!
 2017-09-19 15:05:40 +01:00
Luke Barnard
5295d7f058 Merge branch 'develop' into luke/feature-flair 2017-09-19 14:55:54 +01:00
carlos-am
6352e5cca6 Translated using Weblate (Portuguese) 
Currently translated at 91.6% (784 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-09-19 13:54:14 +00:00
Luke Barnard
a1e3115046 Merge pull request #1328 from matrix-org/dbkr/group_userlist 
Group Membership UI
 2017-09-19 14:54:08 +01:00
Luke Barnard
e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +01:00
Luke Barnard
61a0f1ef67 Fix ugly integration button, use hover to show error 
This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).
 2017-09-19 11:57:23 +01:00
David Baker
620ca5f211 v0.10.4-rc.1 2017-09-19 10:50:34 +01:00
David Baker
fba66557b5 Prepare changelog for v0.10.4-rc.1 2017-09-19 10:50:33 +01:00
David Baker
d992d6937e js-sdk rc.1 2017-09-19 10:47:18 +01:00
Stefan Parviainen
3e7e7987ba Translated using Weblate (Finnish) 
Currently translated at 88.1% (754 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-09-19 09:34:43 +00:00
David Baker
658285ebbf Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined 
Fix RoomView stuck in 'accept invite' state
 2017-09-19 10:34:39 +01:00
David Baker
4d8eadad4f Clarify comment 2017-09-19 10:21:20 +01:00
Stefan Parviainen
0c8a31d9e9 Translated using Weblate (Finnish) 
Currently translated at 73.2% (626 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-09-18 18:27:44 +00:00
Luke Barnard
925cb2dccf Do translation correctly 2017-09-18 17:44:13 +01:00
Luke Barnard
241d442284 Fail gracefully for non-supporting servers 2017-09-18 15:12:38 +01:00
Luke Barnard
6add06db44 Fix big with rejecting promises upon error 2017-09-18 15:11:49 +01:00
Luke Barnard
26941e994f Merge branch 'develop' into luke/feature-flair 2017-09-18 14:46:50 +01:00
Luke Barnard
3476cfca79 getPublicGroups->getPublicisedGroups 
To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542
 2017-09-18 14:44:35 +01:00
Luke Barnard
548e5f516c Put flair into labs 2017-09-18 14:38:41 +01:00
Max Sandholm
35cdea44bd Translated using Weblate (Swedish) 
Currently translated at 52.6% (450 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2017-09-18 12:42:16 +00:00
Stefan Parviainen
ff503fce3b Translated using Weblate (Finnish) 
Currently translated at 59.7% (511 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-09-18 12:42:16 +00:00
David Baker
0958689d25 Merge pull request #1398 from matrix-org/luke/fix-ugly-manage-integs-button 
Only show the integ management button if user is joined
 2017-09-18 13:42:11 +01:00
Luke Barnard
caaf5cca14 Only show the integ management button if user is joined 2017-09-18 13:34:33 +01:00
Stefan Parviainen
add9f69497 Translated using Weblate (Finnish) 
Currently translated at 59.7% (511 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-09-18 07:29:33 +00:00
Jeff Huang
1639e64328 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2017-09-18 01:10:41 +00:00
Matthew Hodgson
09e6ea00c5 Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget 
suppressOnHover for member entity tiles which have no onClick
 2017-09-17 23:19:35 +01:00
Matthew Hodgson
678a6c56b4 Merge pull request #1268 from matrix-org/t3chguy/devtools 
add /devtools command
 2017-09-17 23:16:04 +01:00
Matthew Hodgson
b93f1746c0 Merge pull request #1359 from rponline/master 
Fix broken Link
 2017-09-17 23:06:06 +01:00
Matthew Hodgson
141ae916ce Merge pull request #1387 from turt2live/travis/tooltip_redacter 
Show who redacted an event on hover
 2017-09-17 22:36:18 +01:00
Matthew Hodgson
b06d540f4c Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded 
start MELS expanded if it contains a highlighted/permalinked event.
 2017-09-17 22:09:44 +01:00
Matthew Hodgson
6a53b7b149 Merge pull request #1389 from turt2live/travis/ignored_users 
Add ignore user API support
 2017-09-17 22:05:02 +01:00
Travis Ralston
2605004edb Update ignored users when js-sdk on UserSettings on change 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-17 15:04:03 -06:00
Matthew Hodgson
9e77d1b763 tweak comment 2017-09-17 21:50:24 +01:00
Matthew Hodgson
bc565ba925 Merge pull request #1392 from turt2live/travis/no_emoji 
Add option to disable Emoji suggestions
 2017-09-17 21:40:43 +01:00
ErCiccione
3903f5a413 Translated using Weblate (Italian) 
Currently translated at 7.3% (63 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2017-09-17 20:40:00 +00:00
Jan Kudrik
93f404081b Translated using Weblate (Czech) 
Currently translated at 44.4% (380 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-09-17 20:40:00 +00:00
Matthew Hodgson
9449813238 Merge pull request #1397 from matrix-org/t3chguy/i18n-1 
sanitize the i18n for fn:textForHistoryVisibilityEvent
 2017-09-17 21:39:56 +01:00
Michael Telatynski
2d6bbafccd
remove unused strings since base branch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:44:16 +01:00
Michael Telatynski
e565882ba2
add missing comma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:40:18 +01:00
Michael Telatynski
342e10214b
PL grew the missing string since my base branch so do for that too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:39:27 +01:00
Michael Telatynski
63ccc45551
Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/nl.json
#	src/i18n/strings/zh_Hans.json
 2017-09-17 13:33:34 +01:00
Michael Telatynski
bc4bb6cc48
remove redundant new line 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:29:05 +01:00
Michael Telatynski
ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-17 13:28:17 +01:00