OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,424 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

22424 Commits (20d0e8a888e1d2d364cfec23290d94ac90303dfe)

Author SHA1 Message Date
Simeon Keske cf1d9cc8b5
make the linter happy 2020-03-04 22:46:07 +01:00
Simeon Keske 98f0a2ab67
show the room presence indicator, even when cross-singing is enabled 2020-03-04 22:30:24 +01:00
Travis Ralston 4a976acb84 Add a null check to getUniqueRoomsWithIndividuals 
Fixes https://github.com/vector-im/riot-web/issues/12611
 2020-03-04 14:18:56 -07:00
Travis Ralston c6af591c6e Ensure linkified topics in the room directory also work 
We weren't passing the options object down to linkifyString.

Fixes https://github.com/vector-im/riot-web/issues/12606
 2020-03-04 14:14:03 -07:00
Travis Ralston d820356990 Convert alias links in room header topics to local permalinks 
Fixes https://github.com/vector-im/riot-web/issues/12605
 2020-03-04 13:56:58 -07:00
Weblate ab20600f9d Merge branch 'origin/develop' into Weblate. 2020-03-04 19:59:14 +00:00
Travis Ralston 7aba168c34
Merge pull request #4170 from matrix-org/travis/sso-register-dev 
Disable registration flows on SSO servers
 2020-03-04 12:59:08 -07:00
Travis Ralston 2204785026 Simplify SSO step checking 2020-03-04 12:26:08 -07:00
Weblate 7ea9f5e3cd Merge branch 'origin/develop' into Weblate. 2020-03-04 19:24:37 +00:00
Travis Ralston 68258d8e89
Merge pull request #4160 from matrix-org/travis/filter-blank 
Don't group blank membership changes
 2020-03-04 12:24:31 -07:00
Weblate ee42f35f09 Merge branch 'origin/develop' into Weblate. 2020-03-04 19:24:04 +00:00
Besnik Bleta 830c6e7cc8 Translated using Weblate (Albanian) 
Currently translated at 99.5% (2129 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-04 19:24:04 +00:00
Travis Ralston 7f66198afb
Merge pull request #4175 from matrix-org/travis/room-list-updates 
Ensure the room list always triggers updates on itself
 2020-03-04 12:23:58 -07:00
Travis Ralston 8e3fea9d0f Use an algorithmic comparator for room list ops 
Not all algorithms are timestamp based.
 2020-03-04 12:09:05 -07:00
Travis Ralston 80b44f0292 Always calculate the category of a room 
All the update triggers for the RoomListStore go through the `setRoomCategory` function, so by returning early we're not actually calculating where a room should be in the list.
 2020-03-04 12:05:47 -07:00
Travis Ralston b06a82ee80 Use textForEvent to determine if an event is worth rendering 2020-03-04 11:44:12 -07:00
Travis Ralston 3842bce74d Fix SSO for new approach 2020-03-04 11:41:16 -07:00
Bruno Windels 8a964dbff0 avoid ref by getting count in setter callback 2020-03-04 17:19:54 +01:00
Bruno Windels afc7273d10 use pendingUpdateCount rather, so we don't show multiple spinners 2020-03-04 16:58:04 +01:00
Bruno Windels 29af8add5d only show verify button if user has uploaded cross-signing keys 2020-03-04 16:10:06 +01:00
Zoe 4396d85d1f Share secrets with another device on request 2020-03-04 14:58:42 +00:00
Weblate 0e042f66c5 Merge branch 'origin/develop' into Weblate. 2020-03-04 14:54:40 +00:00
J. Ryan Stinnett 5da13ea253
Merge pull request #4173 from matrix-org/jryans/chrome-compose-flicker 
Fix composer touch bar flickering on keypress in Chrome
 2020-03-04 14:54:34 +00:00
Weblate 918ef13528 Merge branch 'origin/develop' into Weblate. 2020-03-04 14:43:33 +00:00
J. A. Durieux c8cd9b4437 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-04 14:43:33 +00:00
Bruno Windels 847f92b86c
Merge pull request #4167 from matrix-org/bwindels/scrolldocs 
Document scrollpanel and BACAT scrolling
 2020-03-04 14:43:28 +00:00
J. Ryan Stinnett 7ad8eeb906 Fix composer touch bar flickering on keypress in Chrome 
This changes our selection state handling to leave things alone if the browser's
state already matches what we want. This avoids strange side effects like the
touch bar flickering on each key press in Chrome.

Fixes https://github.com/vector-im/riot-web/issues/9299
 2020-03-04 14:35:11 +00:00
Weblate f0c6f1a10b Merge branch 'origin/develop' into Weblate. 2020-03-04 11:58:40 +00:00
RiotRobot 845656064e Reset matrix-js-sdk back to develop branch 2020-03-04 11:58:00 +00:00
RiotRobot b7d9f24625 Log packages when checking version 2020-03-04 11:56:32 +00:00
Weblate 2aae6276f7 Merge branch 'origin/develop' into Weblate. 2020-03-04 11:41:48 +00:00
Nathan Follens 141989a51f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-04 11:41:48 +00:00
RiotRobot 1d4f77dacc Merge branch 'master' into develop 2020-03-04 11:40:35 +00:00
RiotRobot ce879b95cf v2.2.1 2020-03-04 11:30:35 +00:00
RiotRobot cdcf042f6b Prepare changelog for v2.2.1 2020-03-04 11:30:35 +00:00
J. Ryan Stinnett fa79bc93ce Use bash for release script 
This fixes this repo to use bash for this script, matching the other repos.
 2020-03-04 11:24:21 +00:00
J. Ryan Stinnett 6068ab1446
Merge pull request #4171 from matrix-org/jryans/relative-scrolling-release 
Adjust scroll offset with relative scrolling (for release)
 2020-03-04 10:28:05 +00:00
Bruno Windels 070b430702 also use relative scrolling when eh ... doing relative scrolling 2020-03-04 10:26:27 +00:00
Bruno Windels 462c3411b2 add comment how offset from bottom is calculated 2020-03-04 10:26:27 +00:00
Bruno Windels 91aa8d4a3a use relative scrolling to compensate when changing height 2020-03-04 10:26:27 +00:00
J. Ryan Stinnett aedd44addc
Merge pull request #4169 from matrix-org/travis/sso-register 
Disable registration flows on SSO servers (for patch release)
 2020-03-04 10:18:50 +00:00
Travis Ralston 93c696f15e Appease the linter 2020-03-03 23:26:35 -07:00
Travis Ralston 3cff6d7239 Appease the linter 2020-03-03 23:26:20 -07:00
Travis Ralston e83a4ddbe5 i18n 2020-03-03 23:24:56 -07:00
Travis Ralston e265c92b6e Redirect registration requests to Login when the server supports SSO 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:24:50 -07:00
Travis Ralston bcfe1fcac5 Wire up 'create account' to the SSO button when SSO is used 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:23:53 -07:00
Travis Ralston a12786c171 i18n 2020-03-03 23:23:12 -07:00
Travis Ralston 04c54dc5a0 Redirect registration requests to Login when the server supports SSO 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:19:36 -07:00
Travis Ralston 8234b4d656 Wire up 'create account' to the SSO button when SSO is used 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:11:29 -07:00
Weblate 43f445d8f7 Merge branch 'origin/develop' into Weblate. 2020-03-03 22:27:53 +00:00