ff3c52a736
Consider cancelled verifications when mounting IncomingSasDialog
...
The cancellation can be because of a background problem, or because the user received another verification request from the same user. The cancel function does get called, however due to the speed of our dialog handling the state ends up being lost forever. Instead of trying to de-layer dialogs, this just fastforwards the whole dialog to "cancelled" on mount if required.
Fixes https://github.com/vector-im/riot-web/issues/10118
2019-06-19 14:59:59 -06:00
b16a3c53cd
Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu
...
Remove unused ContextualMenu features
2019-06-19 19:18:37 +01:00
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button
...
Fix casing of TooltipButton
2019-06-19 19:18:15 +01:00
e675244d40
Merge branch 'master' into develop
2019-06-19 15:53:16 +01:00
2d6317fdd0
v1.2.2
2019-06-19 15:52:18 +01:00
b91e5a7d7c
Prepare changelog for v1.2.2
2019-06-19 15:52:17 +01:00
21344609a4
released js-sdk
2019-06-19 15:47:31 +01:00
dc9282c539
Remove unused ContextualMenu features
2019-06-19 14:47:15 +01:00
2247c5953d
Fix conflicting PRs
2019-06-19 13:33:06 +01:00
86081c3c8f
Merge pull request #3120 from matrix-org/dbkr/badges_remove_dupe_code
...
De-duplicate notif badge code
2019-06-19 13:30:04 +01:00
97d8fe6db3
Merge pull request #3121 from matrix-org/dbkr/count_rooms_with_notifs
...
Fix favicon/title badge count
2019-06-19 13:29:17 +01:00
6eddce8c32
lint
2019-06-19 12:13:17 +01:00
23b29ce3f5
Use the variables we just defined above
2019-06-19 12:12:19 +01:00
edd43a2706
Fix favicon/title badge count
...
This was using a separate function (in MatrixChat) that didn't
take into account whether we were supposed to be hiding the badge
for rooms so would include notifs that were hidden everywhere else.
Also make it a function & put it in RoomNotifs with all its friends.
Fixes https://github.com/vector-im/riot-web/issues/3060
2019-06-19 12:06:32 +01:00
0e6f401b62
copyright
2019-06-19 11:48:47 +01:00
c57d93702a
De-duplicate notif badge code
...
We had two different places we were deciding whether to show a badge.
Let's just have one.
2019-06-19 11:46:24 +01:00
bb4b5d7798
TooltipButton rename step 2 of 2
2019-06-19 11:32:03 +01:00
ab4c5f0152
TooltipButton rename step 1 of 2
2019-06-19 11:30:37 +01:00
4ec7a8ddff
Fix casing of TooltipButton
...
My brain can't deal with two different ways to write "Tooltip", so this
converges the naming to match the rest of the code base. Separate commits will
fix up the file names for case-insensitive file systems.
2019-06-19 11:26:13 +01:00
9591e6b0d3
Merge pull request #3071 from matrix-org/t3chguy/authentication_password_field
...
Switch ugly password boxes to Field or styled input
2019-06-19 09:31:11 +01:00
9641110315
Merge pull request #3118 from matrix-org/dbkr/already_registered
...
Restore warning for if you're already logged in
2019-06-19 09:27:31 +01:00
c8e121dc70
Restore warning for if you're already logged in
...
...when clicking an email link. Although now we can complete the
registration because we can do so without replacing your session.
2019-06-18 18:43:14 +01:00
bb97653455
Merge pull request #3113 from matrix-org/bwindels/mediadeviceslabels
...
Provide default name if device label is missing
2019-06-18 16:44:43 +00:00
63fba611c0
Merge pull request #3108 from matrix-org/bwindels/edit-room-notif-pill
...
Support @room pills while editing
2019-06-18 16:43:14 +00:00
a835d916e1
v1.2.2-rc.2
2019-06-18 15:52:29 +01:00
043cae2aa9
Prepare changelog for v1.2.2-rc.2
2019-06-18 15:52:29 +01:00
27a94bb250
js-sdk rc.2
2019-06-18 15:46:23 +01:00
ab4142ab5a
Merge remote-tracking branch 'origin/develop' into release-v1.2.2
2019-06-18 15:25:44 +01:00
7b514b0573
Merge pull request #3115 from matrix-org/travis/reduce-scalar-calls
...
Defer scalar API calls until they are needed
2019-06-18 08:17:21 -06:00
b6ca0ea6bf
Appease the linter
2019-06-18 08:01:38 -06:00
be37332bb0
Further simplify usage of integrations
2019-06-18 07:55:43 -06:00
f7c03acb58
Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo
...
Blend pending redactions
2019-06-18 13:09:25 +00:00
c4fc2a8089
remove redundant localecho part from method name
2019-06-18 14:57:58 +02:00
f9188bca92
reduced opacity for pending redactions
2019-06-18 13:48:51 +02:00
02c9e29937
use renamed method that also takes local redactions into account now
2019-06-18 13:47:33 +02:00
cc155ac049
Merge pull request #3116 from matrix-org/bwindels/feature-guard-arrowup-to-edit
...
Keep old arrow-up behaviour when editing is not enabled
2019-06-18 09:57:04 +00:00
f95f194b6a
keep old arrow-up behaviour when editing is not enabled
...
also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise
2019-06-18 11:49:36 +02:00
32840fc274
Merge pull request #3098 from matrix-org/t3chguy/restore_composer_history
...
Restore Composer History under shift-up & down
2019-06-18 08:59:11 +00:00
5e7b4564cf
Merge pull request #3114 from matrix-org/dbkr/allow_server_change_if_dead
...
Allow changing server if validation has failed
2019-06-18 09:37:31 +01:00
1db505c667
comment typo
2019-06-18 09:50:31 +02:00
3119feaa17
whitespace
2019-06-18 09:48:25 +02:00
47579f37e8
clarify why its always safe to not append @room at end while parsing
2019-06-18 08:40:58 +02:00
b0d340f578
Merge pull request #3109 from matrix-org/t3chguy/upload_all_button
...
Add Upload All button to UploadConfirmDialog
2019-06-17 18:06:15 -06:00
d5db0077ed
Remove unused imports
2019-06-17 15:53:11 -06:00
8f6e8c1ec7
Appease the linter
2019-06-17 15:51:14 -06:00
d58ab8e6d0
Remove excessive scalar auth checks in manager util class
2019-06-17 15:50:09 -06:00
974a11ed20
Defer scalar auth in AppsDrawer to widgets/manager dialog
2019-06-17 15:39:32 -06:00
d2d0cb2e9e
Port AppTile (widgets) over to new integration manager dialog props
2019-06-17 15:34:30 -06:00
f699fed720
Defer sticker picker scalar auth to integration manager dialog
...
or when needed, instead of up front.
2019-06-17 15:30:24 -06:00
ebabc5238d
Port integration manager class to new dialog props
2019-06-17 15:30:01 -06:00
Travis Ralston