OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,336 Commits
218 Branches
563 Tags
476 MiB
Commit Graph

22336 Commits (76703d99f5617560536d7135c7ded2f4bec5ed90)

Author SHA1 Message Date
Bruno Windels 7d051d6a1d await request promise inside encryption panel to show spinner 2020-03-05 17:44:35 +01:00
Weblate 96b8a6160e Merge branch 'origin/develop' into Weblate. 2020-03-05 14:47:09 +00:00
J. Ryan Stinnett 3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link 
link to matrix.org/security-disclosure-policy in help screen
 2020-03-05 14:47:02 +00:00
Ben Parsons d28d330b33 run yarn i18n 2020-03-05 14:33:40 +00:00
Ben Parsons ce84967225 update Security Disclosure Policy link text 2020-03-05 14:18:12 +00:00
Ben Parsons a6882cece1 increase margin between Settings sections 2020-03-05 14:10:44 +00:00
Zoe 26177a19d5 access cross-signing callbacks via method 2020-03-05 10:49:06 +00:00
Weblate 2ae881237e Merge branch 'origin/develop' into Weblate. 2020-03-05 09:24:15 +00:00
Jeff Huang cc26dc157b Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2020-03-05 09:24:15 +00:00
Bruno Windels 5df35ea432
Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys 
only show verify button if user has uploaded cross-signing keys
 2020-03-05 09:24:09 +00:00
Bruno Windels a5cd0a7d5f indent by 4 spaces 2020-03-05 11:09:45 +01:00
Weblate 76de422803 Merge branch 'origin/develop' into Weblate. 2020-03-04 22:35:39 +00:00
Travis Ralston 9836a7a655
Merge pull request #4176 from matrix-org/travis/linkify-rooms 
Fix room alias references in topics
 2020-03-04 15:35:34 -07:00
Weblate bc9ea1de39 Merge branch 'origin/develop' into Weblate. 2020-03-04 22:35:33 +00:00
Travis Ralston d3439c8101
Merge pull request #4177 from matrix-org/travis/no-rooms-dm 
Fix not being able to start chats when you have no rooms
 2020-03-04 15:35:27 -07:00
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