Travis Ralston
65d7bb2ef9
Merge branch 'develop' into travis/poc/theme-command
2020-03-06 17:33:22 -07:00
Travis Ralston
1530c91772
Merge pull request #4182 from matrix-org/travis/edit-redactions
...
Disable edits on redacted events
2020-03-06 14:34:57 -07:00
Travis Ralston
e4d323d2f2
Disable edits on redacted events
...
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
Bruno Windels
4fd1d8a5e7
Merge pull request #4180 from matrix-org/bwindels/toastwithoutxsign
...
Use crypto.verification.request even when xsign is disabled
2020-03-06 16:47:17 +00:00
Bruno Windels
b0617f10e8
stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail
2020-03-06 17:22:56 +01:00
Bruno Windels
f8ef5bb6a5
check .started first as it can be both .started and pending
2020-03-06 17:20:08 +01:00
Bruno Windels
a7de575316
use crypto.verification.request even when xsign is disabled
2020-03-06 16:50:39 +01:00
Damir Jelić
69389823f7
ManageEventIndexDialog: Reword and move the crawler state around a bit.
...
This reflects now the latests design on Figma.
2020-03-06 16:07:10 +01:00
Damir Jelić
364899b27d
ManageEventIndexDialog: Show how many rooms are done instead being processed.
2020-03-06 15:44:23 +01:00
Damir Jelić
bff3f3e632
Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms."
...
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
2020-03-06 15:44:23 +01:00
Damir Jelić
8fe54e5dca
ManageEventIndexDialog: Reword the status for the currently indexing rooms.
2020-03-06 15:44:23 +01:00
Travis Ralston
191abb5b0d
Merge pull request #3892 from krkc/move-read-receipts-to-bottom
...
Moved read receipts to the bottom of the EventTile.
2020-03-05 17:24:51 -07:00
Travis Ralston
1975a8e082
Merge branch 'develop' into move-read-receipts-to-bottom
2020-03-05 17:13:24 -07:00
Travis Ralston
74fcb103b1
Link to the right contributing guidelines
2020-03-05 11:04:33 -07:00
Travis Ralston
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button
...
Include a mark as read X under the scroll to unread button
2020-03-05 11:01:12 -07:00
Travis Ralston
3527fae275
Merge pull request #4178 from n0emis/crosssigning-presence
...
Show the room presence indicator, even when cross-singing is enabled
2020-03-05 10:38:01 -07:00
Bruno Windels
64b757e302
Merge pull request #4179 from matrix-org/bwindels/localechoforlegacyverif
...
Add local echo when clicking "Manually Verify" in unverified session dialog
2020-03-05 17:09:44 +00:00
Travis Ralston
e9657cea70
Merge branch 'develop' into travis/poc/theme-command
2020-03-05 09:49:32 -07:00
Bruno Windels
7d051d6a1d
await request promise inside encryption panel to show spinner
2020-03-05 17:44:35 +01: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
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
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
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
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
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
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
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
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
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
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
