OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
18,424 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

18424 Commits (fa8ad7088039c81b37a8e2684fa8d0585962226c)

Author SHA1 Message Date
RiotRobot 74cbdf28ed v1.5.3 2019-09-16 17:47:22 +01:00
RiotRobot a1b13e51a0 Prepare changelog for v1.5.3 2019-09-16 17:47:22 +01:00
Weblate 838b1859b9 Merge branch 'origin/develop' into Weblate. 2019-09-16 16:47:14 +00:00
RiotRobot 44cf99d5d4 released js-sdk 2019-09-16 17:44:16 +01:00
David Baker 51dd0cd88a
Merge pull request #3448 from matrix-org/bwindels/joinrdfix 
Release: Directory should use the alias or server information to join the room
 2019-09-16 17:34:44 +01:00
Michael Telatynski 5d1056e1ef don't fire onFinished twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-16 18:20:31 +02:00
Michael Telatynski 597433d549 Reuse showRoom for onJoinClick so we join using alias if its available 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-16 18:20:24 +02:00
Weblate da521796fd Merge branch 'origin/develop' into Weblate. 2019-09-16 16:13:32 +00:00
Bruno Windels 129d3693b2
Merge pull request #3444 from matrix-org/t3chguy/nvl/fix_room_directory 
Reuse showRoom for onJoinClick so we join using alias if its available
 2019-09-16 16:13:28 +00:00
Weblate ffe84bfc61 Merge branch 'origin/develop' into Weblate. 2019-09-16 15:43:07 +00:00
Bruno Windels deddf77a05
Merge pull request #3446 from matrix-org/bwindels/fixscalarurlcheck 
Fix: make sure scalarUrls is never undefined
 2019-09-16 15:43:03 +00:00
Weblate 4760da1666 Merge branch 'origin/develop' into Weblate. 2019-09-16 13:28:15 +00:00
Szimszon 7316df70da Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-16 13:28:15 +00:00
J. Ryan Stinnett e50889d9e6
Merge pull request #3447 from matrix-org/jryans/react-16-lock-tweak 
Tweak lock file to pull in only one React version
 2019-09-16 15:28:10 +02:00
J. Ryan Stinnett 16a412e7d0 Tweak lock file to pull in only one React version 
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.

For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
 2019-09-16 14:07:05 +01:00
Bruno Windels 166364ba03 Fix: make sure scalarUrls is never undefined 2019-09-16 10:12:15 +02:00
Michael Telatynski 3fdaeea3a2 allow rooms we were banned from into Historical also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-15 22:24:23 +01:00
Michael Telatynski 4fb4c5b744 Only put a room in Historical if === 'leave' not peeked 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-15 22:19:07 +01:00
Michael Telatynski 7f5d38772d don't fire onFinished twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-15 21:30:01 +01:00
Michael Telatynski 54d98c22ba Reuse showRoom for onJoinClick so we join using alias if its available 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-15 21:25:36 +01:00
송태섭 cd45c84b15 Translated using Weblate (Korean) 
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-15 14:50:44 +00:00
Nikolay Boyadzhiev 5ee4950a47 Translated using Weblate (English (United States)) 
Currently translated at 42.0% (756 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2019-09-15 14:50:43 +00:00
Nikolay Boyadzhiev 354a1275dc Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-09-15 14:50:43 +00:00
Weblate 1d7d3b6357 Merge branch 'origin/develop' into Weblate. 2019-09-13 21:59:11 +00:00
Kévin C 6c72978192 Translated using Weblate (French) 
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-13 21:59:11 +00:00
Jeff Huang fcd5db0b2e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-09-13 21:59:10 +00:00
Travis Ralston e18b38c409
Merge pull request #3437 from matrix-org/travis/fix-deactivate 
Wrap deactivation check with sanity conditions
 2019-09-13 15:59:04 -06:00
Travis Ralston 3150d65bd7 De-async _calculateCanPermissions 2019-09-13 12:43:57 -06:00
Travis Ralston d18d15311f Remove extraneous guard on deactivation check 2019-09-13 12:43:47 -06:00
RiotRobot 0556d34534 v1.5.3-rc.3 2019-09-13 16:21:15 +01:00
RiotRobot 195afab8fb Prepare changelog for v1.5.3-rc.3 2019-09-13 16:21:15 +01:00
RiotRobot 93d76cef36 js-sdk rc.1 to get report API 2019-09-13 16:17:40 +01:00
Weblate 07357f7233 Merge branch 'origin/develop' into Weblate. 2019-09-13 14:45:27 +00:00
David Baker 7afd80e55b
Merge pull request #3408 from matrix-org/t3chguy/community_member_invite_IS_text 
Fix identity server text in AddressPickerDialog
 2019-09-13 15:45:22 +01:00
Weblate 7f4c0f10c0 Merge branch 'origin/develop' into Weblate. 2019-09-13 14:42:58 +00:00
Slavi Pantaleev df80a0c5c1 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1797 of 1797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-09-13 14:42:58 +00:00
David Baker 05a26373e8
Merge pull request #3438 from matrix-org/travis/revoke-1 
Change copy for sharing an email
 2019-09-13 15:42:53 +01:00
RiotRobot 63f75a36e4 v1.5.3-rc.2 2019-09-13 14:23:39 +01:00
RiotRobot 3889917cba Prepare changelog for v1.5.3-rc.2 2019-09-13 14:23:38 +01:00
Weblate 21d63e771d Merge branch 'origin/develop' into Weblate. 2019-09-13 13:08:47 +00:00
Slavi Pantaleev 08ae9ec7b2 Translated using Weblate (Bulgarian) 
Currently translated at 99.8% (1794 of 1797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-09-13 13:08:47 +00:00
Bruno Windels 40bd1845d2
Merge pull request #3441 from matrix-org/bwindels/fixroomdir-itemclick-bis 
Fix: stop propagation click handler for <TR> doesn't run
 2019-09-13 13:08:42 +00:00
David Baker 3986d78d9e
Merge pull request #3443 from matrix-org/dbkr/fixroomdir-itemclick-bis_2 
Fix: stop propagation click handler for <TR> doesn't run
 2019-09-13 14:08:35 +01:00
Bruno Windels 6d13ea0043 stop propagation click handler for <TR> doesn't run 2019-09-13 14:07:36 +01:00
David Baker 3fb72cd1b7
Merge pull request #3442 from matrix-org/dbkr/report_event_2 
Add way to report the content of a message
 2019-09-13 13:42:35 +01:00
Michael Telatynski c3d01715ff Improve ReportEventDialog as per PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:41:50 +01:00
Michael Telatynski 92af11bce7 fix indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:40:31 +01:00
Michael Telatynski fc49290459 Add way to report the content of a message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:40:25 +01:00
Bruno Windels f73f08e998 stop propagation click handler for <TR> doesn't run 2019-09-13 14:33:09 +02:00
David Baker e548e4d7a5
Merge pull request #3436 from matrix-org/travis/deactivate-release 
Fix synapse deactivate button for release
 2019-09-13 13:26:19 +01:00