Commit graph

23997 commits

Author SHA1 Message Date
Zoe
1abd729ce0
Merge pull request #4540 from matrix-org/foldleft/11395-reg-error
Don't erase password confirm on registration error
2020-05-07 10:42:21 +01:00
Travis Ralston
7f030a149e
Merge pull request #4557 from matrix-org/travis/3pid-loading
Add a loading state for email addresses/phone numbers in settings
2020-05-06 17:03:42 -06:00
Travis Ralston
9ae812c346 Add a loading state for email addresses/phone numbers in settings
Fixes https://github.com/vector-im/riot-web/issues/13432
2020-05-06 15:17:55 -06:00
Travis Ralston
19bb678dd6
Merge pull request #4554 from nimbleape/pwa-taskbar-colour-follow-theme
set the meta tag for theme-color to the same theme css background
2020-05-06 11:27:01 -06:00
Michael Telatynski
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy
Update Invite Dialog copy to include email addresses
2020-05-06 18:16:36 +01:00
Jorik Schellekens
d62e6ed05d
Merge pull request #4546 from JorikSchellekens/joriks/font-scaling-regressions
Fix slider toggle regression.
2020-05-06 17:08:18 +01:00
Dan Jenkins
1767a611a6
set the meta tag for theme-color to the same theme css background 2020-05-06 16:23:06 +01:00
Zoe
14516d3e7e
Merge pull request #4552 from matrix-org/foldleft/fix-sublist-crash
Fix a crash where a name could unexpectedly be an empty list
2020-05-06 13:52:50 +01:00
Michael Telatynski
854d27baf5
Merge pull request #4492 from ihatetothink/comunities-drag-from-context
Solves communities can be dragged from context menu
2020-05-06 13:06:30 +01:00
Bruno Windels
93f6737982
Merge pull request #4553 from matrix-org/bwindels/fixdefaultcomposeravatar
Remove prefixes for composer avatar urls
2020-05-06 10:40:48 +00:00
Bruno Windels
0c5c2501e6 remove prefixes as we're using data urls now 2020-05-06 12:23:03 +02:00
Michael Telatynski
d51a18ac49
Merge pull request #4541 from matrix-org/t3chguy/fix-reply-margin
Fix reply RR spacing getting doubled
2020-05-05 19:56:11 +01:00
Zoe
781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
RiotRobot
aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
RiotRobot
338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot
854855a5aa v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
e6c485c7e8 Prepare changelog for v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
J. Ryan Stinnett
7b131d873d
Merge pull request #4551 from matrix-org/jryans/event-logging-rm-rc
EventIndex: Reduce the logging the event index is producing.
2020-05-05 10:53:15 +01:00
Damir Jelić
51a79a43e3 EventIndex: Remove an unused variable. 2020-05-05 10:49:40 +01:00
Damir Jelić
5aa645caf9 EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:49:40 +01:00
J. Ryan Stinnett
16099f731d
Merge pull request #4550 from matrix-org/bwindels/unverif-session-copy-self-rc
Differentiate copy for own untrusted device dialog
2020-05-05 10:39:07 +01:00
Bruno Windels
ab82bf8048 differentiate copy for own untrusted device dialog 2020-05-05 11:31:15 +02:00
Bruno Windels
ed455a966d
Merge pull request #4549 from matrix-org/bwindels/unverif-session-copy-self
Differentiate copy for own untrusted device dialog
2020-05-05 09:30:13 +00:00
Bruno Windels
b04bb423f8 differentiate copy for own untrusted device dialog 2020-05-05 10:23:39 +02:00
Damir Jelić
c9ac726629 EventIndex: Remove an unused variable. 2020-05-05 10:21:18 +02:00
Damir Jelić
f2df698e3b EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:10:21 +02:00
Jorik Schellekens
83bd96a091 Css rounds weirdly sometimes. Heigher precision fixes it. 2020-05-04 17:15:09 +01:00
J. Ryan Stinnett
349057f4d0
Merge pull request #4545 from matrix-org/foldleft/13167-spinner-progress-rc
More detailed progress for key backup progress
2020-05-04 16:35:01 +01:00
Zoe
64c70b2de0 fragments and i18n don't play nice together 2020-05-04 16:16:29 +01:00
Zoe
1afb09d257 Fixed the dialog height 2020-05-04 16:16:29 +01:00
Zoe
3dbcc9fe99 copy changes 2020-05-04 16:16:28 +01:00
Zoe
b7bcf25cfa i18n 2020-05-04 16:16:28 +01:00
Zoe
7ef3b446f4 Show progress when loading keys 2020-05-04 16:16:28 +01:00
Jorik Schellekens
a11812a402 Fix slider toggle regression. 2020-05-04 15:07:41 +01:00
Bruno Windels
d8ab1f0ddc
Merge pull request #4544 from matrix-org/bwindels/increaserage-rc
Increase rageshake size limit to 5mb
2020-05-04 13:35:22 +00:00
Bruno Windels
aa87e84652 increare rage shake size limit to 5mb 2020-05-04 14:08:39 +02:00
Bruno Windels
5ac5c056e3
Merge pull request #4543 from matrix-org/bwindels/increaserage
Increase rageshake size limit to 5mb
2020-05-04 12:07:50 +00:00
Bruno Windels
d9639c5412 increare rage shake size limit to 5mb 2020-05-04 13:40:52 +02:00
David Baker
af7b6cf754
Merge pull request #4542 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-05-04 10:19:54 +01:00
Szimszon
8a794fafc6 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-04 09:08:56 +00:00
Slavi Pantaleev
b9ce10af19 Translated using Weblate (Bulgarian)
Currently translated at 91.9% (2115 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-05-04 09:08:55 +00:00
Priit Jõerüüt
dd6a938d53 Translated using Weblate (Estonian)
Currently translated at 35.3% (812 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-03 23:24:05 +00:00
Priit Jõerüüt
677475ed06 Translated using Weblate (Estonian)
Currently translated at 34.8% (800 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-03 22:47:26 +00:00
Michael Telatynski
c00b070269 Fix reply RR spacing getting doubled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-03 13:28:16 +01:00
Priit Jõerüüt
0b99e25222 Translated using Weblate (Estonian)
Currently translated at 33.9% (781 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-02 22:48:38 +00:00
Agusti Bau
6e99faefde Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into comunities-drag-from-context 2020-05-02 13:40:57 +02:00
Agusti Bau
baa9cd8078 formatted files 2020-05-02 13:25:18 +02:00
Agusti Bau
a84a3c4780 hide badge when context menu is open 2020-05-02 13:12:31 +02:00
Agusti Bau
fc5a5c411f provided.placeholder has no effect 2020-05-02 13:09:04 +02:00