mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 22:01:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
14058 commits 219 branches 562 tags 474 MiB
Commit graph

14058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
482e6b57da
Merge pull request #2331 from matrix-org/travis/mto-via 
Don't consider ACL'd servers as permalink candidates
 2018-12-07 10:59:50 -07:00
Weblate
5d85421603 Merge remote-tracking branch 'origin/develop' into develop 2018-12-07 17:44:41 +00:00
David Baker
d7319d7e4f
Merge pull request #2330 from matrix-org/travis/fix-pinned-rooms 
Fix pinning of rooms without badges
 2018-12-07 17:44:36 +00:00
Weblate
9fb658fcd6 Merge remote-tracking branch 'origin/develop' into develop 2018-12-07 17:44:03 +00:00
Slavi Pantaleev
8e2233dc6c Translated using Weblate (Bulgarian) 
Currently translated at 92.1% (1279 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-12-07 17:44:02 +00:00
David Baker
6d58296fa6
Merge pull request #2329 from matrix-org/travis/sort-i18n-2 
Sort translations by file name
 2018-12-07 17:43:57 +00:00
Travis Ralston
95d15b7863 Fix tinting of notification icon and use a more reliable notification source 
The js-sdk's placement of the notification change was unreliable and could cause stuck notifications. The new location (piggybacking the Notifier) is a lot more reliable.

The tinting has been changed fairly invasively in order to support the changing of the `fill` attribute. What was happening before was the `fill` property would happily get set to the forced color value, but when it came time to reset it it wouldn't be part of the colors array and fail the check, therefore never being changed back. By using a second field we can ensure we are checking the not-forced value where possible, falling back to the potentially forced value if needed. 

In addition to fixing which color the Tinter was checking against, something noticed during development is that `this.colors` might not always be a set of hex color codes. This is problematic when the attribute we're looking to replace is a rgb color code but we're only looking at `keyHex` - the value won't be reset. It appears as though this happens when people use custom tinting in places as `this.colors` often gets set to the rgb values throughout the file. To fix it, we just check against `keyHex` and `keyRgb`.
 2018-12-06 22:26:51 -07:00
J. Ryan Stinnett
0b65a1ee1a Remove outdated info about custom skins 
It has been marked outdated for several years. Since it appears on the repo home
page, it makes the project feel unmaintained.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-06 19:25:07 -06:00
Travis Ralston
173669b375 Show the number of unread notifications above the bell on the right 
Fixes https://github.com/vector-im/riot-web/issues/3383

This achieves the result by counting up the number of highlights across all rooms and setting that as the badge above the icon. If there are no highlights, nothing is displayed. The red highlight on the bell is done by abusing how the Tinter works: because it has access to the properties of the SVG that we'd need to override it, we give it a collection of colors it should use instead of the theme/tint it is trying to apply. This results in the Tinter using our warning color instead of whatever it was going to apply.

The RightPanel now listens for events to update the count too, otherwise when the user receives a ping they'd have to switch rooms to see the change.
 2018-12-06 16:18:02 -07:00
Weblate
6bf89477bf Merge remote-tracking branch 'origin/develop' into develop 2018-12-06 23:12:36 +00:00
Matthew Hodgson
245c839962
Merge pull request #2335 from jryans/react-style-guide 
Update React guide in code style
 2018-12-06 23:12:30 +00:00
J. Ryan Stinnett
757181c322 Update React guide in code style 
This updates React guidance to prefer JS classes and adds additional info about
how to handle specific situations when using them.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-06 16:34:54 -06:00
Travis Ralston
ca1313099f Show the IncomingCallBox if the call is for the RoomSubList 
Fixes https://github.com/vector-im/riot-web/issues/4369

Previously the RoomSubList would filter its list of rooms to verify that the incoming call belongs to it. This causes problems when the sub list is being told some rooms don't exist (ie: the list is filtered). It is trivial for the RoomList to instead track which RoomSubList (tag) it should be handing the call off to so we do that instead now. The RoomSubList trusts that the caller has already filtered it and will render the IncomingCallBox if it has an incoming call.
 2018-12-06 11:45:58 -07:00
Weblate
97fcabe566 Merge remote-tracking branch 'origin/develop' into develop 2018-12-06 17:45:11 +00:00
Karol Kosek
c0f888f43c Translated using Weblate (Polish) 
Currently translated at 90.9% (1262 of 1387 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-12-06 17:45:10 +00:00
Krombel
dbb0a34456 Translated using Weblate (German) 
Currently translated at 97.9% (1359 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-12-06 17:45:10 +00:00
Travis Ralston
31b7a0ddcb
Merge pull request #2259 from matrix-org/t3chguy/account_deactivation_preferences 
Remove temporary account_deactivation_preferences
 2018-12-06 10:45:04 -07:00
Akarshan Biswas
50461c9306 Translated using Weblate (Hindi) 
Currently translated at 27.3% (380 of 1388 strings)

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

Use native number system instead
 2018-12-06 15:40:45 +00:00
Akarshan Biswas
e52eb52db9 Translated using Weblate (Hindi) 
Currently translated at 27.2% (378 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2018-12-06 15:34:05 +00:00
Osoitz
3f04f8116f Translated using Weblate (Basque) 
Currently translated at 100.0% (1388 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-12-06 14:49:49 +00:00
David Baker
a82b54f25a v0.14.7-rc.2 2018-12-06 12:39:24 +00:00
David Baker
c94d8d6f68 Prepare changelog for v0.14.7-rc.2 2018-12-06 12:39:23 +00:00
David Baker
c6d22cbc83
Merge pull request #2332 from matrix-org/dbkr/ship_babelrc 
Ship the babelrc file to npm
 2018-12-06 12:29:38 +00:00
random
b1728b6415 Translated using Weblate (Italian) 
Currently translated at 100.0% (1388 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-12-06 11:52:51 +00:00
David Baker
77c51aff2d Ship the babelrc file to npm 
We ship the source files, so it probably makes sense to ship the
babelrc that tells you how to compile them.
 2018-12-06 11:44:00 +00:00
David Baker
58ab9a0995 v0.14.7-rc.1 2018-12-06 11:18:37 +00:00
David Baker
e2c01445d3 Prepare changelog for v0.14.7-rc.1 2018-12-06 11:18:37 +00:00
David Baker
870825b180 js-sdk rc.1 2018-12-06 11:15:36 +00:00
Angelo Martinovic
5c59da8732 Added translation using Weblate (Croatian) 2018-12-06 09:18:31 +00:00
Kévin C
8e029ea048 Translated using Weblate (French) 
Currently translated at 100.0% (1388 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-12-06 09:16:28 +00:00
Jeff Huang
4f64513402 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1388 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-12-06 05:33:06 +00:00
Travis Ralston
45bc1f7dbd Appease the linter 2018-12-05 18:14:22 -07:00
Travis Ralston
f08a54ed1e Don't consider ACL'd servers as permalink candidates 
and fix the bug where it was picking 4 servers instead of 3. This was due to `<=` instead of `<` in the `MAX_SERVER_CANDIDATES` loop. Added tests for all the things.

Fixes https://github.com/vector-im/riot-web/issues/7752
Fixes https://github.com/vector-im/riot-web/issues/7682
 2018-12-05 18:00:09 -07:00
Szimszon
62aae2aa02 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1388 of 1388 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-12-05 21:01:27 +00:00
Travis Ralston
93c90896b5 Regenerate en_EN.json 2018-12-05 14:00:09 -07:00
Travis Ralston
79ad95c853 Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2 2018-12-05 13:58:18 -07:00
Weblate
03c24c3e9b Merge remote-tracking branch 'origin/develop' into develop 2018-12-05 20:53:29 +00:00
Karol Kosek
21ebe2746b Translated using Weblate (Polish) 
Currently translated at 90.2% (1252 of 1387 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-12-05 20:53:29 +00:00
Besnik Bleta
b33a0b1952 Translated using Weblate (Albanian) 
Currently translated at 99.3% (1378 of 1387 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-12-05 20:53:28 +00:00
Travis Ralston
daa0ddd21d
Merge pull request #2306 from matrix-org/travis/cors-on-join 
Suppress CORS errors in the 'failed to join room' dialog
 2018-12-05 13:53:24 -07:00
Travis Ralston
216fc6412a Fix pinning of rooms without badges 
Fixes https://github.com/vector-im/riot-web/issues/7723

This adds consideration for rooms that are "mentions only" (or "unread-muted" as internally referenced).
 2018-12-05 13:52:27 -07:00
Szimszon
fc7bb448bd Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1387 of 1387 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-12-05 20:17:47 +00:00
Travis Ralston
a2b825ba92 Sort translations by file name 
This keeps the strings close together and roughly in the same area as the others, and makes it easier to maintain the translation file.
 2018-12-05 11:52:10 -07:00
Travis Ralston
c06d42d560
Merge pull request #2317 from matrix-org/travis/invite-errors 
Check if users exist before inviting them and communicate errors
 2018-12-05 11:50:03 -07:00
Travis Ralston
c46bae59b2
Merge branch 'develop' into travis/cors-on-join 2018-12-05 11:30:19 -07:00
Travis Ralston
7e817f4aa9
Add a helpful comment 2018-12-05 11:29:53 -07:00
Travis Ralston
28f4752c5b Rename returned completion states to be something sensible 2018-12-05 11:27:48 -07:00
Travis Ralston
0f348a7c78 Merge branch 'develop' into travis/invite-errors 2018-12-05 11:25:45 -07:00
Richard van der Hoff
c553323d5a
Factor out common login code (#2307) 
Removes the duplication between the various points where we send off a login
request and parse the response.
 2018-12-05 17:39:38 +01:00
David Baker
a3382eb655
Merge pull request #2328 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-12-05 16:20:20 +00:00