Commit graph

21671 commits

Author SHA1 Message Date
Michael Telatynski
a6edc34e97 Iterate things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-19 14:52:00 +00:00
Michael Telatynski
d70a9bd001 small tweaks, still not working reliably
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-19 14:39:36 +00:00
Michael Telatynski
4278d44059 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-19 13:30:47 +00:00
Michael Telatynski
b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent
Get rid of dependence on usercontent.riot.im
2020-02-19 12:53:01 +00:00
Michael Telatynski
4da5f32764 get rid of lockOrigin backwards compatibility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-19 12:44:46 +00:00
Bruno Windels
5b8551df1f
Merge pull request #4089 from matrix-org/bwindels/fixnoaliasesforpublicroom
also detect aliases using new /aliases endpoint for room access settings
2020-02-19 10:28:45 +00:00
Bruno Windels
30ae6dbdbb also detect aliases using new /aliases endpoint for room access settings 2020-02-19 11:18:56 +01:00
Bruno Windels
6118e9621e
Merge pull request #4086 from matrix-org/bwindels/fixaliases
get local aliases from /aliases in room settings
2020-02-19 10:02:50 +00:00
Bruno Windels
4c9c57bfe5 check server feature flag
if not available, revert to old behavior
2020-02-19 10:06:52 +01:00
Bruno Windels
e6ca581f10 get local aliases from /aliases in room settings 2020-02-18 16:27:45 +01:00
Michael Telatynski
932c9b3106 First attempt alpha room list sorting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-18 14:55:12 +00:00
Zoe
27f65c17b5
Merge pull request #4080 from matrix-org/foldleft/12187-e2e-dm
Start verification sessions in an E2E DM where possible
2020-02-18 13:53:56 +00:00
Zoe
0e0aadd3f2 fixed inexplicible scope bug 2020-02-18 11:30:10 +00:00
Zoe
164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Bruno Windels
1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods
Only show supported verification methods
2020-02-18 10:16:01 +00:00
Bruno Windels
05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2
Use local echo in VerificationRequest for accepting/declining a verification request
2020-02-18 09:55:27 +00:00
Zoe
23596031db rip foldleft, died of lint issues 2020-02-17 16:00:25 +00:00
Zoe
28df1e28cf Start verification sessions in an E2E DM where possible
Fixes https://github.com/vector-im/riot-web/issues/12187
2020-02-17 15:08:22 +00:00
David Baker
281cc223ed back to develop dep 2020-02-17 14:16:03 +00:00
RiotRobot
fc6028ede2 Merge branch 'master' into develop 2020-02-17 13:36:53 +00:00
RiotRobot
f99d347b23 v2.1.0 2020-02-17 13:36:06 +00:00
RiotRobot
6f206860bd Prepare changelog for v2.1.0 2020-02-17 13:36:06 +00:00
RiotRobot
34dbeb0604 Released js-sdk 2020-02-17 13:21:07 +00:00
J. Ryan Stinnett
91ad900925
Merge pull request #4076 from matrix-org/jryans/release-tag-tweaks
Automate SDK dep upgrades for release
2020-02-17 12:34:46 +00:00
J. Ryan Stinnett
4e2887ded6
Merge pull request #4078 from matrix-org/jryans/report-experimental-envs
Report installed PWA, touch input status in rageshakes, analytics
2020-02-14 21:40:48 +00:00
J. Ryan Stinnett
ca28f83841 Report touch input status in rageshakes, analytics
This reports whether the device has touch input as a primary input mechanism in
rageshakes and analytics.

For analytics, this replaces the identity server (which ends up being reported
as "<redacted>" by default anyway) because Matomo only supports a limited number
of custom variables.
2020-02-14 17:36:14 +00:00
J. Ryan Stinnett
ca4f591cb6 Report installed PWA status in rageshakes, analytics
This adds installed PWA status reporting to rageshakes and analytics, as well as
cleaning up some related strings.
2020-02-14 16:30:07 +00:00
Hubert Chathi
4a204b715d
Merge pull request #4059 from matrix-org/uhoreg/refactor_event_grouping
refactor event grouping into separate helper classes
2020-02-14 10:35:34 -05:00
Bruno Windels
93674ec781
Merge pull request #4070 from matrix-org/bwindels/oneverifrequest
Find existing requests when starting a new verification request
2020-02-14 15:33:27 +00:00
Bruno Windels
30718e7fde unsent could potentially also happen here
although should not happen in practice
2020-02-14 13:48:38 +01:00
Bruno Windels
a6c072ab42 only show supported verification methods
also an error message if none match
2020-02-14 13:48:18 +01:00
J. Ryan Stinnett
1938dc443a Reset SDK deps back to develop after a release
This automates the (frequently forgotten) step of resetting SDK deps back to the
develop branch after merging the release to develop.
2020-02-14 12:27:21 +00:00
J. Ryan Stinnett
c6a8c19779 Add auto-upgrade support for SDK deps
This automates the SDK upgrade step of the release process.
2020-02-14 12:10:08 +00:00
J. Ryan Stinnett
3f2dcf2113 Add dep version checks for release 2020-02-14 11:07:05 +00:00
Michael Telatynski
8087f18bf7 Remove unused props
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-14 10:32:42 +00:00
Michael Telatynski
e2b7be84b2
Merge pull request #4074 from MarcoZehe/SpeakFullTypingIndicator
Always speak the full text of the typing indicator when it updates.
2020-02-14 10:29:26 +00:00
Marco Zehe
b83bc7db68 Always speak the full text of the typing indicator when it updates.
By default, aria-live regions only speak partial updates. However in the case of the typing indicator, if it goes from one person typing to several, and back, the updated text would only be spoken in fragments by screen readers. Adding the aria-atomic attribute with a value of true makes screen readers always speak the full update for this tile, making the experience much nicer.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-14 11:12:41 +01:00
Bruno Windels
43f15ab47d
Merge pull request #4008 from BobVul/fix-markdown-escapes
Fix escaped markdown passing backslashes through
2020-02-14 09:18:53 +00:00
Hubert Chathi
908ca6b6ef add test for grouping room creation events 2020-02-13 17:25:54 -05:00
Michael Telatynski
256659e6f8
Merge pull request #4071 from MarcoZehe/MoveSidebarTabs
Move the sidebar to below the sidebar tab buttons for screen readers.
2020-02-13 18:31:25 +00:00
Marco Zehe
7840aa74fd Fix ID to be namespaced
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-13 19:18:21 +01:00
RiotRobot
ab91e859d9 v2.1.0-rc.2 2020-02-13 17:47:20 +00:00
RiotRobot
138ad3b1b1 Prepare changelog for v2.1.0-rc.2 2020-02-13 17:47:19 +00:00
RiotRobot
1970dbff94 Try JS SDK upgrade one more time 2020-02-13 17:43:27 +00:00
RiotRobot
242f1afb55 v2.1.0-rc.1 2020-02-13 17:35:56 +00:00
RiotRobot
32c2d848a4 Prepare changelog for v2.1.0-rc.1 2020-02-13 17:35:56 +00:00
Michael Telatynski
8ea13d9b57 delint prefer let/const over var
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 17:05:48 +00:00
Michael Telatynski
4ed27a4ba6 Move bulk to react-sdk and reference it from riot-web land
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 16:58:27 +00:00
Michael Telatynski
627a4d4ea4 Update comments and such
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 16:53:45 +00:00
Michael Telatynski
12aae12218 Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent 2020-02-13 16:36:05 +00:00