f8d3073690
Merge pull request #4397 from matrix-org/t3chguy/deps1
...
Remove unused react-addons-css-transition-group
2020-04-14 14:54:24 +01:00
f84c59dea7
Merge pull request #4395 from matrix-org/t3chguy/fix_emoji_tooltip_flicker
...
Fix emoji tooltip flickering
2020-04-14 14:28:29 +01:00
34e2fd42ec
Merge pull request #4374 from matrix-org/jryans/backup-dialog-hellscape
...
Pass along key backup for bootstrap
2020-04-14 14:08:27 +01:00
6416f404c6
Merge pull request #4403 from matrix-org/t3chguy/fix_e2ee_toggle
...
Fix create room dialog e2ee private room setting
2020-04-14 13:17:31 +01:00
3aa338f3a2
Merge pull request #4391 from matrix-org/t3chguy/sort_emoji_by_shortcodes
...
Sort emoji by shortcodes for autocomplete primarily for :-1 and :+1
2020-04-14 13:17:26 +01:00
e114effcfa
make code more readable as per pr suggestion
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 13:07:44 +01:00
17a893adc5
Merge pull request #4390 from matrix-org/t3chguy/fix_cmd_no_typing
...
Fix invalid commands when figuring out whether to set isTyping
2020-04-14 13:06:10 +01:00
09d56e7bbc
Fix create room dialog e2ee private room setting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 13:05:23 +01:00
e5d4ab9fdb
Merge pull request #4389 from matrix-org/t3chguy/deop_fail
...
op/deop return error if trying to affect an unknown user
2020-04-14 12:17:45 +01:00
4fc88d69a3
Remove unused react-addons-css-transition-group
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 01:04:54 +01:00
71b4aab5dc
Fix emoji tooltip flickering because onMouseOut&onMouseOver fired when moving between children
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 00:12:58 +01:00
3a0e1aeeaf
Sort emoji by shortcodes for autocomplete so that :-1 and :+1 first results are correct
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 18:09:28 +01:00
7a936798b9
Fix invalid commands when figuring out whether to send typing notification
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 16:42:14 +01:00
6d33138950
op/deop return error if trying to affect an unknown user
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 16:41:07 +01:00
c000583099
Merge pull request #4384 from matrix-org/t3chguy/composer_pills
...
Composer pills respect showPillAvatar setting
2020-04-10 16:45:46 +01:00
5846d09ae1
Merge pull request #4385 from matrix-org/t3chguy/slashcmd_typing
...
Only send typing notification when composing commands which send messages
2020-04-10 16:14:30 +01:00
52064d2fd0
Merge pull request #4386 from matrix-org/t3chguy/order_match_buttons
...
Reverse order of they match/they don't match buttons
2020-04-10 15:51:28 +01:00
22558f090d
Reverse order of they match/they don't match buttons
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 15:38:17 +01:00
caf0b25bd0
Only send typing notification when composing commands which send messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 13:59:01 +01:00
740b6f6cac
Composer pills respect showPillAvatar setting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 09:34:38 +01:00
8f49ed664f
Merge pull request #4383 from matrix-org/travis/plural-delete
...
Use singular text on 'delete sessions' button for SSO
2020-04-09 16:39:59 -06:00
879b4e15e5
Use singular text on 'delete sessions' button for SSO
...
Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357
Not a release blocker at this time.
2020-04-09 16:18:12 -06:00
4d461c6d87
Merge pull request #4377 from matrix-org/travis/sticker-data
...
Pass widget data through from sticker picker
2020-04-09 14:48:33 -06:00
ef8c5033ee
Merge pull request #4376 from matrix-org/travis/jitsi-end
...
Obliterate widgets when they are minimized
2020-04-09 14:40:40 -06:00
3dc03ba089
Pass widget data through from sticker picker
...
This allows for sticker pickers to have custom template variables.
Fixes https://github.com/vector-im/riot-web/issues/6716
2020-04-09 14:40:23 -06:00
db3c7a8f1c
Obliterate widgets when they are minimized
...
Fixes https://github.com/vector-im/riot-web/issues/12810
We do this to all widgets as we can't guarantee what sorts of other widgets might need similar treatment.
2020-04-09 14:31:46 -06:00
74291e8c2d
Merge pull request #4370 from matrix-org/t3chguy/clear_event_line
...
Fix image thumbnail width when read receipts are hidden
2020-04-09 20:57:12 +01:00
e1a496f231
Pass along key backup for bootstrap
...
If we ask for the key backup key early in creating secret storage to ensure we
trust the backup, then we stash it to ensure it's available to bootstrap as well
without prompting again.
Fixes https://github.com/vector-im/riot-web/issues/12958
2020-04-09 17:32:57 +01:00
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
...
Add toggle for e2ee when creating private room
2020-04-09 17:22:58 +01:00
5dfcfb2147
Merge pull request #4372 from matrix-org/dbkr/search_fail_logging
...
Fix logging for failed searches
2020-04-09 16:27:08 +01:00
53b753789a
Fix logging for failed searches
...
error is an object so appending it to a string is not helpful
2020-04-09 16:04:14 +01:00
c1dcb690b3
Merge pull request #4369 from matrix-org/bwindels/fixresetkeys
...
Ensure UI is updated when cross-signing gets disabled
2020-04-09 13:34:40 +00:00
928d4acd31
Merge pull request #4371 from matrix-org/dbkr/retry_master_key_fetch
...
Retry the request for the master key from SSSS on login
2020-04-09 14:20:36 +01:00
b6ef30af8f
Retry the request for the master key from SSSS on login
...
If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
2020-04-09 13:40:46 +01:00
60808ef6d2
apply clear:both to fix automatic margins for continuation events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 13:36:53 +01:00
282577cefb
recalculate toasts when cross-signing gets en/disabled
2020-04-09 13:43:51 +02:00
291fae6493
update room trust when cross-signing gets en/disabled
2020-04-09 13:43:30 +02:00
d4ba8103b6
Merge pull request #4365 from matrix-org/jryans/upgrade-2020-04-08
...
Upgrade deps
2020-04-09 10:19:16 +01:00
120e2201ad
Merge pull request #4367 from matrix-org/t3chguy/app_load2
...
App load tweaks, i18n and localStorage
2020-04-09 10:16:19 +01:00
cef9dbe254
Analytics.js gets executed during times where localStorage is not ensured to exist
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 21:42:58 +01:00
68608c2bcb
Fix gen-i18n.js script for .ts files
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 21:42:12 +01:00
e30e245bc7
Merge pull request #4366 from matrix-org/travis/encode-widgets
...
Fix encoding of widget arguments
2020-04-08 13:12:03 -06:00
b5aaae1c27
Fix encoding of widget arguments
...
Fixes https://github.com/vector-im/riot-web/issues/12985
This is done by using a more modern API and de-encoding dollar signs.
2020-04-08 12:58:52 -06:00
c87d6c22df
yarn upgrade
2020-04-08 14:49:52 +01:00
ffecf03b2a
Update margins to improve grouping
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:48:50 +01:00
4041c030a5
Apply changes from Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
eec28ce38a
Update styling and copy to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
a26a3f5862
Merge branch 'poljar/eventindex-log-improvement' into develop
2020-04-08 14:23:54 +02:00
5d65da12c2
Merge pull request #4364 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2020-04-08 13:15:01 +01:00
b0d2c3fd98
Merge branch 'origin/develop' into Weblate.
2020-04-08 11:20:01 +00:00
Michael Telatynski