Commit graph

14301 commits

Author SHA1 Message Date
David Baker
051e5d392c
Merge pull request #2755 from matrix-org/dbkr/hosting_link_only_if_group_admin
Only show hosting link if group admin
2019-03-06 10:58:01 +00:00
David Baker
9a57e5c2f6
Merge pull request #2754 from matrix-org/dbkr/hosting_link_only_matrix_org
Only show hosting link if domain == matrix.org
2019-03-06 10:38:08 +00:00
David Baker
23f22617ed Only show hosting link if group admin 2019-03-06 10:32:30 +00:00
David Baker
610a6d935a Only show hosting link if domain == matrix.org
Fixes https://github.com/vector-im/riot-web/issues/9059
2019-03-06 10:22:19 +00:00
David Baker
a9402beb8f v1.0.2-rc.4 2019-03-05 19:17:52 +00:00
David Baker
2b2cb1504e Prepare changelog for v1.0.2-rc.4 2019-03-05 19:17:51 +00:00
David Baker
647260b1ab js-sdk rc.2 2019-03-05 19:07:22 +00:00
David Baker
52e5d15a5a
Merge pull request #2752 from matrix-org/dbkr/fix-user-not-existing
Patch users not existing when opening settings
2019-03-05 18:49:49 +00:00
Travis Ralston
b9bd8206c1 Patch users not existing when opening settings
Fixes https://github.com/vector-im/riot-web/issues/9022
2019-03-05 18:48:41 +00:00
David Baker
4c333f8c5f
Merge pull request #2751 from matrix-org/dbkr/devices_toggle_update_2
Fix media device selectors not updating
2019-03-05 18:46:05 +00:00
David Baker
cd4e22b3fd Fix media device selectors not updating
Missed a setState

Fixes https://github.com/vector-im/riot-web/issues/9036
2019-03-05 18:45:24 +00:00
David Baker
ff4963e662
Merge pull request #2750 from matrix-org/dbkr/shameless_plugging_2
Support linking to hosting providers
2019-03-05 18:34:54 +00:00
David Baker
b6579131b8 Add the image 2019-03-05 18:33:28 +00:00
David Baker
7aa451067e Add utm_campaign to the hosting links
According to where in the app the link was clicked
2019-03-05 18:33:22 +00:00
David Baker
dc0eff38fd Lint 2019-03-05 18:33:16 +00:00
David Baker
d888445ec7 Support linking to hosting providers
From link in app config
2019-03-05 18:32:56 +00:00
David Baker
133dfe0807 v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
738bc4d2d5 Prepare changelog for v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
784f468d94
Merge pull request #2733 from matrix-org/travis/misc-roomlist
Misc room list improvements & invite fix
2019-03-01 17:28:30 +00:00
David Baker
9d2ef8a3cd v1.0.2-rc.2 2019-03-01 12:17:26 +00:00
David Baker
e8213bc5c3 Prepare changelog for v1.0.2-rc.2 2019-03-01 12:17:25 +00:00
David Baker
4f430db981
Merge pull request #2730 from matrix-org/dbkr/langs_file_resolve_alias
Use webpack alias to resolve the languages file
2019-03-01 12:13:31 +00:00
David Baker
4f84311bde Use $webapp rather than Webapp 2019-03-01 12:03:04 +00:00
David Baker
f2328904cd stray semicolon 2019-03-01 11:48:48 +00:00
David Baker
53aceaa412 Add fallback for languages file
So we're not completely dependent on the alias being set
2019-03-01 11:44:44 +00:00
David Baker
63c6f600bf Use webpack alias to resolve the languages file
Hopefully this will end up simpler than having to figure out in
riot-web what the relative path is from react-sdk's
src/languageHandler.js to riot-web's webapp directory.
2019-03-01 11:30:50 +00:00
Travis Ralston
805676a511 Don't lose invites when multiple are pending 2019-02-28 14:03:28 -07:00
Travis Ralston
872cdaa9b3 Use the already available state for checking if custom tags are enabled 2019-02-28 14:03:28 -07:00
Travis Ralston
b1e16e9f49 Fix stacktrace when starting riot up with rooms
Settings can trigger before we're ready, so don't generate the room list. This also includes a comment to signify to future people that we need to track settings still.
2019-02-28 13:55:20 -07:00
Travis Ralston
b2f4de4488
Merge pull request #2716 from matrix-org/travis/what-even-is-a-category
Move complex part of room sorting to a dedicated function
2019-02-28 13:36:09 -07:00
Travis Ralston
a3342a5790 Standardize on "Category" being the canonical term for room list sections 2019-02-28 13:24:05 -07:00
David Baker
52a2fe1c9c v1.0.2-rc.1 2019-02-28 14:43:36 +00:00
David Baker
89ad006d2d Prepare changelog for v1.0.2-rc.1 2019-02-28 14:43:35 +00:00
David Baker
95675461c8 js-sdk rc.1 2019-02-28 14:37:43 +00:00
Jason Robinson
c4c9c77330
Merge pull request #2718 from matrix-org/jaywink/stickerpicker-button-warning
Remove unnecessary ref from Stickerpicker
2019-02-28 16:23:09 +02:00
David Baker
3fa4ecade9
Merge pull request #2720 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-02-28 14:22:17 +00:00
David Baker
76eba5a9cf Translated using Weblate (English (United States))
Currently translated at 48.8% (758 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2019-02-28 14:21:08 +00:00
David Baker
66f9a2cbe1
Merge pull request #2715 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2019-02-28 14:08:31 +00:00
Weblate
e445ef7b1e [matrix] -> Matrix 2019-02-28 14:05:20 +00:00
Weblate
6976e23caf manually comitting translations 2019-02-28 14:03:06 +00:00
Jason Robinson
a74cb001b4 Remove unnecessary ref from Stickerpicker
There is a ref=target in the call to render AccessibleButton for
the hide stickers button. This ref is not present in the show case.

When clicking the stickerpicker show button, React gives a warning:

> Warning: Stateless function components cannot be given refs
> (See ref "target" in AccessibleButton created by Stickerpicker).
> Attempts to access this ref will fail.

Removed the ref. Stickerpicker hide/show still works fine, no warning.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-02-28 15:51:36 +02:00
Weblate
4866c0234b Merge branch 'origin/develop' into Weblate. 2019-02-28 13:38:46 +00:00
Paulo Miranda
527798db59 Translated using Weblate (Portuguese (Brazil))
Currently translated at 81.7% (1269 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-02-28 13:37:27 +00:00
Kévin C
8435406b7a Translated using Weblate (French)
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-02-28 09:46:30 +00:00
Slavi Pantaleev
bd8177de62 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-02-28 08:28:56 +00:00
Jeff Huang
d7e2938570 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-02-28 04:01:17 +00:00
Travis Ralston
93043c8cc0
Merge pull request #2709 from matrix-org/t3chguy/badge_51
Show nearest lower badge, e.g show Mod for 51... etc
2019-02-27 18:30:57 -07:00
Travis Ralston
bafe59fe28 Appease the linter 2019-02-27 18:29:48 -07:00
Travis Ralston
c908a6cf1e Move complex part of room sorting to a dedicated function
Pretty much cut/pasting it in, as there's not really a whole much to help make the code more understandable here.

This also includes a comment block longer than the code it describes in hopes it explains away the problem of understanding what it does.

Should fix https://github.com/vector-im/riot-web/issues/8861
2019-02-27 15:55:16 -07:00
Szimszon
2a9f150e4c Translated using Weblate (Hungarian)
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-02-27 20:37:04 +00:00