8736867dcf
fix /invite Slash Command
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:53:25 +01:00
84da483264
Reset matrix-js-sdk back to develop branch
2020-04-01 15:00:05 +01:00
d8d48275c3
Merge branch 'master' into develop
2020-04-01 14:59:01 +01:00
adb2fc89e2
v2.3.1
2020-04-01 14:57:53 +01:00
abb8564c5d
Prepare changelog for v2.3.1
2020-04-01 14:57:53 +01:00
c027c5da41
Merge pull request #4327 from matrix-org/dbkr/template_popout_url_rel
...
Fix jitsi popout URL
2020-04-01 14:45:02 +01:00
4be08a901a
Merge pull request #4326 from matrix-org/dbkr/template_popout_url
...
Fix jitsi popout URL
2020-04-01 14:44:22 +01:00
53c854efba
Fix jitsi popout URL
...
Needs the template variables filled in
2020-04-01 14:44:01 +01:00
8aa24f8987
Fix jitsi popout URL
...
Needs the template variables filled in
2020-04-01 14:42:17 +01:00
3f93bdb329
Merge pull request #4324 from matrix-org/jryans/conf-under-release
...
Remove underscore from Jitsi conference names
2020-04-01 14:24:09 +01:00
cf635c66db
Remove underscore from Jitsi conference names
...
Fixes https://github.com/vector-im/riot-web/issues/12929
Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
2020-04-01 14:22:14 +01:00
144c657b61
Merge pull request #4323 from matrix-org/dbkr/use_own_jitsi_widget_for_popout
...
Use our own jitsi widget for the popout URL
2020-04-01 14:07:53 +01:00
66d292f722
Use our own jitsi widget for the popout URL
...
rather than the URL supplied by the widget
2020-04-01 14:01:01 +01:00
f3e2ab6098
Merge pull request #4322 from matrix-org/dbkr/jitsi_fix_popout_rel
...
Fix popout support for jitsi widgets
2020-04-01 13:59:43 +01:00
ce68b960f4
Use our own jitsi widget for the popout URL
...
rather than the URL supplied by the widget
2020-04-01 13:58:44 +01:00
2cc938a576
Remove unintentional changes
2020-04-01 13:36:26 +01:00
293c8f0e7c
lint
2020-04-01 13:36:20 +01:00
3087f816fe
Use URL without wurl params for popout
...
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 13:36:13 +01:00
d92a19ecff
Remove get-config API
...
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 13:36:06 +01:00
6df4a44cc1
Better support for widgets overriding their URLs
...
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 13:36:00 +01:00
a76b089cf3
Merge pull request #4319 from matrix-org/dbkr/jitsi_fix_popout
...
Fix popout support for jitsi widgets
2020-04-01 11:57:25 +01:00
072d9f12c7
Remove unintentional changes
2020-04-01 11:41:32 +01:00
9b4ce02eaf
lint
2020-04-01 11:28:02 +01:00
a2f92e93a7
Use URL without wurl params for popout
...
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 11:18:45 +01:00
7a92c90b79
Merge pull request #4318 from matrix-org/bwindels/fixlegacyuserverif
...
Fix: legacy verify user throwing error
2020-04-01 10:03:53 +00:00
775ba0f74e
Merge pull request #3046 from matrix-org/bwindels/settings-config-doc
...
document settingDefaults
2020-04-01 09:57:43 +00:00
66aea5eea5
Merge branch 'develop' into bwindels/settings-config-doc
2020-04-01 11:43:03 +02:00
274eb75c38
Remove get-config API
...
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 10:40:03 +01:00
ce8f7eaace
Apply suggestions from code review
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-01 09:37:17 +00:00
50bb556bc7
Update docs/settings.md
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-01 09:36:50 +00:00
7ba6462a5d
Merge pull request #4317 from matrix-org/t3chguy/fix_kbd_finnish
...
Fix Ctrl+/ for Finnish keyboard where it includes Shift
2020-04-01 10:30:39 +01:00
6dc7bf4bdf
fix legacy verify user
2020-04-01 11:22:22 +02:00
6bb6dbc0ff
Fix Ctrl+/ for Finnish keyboard where it includes Shift
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:14:15 +01:00
538147f7fa
Better support for widgets overriding their URLs
...
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 10:00:33 +01:00
56dda3895c
Merge pull request #4302 from matrix-org/t3chguy/cmds
...
rework SlashCommands to better expose aliases
2020-03-31 17:04:31 +01:00
c75475f3f5
Merge pull request #4311 from matrix-org/t3chguy/fix_els
...
Fix EventListSummary when RR rendering is disabled
2020-03-31 16:18:16 +01:00
6da01a9cf7
Merge pull request #4299 from JorikSchellekens/joriks/css-location
...
Update link to css location.
2020-03-31 16:00:11 +01:00
9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking
...
Fix peeking keeping two timeline update mechanisms in play
2020-03-31 14:21:42 +01:00
2624017ab9
Also stop peeking on unmount
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:51:03 +01:00
9e8a401dc8
Fix EventListSummary when RR rendering is disabled
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:29:58 +01:00
80479195c8
iterate PR based on feedback. Remove newballsplease cmd alias
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 11:53:26 +01:00
6e61761012
Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds
...
Conflicts:
src/SlashCommands.tsx
2020-03-31 11:49:53 +01:00
223a4e285d
Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload
...
Pass new secret storage key to bootstrap path
2020-03-31 11:04:58 +01:00
24c09cc4c8
Convert secret storage key creation to object
2020-03-31 10:45:53 +01:00
a2a9dc6cd0
Fix peeking keeping two timeline update mechanisms in play
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 10:37:56 +01:00
2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red
...
Show red shield for users that become unverified
2020-03-31 10:07:28 +01:00
c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2
...
Accessibility fixed for Event List Summary and Composer Format Bar
2020-03-31 09:41:20 +01:00
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso
...
Support $riot: Templates for SSO/CAS urls in the welcome.html page
2020-03-31 09:39:40 +01:00
2557875fd2
Merge pull request #4296 from waylon531/upstream
...
Added the /html command
2020-03-30 20:56:24 -06:00
690b5945d0
Pass new secret storage key to bootstrap path
...
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.
Fixes https://github.com/vector-im/riot-web/issues/12867
2020-03-30 21:40:11 +01:00
Michael Telatynski