Bruno Windels
48247e66be
use underscore for italics so it doesn't collide with bold when toggling
2019-09-06 17:52:37 +02:00
Bruno Windels
fe482258ac
Merge pull request #3402 from matrix-org/bwindels/cider-toggle-inline-formatting
...
New composer: support toggling inline formatting
2019-09-06 14:42:16 +00:00
Bruno Windels
14fff3be9a
Merge pull request #3399 from matrix-org/bwindels/fix-formatbar-edit-position
...
Fix format bar not appearing in edit composer
2019-09-06 14:28:23 +00:00
Bruno Windels
26bd694c6a
support toggling inline formatting
2019-09-06 16:25:55 +02:00
J. Ryan Stinnett
3ad88604cc
Stregthen bound 3PID warning dialog
...
This tweaks the bound 3PID text and adds danger styling.
Fixes https://github.com/vector-im/riot-web/issues/10750
2019-09-06 15:18:01 +01:00
Michael Telatynski
70ff2bc9cd
Switch to createReactClass: views/rooms and test/components. React 16 :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-06 15:04:46 +01:00
Bruno Windels
4e98721ba9
take bounding box for positioning calculation
2019-09-06 15:56:46 +02:00
J. Ryan Stinnett
5fddb20d86
Stop setting IS input field on account change
...
This stops setting a value in the IS input on account change. While it may have
been marginally useful if you have the form open and change on a different
device, it also seems to pick up changes on the current device, leading to
strange UX locally.
Fixes https://github.com/vector-im/riot-web/issues/10756
Fixes https://github.com/vector-im/riot-web/issues/10757
2019-09-06 14:33:40 +01:00
Michael Telatynski
4db8ef4d89
Correct case of propTypes property in ES6 React Components. React 16
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-06 14:27:33 +01:00
J. Ryan Stinnett
11a5fca702
Remove logs
2019-09-06 13:44:44 +01:00
J. Ryan Stinnett
df03477907
Show change warning only when different from current
2019-09-06 11:54:08 +01:00
J. Ryan Stinnett
19fff51b01
Rework handling for terms CORS error
...
Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
2019-09-06 11:12:10 +01:00
Bruno Windels
dd1c01068f
fix rename that didn't make it through rebasing
2019-09-06 11:58:27 +02:00
J. Ryan Stinnett
2ff592c542
Use existing modal promises
2019-09-06 10:48:24 +01:00
Bruno Windels
5014b606db
Merge pull request #3391 from matrix-org/bwindels/cider-format-history
...
New composer: ensure undo history is persisted before applying formatting
2019-09-06 09:28:18 +00:00
Bruno Windels
df4762871a
Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain
...
New composer: fix pasting from word processors
2019-09-06 09:22:37 +00:00
Bruno Windels
6b104f6344
Merge pull request #3393 from matrix-org/bwindels/cider-fix-lastcaret
...
New composer: fix needing to push arrow-up twice after sending first message after switching to a room
2019-09-06 09:22:10 +00:00
Bruno Windels
9dac91a70d
ensure step before formatting is persisted in undo history
2019-09-06 11:20:24 +02:00
Bruno Windels
0252c7ae37
force pasting as plain text in new composer
2019-09-06 11:10:41 +02:00
Bruno Windels
2596281a7c
update last caret from update callback instead of input event
...
many editor updates are not caused by an input event, so
the last caret wasn't always up to date.
Updating the caret from the update callback ensures that every
time the editor contents is changed, the last caret is updated.
2019-09-06 11:09:01 +02:00
Bruno Windels
f4938f9d11
dont format empty ranges
2019-09-06 10:59:41 +02:00
Bruno Windels
06143ba7a1
show keyboard shortcuts in format button tooltip
2019-09-06 10:59:41 +02:00
Bruno Windels
bdcea6f21e
add shortcuts for formatting
2019-09-06 10:59:41 +02:00
Bruno Windels
b4b9c7d072
Add tooltip for format buttons
2019-09-06 10:39:19 +02:00
Bruno Windels
da29057fd8
move format bar to own component
2019-09-06 10:39:19 +02:00
Bruno Windels
02681d50b9
Merge pull request #3386 from matrix-org/bwindels/cider-formatbar
...
New composer: show format bar on selection
2019-09-06 08:38:01 +00:00
Bruno Windels
92c0c1a4e2
add comment about positioning the format bar
2019-09-06 10:29:18 +02:00
Travis Ralston
af35cdc2ea
Support sending hidden read receipts
...
Fixes https://github.com/vector-im/riot-web/issues/2527
2019-09-05 20:30:19 -06:00
J. Ryan Stinnett
d5552e4a17
Add bound 3PID warning when changing IS as well
...
This extends the bound 3PID warning from the disconnect button to also appear
when changing the IS as well. At the moment, the text is a bit terse, but will
be improved separately.
Fixes https://github.com/vector-im/riot-web/issues/10749
2019-09-05 17:52:46 +01:00
Travis Ralston
26eb617bec
Merge pull request #3384 from matrix-org/travis/fix-pl
...
Fix member power levels in room settings
2019-09-05 07:16:52 -06:00
Bruno Windels
4ef9fa53ac
better i18n
2019-09-05 11:10:13 +02:00
Travis Ralston
d6adf0fd6d
Add responsible error handling because we're responsible people
2019-09-04 11:24:31 -06:00
Bruno Windels
2ea556e0b4
support update callback setting selection instead of caret
2019-09-04 16:40:34 +02:00
Bruno Windels
4c04bc19c9
fixup: remove now unused import
2019-09-04 16:40:34 +02:00
Bruno Windels
6e694c113a
add support for inline/block code formatting
2019-09-04 16:40:34 +02:00
Bruno Windels
b35a3531bb
move quote formatting out of react component
2019-09-04 16:40:34 +02:00
Bruno Windels
b72d1a78ec
move inline formatting code out of react component
2019-09-04 16:40:34 +02:00
Bruno Windels
7f501b2aef
first impl of quote formatting
2019-09-04 16:40:13 +02:00
Bruno Windels
d4c7992f5a
first impl of inline formatting
2019-09-04 16:39:56 +02:00
Bruno Windels
7dc39baaf3
implement bold support in format bar
2019-09-04 16:35:03 +02:00
Bruno Windels
65ddfc0a50
show format bar when text is selected
2019-09-04 16:35:03 +02:00
Bruno Windels
4575aaa9f6
Merge pull request #3382 from matrix-org/bwindels/escape-command-slash
...
New composer: allow escaping the first slash to not write a command
2019-09-03 16:04:23 +00:00
J. Ryan Stinnett
3cb06c01b7
Merge pull request #3385 from matrix-org/jryans/email-invite-text
...
Improve email invite preview messaging
2019-09-03 16:58:14 +01:00
J. Ryan Stinnett
261bdab156
Fix indent
2019-09-03 16:55:17 +01:00
J. Ryan Stinnett
67299842e3
Use more specific messaging for email invite preview
...
This changes email invite previews to check more specific cases about whether
the email has been added to your account, you have an IS, the email is bound,
etc.
In addition, it always allows you to join if you want to.
Fixes https://github.com/vector-im/riot-web/issues/10669
2019-09-03 15:41:53 +01:00
Travis Ralston
2e3e2ec420
Fix member power levels in room settings
...
Fixes https://github.com/vector-im/riot-web/issues/10736
We didn't have an onChange property on the PowerSelector component
2019-09-03 08:36:24 -06:00
Bruno Windels
1063da0ed1
Revert "New composer: show markdown legend on focus"
2019-09-03 08:27:45 +00:00
Travis Ralston
71e13842b8
Merge pull request #3368 from matrix-org/travis/disable-msisdn
...
Disable MSISDN registration if the homeserver doesn't support it
2019-09-02 11:25:17 -06:00
Travis Ralston
5e8eb20c53
Merge pull request #3371 from matrix-org/travis/synapse_admin
...
Add a button to MemberInfo to deactivate a user
2019-09-02 11:08:45 -06:00
Bruno Windels
06ae0645c7
fix lint
2019-09-02 17:56:16 +02:00
Bruno Windels
712c3e5450
allow escaping the first slash to not write a command
2019-09-02 17:53:14 +02:00
Bruno Windels
422f482a6d
Merge pull request #3378 from matrix-org/bwindels/cider-md-legend
...
New composer: show markdown legend on focus
2019-09-02 14:59:44 +00:00
Bruno Windels
de9f923e36
Merge pull request #3380 from matrix-org/bwindels/cider-fix-dirty-flag-without-input-event
...
New composer: allow submitting after inserting newline
2019-09-02 14:59:18 +00:00
Bruno Windels
c4d7df768d
Merge pull request #3375 from matrix-org/bwindels/cider-colononmention
...
New composer: share user pill postfix between autocomplete and insert mention
2019-09-02 14:58:23 +00:00
Bruno Windels
ff74dd4b7f
Merge pull request #3374 from matrix-org/bwindels/fix-cider-command-detection
...
New composer: make command detection not break with pill candidates in command
2019-09-02 14:58:12 +00:00
J. Ryan Stinnett
00a69b996d
Clarify invite error text
...
This fixes a typo in the message (valide) and also has better handling of error
codes, because in some cases, we don't get one.
Fixes https://github.com/vector-im/riot-web/issues/10683
2019-09-02 15:53:13 +01:00
Bruno Windels
6163cefa6a
set dirty flag when programatically inserting text like with newlines
2019-09-02 16:29:25 +02:00
Bruno Windels
f200327ef2
show/hide legend when focusing/blurring
2019-09-02 16:15:18 +02:00
Bruno Windels
b7768f34f2
Add legend and style it
2019-09-02 16:15:18 +02:00
Bruno Windels
b9cb22e153
dont allow sending empty messages
2019-09-02 14:36:31 +02:00
Bruno Windels
c595371845
share user pill postfix between autocomplete and insert mention
...
where we decide to add a colon only if the composer is empty
2019-09-02 14:06:30 +02:00
Bruno Windels
b46e001d0a
allow pill-candidate parts in commands
2019-09-02 13:51:46 +02:00
Bruno Windels
4329d8c4ef
Merge pull request #3372 from matrix-org/bwindels/fix-command-tab-complete
...
New composer: fix tab-complete in commands
2019-09-02 11:38:13 +00:00
Bruno Windels
fdd23b34ae
also look backwards into commands for last word to tab-complete
2019-09-02 11:27:22 +02:00
Bruno Windels
a4376a76f0
only pass keyboard to autocomplete when it has selections
...
otherwise if tab is pressed, try to tab complete the last word
2019-09-02 11:25:29 +02:00
Travis Ralston
cfff576ef4
Add a button to MemberInfo to deactivate a user
...
Part of https://github.com/vector-im/riot-web/issues/4125
2019-09-01 18:04:24 -06:00
Michael Telatynski
6cc29b2a8c
Merge pull request #3363 from matrix-org/t3chguy/react16_6
...
Migrate away from React.createClass for auth and views/auth. React 16 :D
2019-09-01 22:46:55 +01:00
Travis Ralston
2bfffa76b5
Appease the linter
2019-08-30 15:54:00 -06:00
Travis Ralston
d47fb799a5
Disable MSISDN registration if the homeserver doesn't support it
2019-08-30 15:50:51 -06:00
Bruno Windels
3be32022f7
Merge pull request #3364 from matrix-org/bwindels/cider-ime-partii
...
New composer: force model update after IME composition finishes
2019-08-30 16:03:14 +00:00
Michael Telatynski
00a06af419
Hide the E2EE PL selector if room is already encrypted
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-30 10:57:46 +01:00
Michael Telatynski
8967871b23
Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e
...
Conflicts:
src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
src/i18n/strings/en_EN.json
2019-08-30 10:56:47 +01:00
Bruno Windels
42ba5f6f0a
force model update after composition finishes
2019-08-30 11:37:42 +02:00
Michael Telatynski
2e1fb4533c
Migrate away from React.createClass for auth and views/auth. React 16 :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-30 10:27:51 +01:00
J. Ryan Stinnett
27fdef557d
Merge pull request #3359 from matrix-org/jryans/features-without-is
...
Allow connecting to an IS from address picker
2019-08-30 10:19:28 +01:00
Bruno Windels
4779880a94
Merge pull request #3362 from matrix-org/bwindels/cider-no-enter-autocomplete
...
New composer: don't capture enter to close autocomplete
2019-08-30 08:17:47 +00:00
Travis Ralston
7dd6471059
Merge pull request #3018 from Sorunome/soru/spoilers
...
Add Spoilers as per MSC2010
2019-08-29 13:24:06 -06:00
Bruno Windels
c144edfcac
dont capture enter to close autocomplete
2019-08-29 18:39:35 +02:00
Bruno Windels
5105140902
Merge pull request #3358 from matrix-org/bwindels/cider-paste-images
...
New composer: support pasting files
2019-08-29 16:31:28 +00:00
Sorunome
4ae130bd27
add license header, descriptive comment and change to class
2019-08-29 18:13:52 +02:00
J. Ryan Stinnett
166fb696c2
Allow connecting to an IS from address picker
...
This allows those who previously disconnected from an IS to either choose the
default IS or a custom one from Settings via the address picker dialog.
Part of https://github.com/vector-im/riot-web/issues/10619
2019-08-29 15:28:34 +01:00
J. Ryan Stinnett
752eb17893
Remove subtext in room invite dialog
...
The subtext here was deemed redundant.
Part of https://github.com/vector-im/riot-web/issues/10619
2019-08-29 15:28:34 +01:00
Bruno Windels
fe7ac11abc
New composer: support pasting files
2019-08-29 16:19:05 +02:00
Bruno Windels
891ccf0f4c
don't update model while doing IME composition
...
this prevents the composition from being disrupted because
the DOM is modified, and also complete compositions are added
to the undo history like this.
2019-08-29 13:56:21 +02:00
Sorunome
fe9ae46ffb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers
2019-08-28 20:23:24 +02:00
J. Ryan Stinnett
599fccd9ce
Merge pull request #3343 from matrix-org/jryans/hide-is-field-during-auth
...
Reveal custom IS field only when required
2019-08-28 18:36:02 +01:00
Travis Ralston
838e115b72
Merge pull request #3338 from matrix-org/t3chguy/fix_jitsi_persisted_breaking_randomly
...
Only Destroy the expected persistent widget, not *ANY*
2019-08-28 10:49:29 -06:00
Michael Telatynski
a8c5b02464
Merge pull request #3352 from matrix-org/t3chguy/pl_room_upgrade
...
Expose upgrade room permissions in room settings and fix command
2019-08-28 17:44:50 +01:00
Bruno Windels
f119ac4b22
Merge pull request #3349 from matrix-org/bwindels/tab-complete-name
...
New composer: support forcing auto complete on name by hitting tab
2019-08-28 16:17:16 +00:00
Bruno Windels
29f96e659a
remove leftover code
2019-08-28 17:53:03 +02:00
David Baker
c749b6355f
Update email help text
...
Fixes https://github.com/vector-im/riot-web/issues/10674
2019-08-28 10:34:50 -04:00
Bruno Windels
85efb71a23
add visual bell when no replacements are available
...
also add try/catch in _tabCompleteName so errors don't get swallowed
2019-08-28 15:53:16 +02:00
Michael Telatynski
f70f983c8c
Expose upgrade room permissions in room settings and fix command
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 12:00:37 +01:00
Michael Telatynski
66714b29af
expose power level toggle for enabling e2ee to room settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 11:37:20 +01:00
J. Ryan Stinnett
ac6b03551a
Describe props default
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-28 11:24:11 +01:00
David Baker
ac2b8b874f
Don't infinite loop on server change
...
ServerConfig assumed that the state was already correct when
checking the given urls against the default, but that is not
neccessarily the case (eg. the validation can return a different
url to what the user entered). This would cause an infinite loop
because it would keep firing onServerConfigChange to change to
the desired URLs but the state would never change.
Fixes part of https://github.com/vector-im/riot-web/issues/10666
2019-08-27 17:29:56 -04:00
Travis Ralston
3eddded039
Merge branch 'develop' into travis/tabbed-managers
2019-08-27 09:07:52 -06:00
Bruno Windels
d8bb9ecedf
bring insert method inline with transform callback, add docs
...
before the insertPartsAt method would call the update callback
on its own, but now we have the concept of a transformation session,
so lets bring the API in line
2019-08-27 16:43:05 +02:00
Bruno Windels
f5bb872efa
some cleanup
2019-08-27 16:43:05 +02:00
Bruno Windels
f02713d08e
force completion when hitting tab
...
by replacing word before caret with pill-candidate and
forcing auto complete
2019-08-27 16:43:05 +02:00
Bruno Windels
f76a23d5dd
return promise from updating autocomplete
...
so one can await if needed
2019-08-27 16:43:05 +02:00
Bruno Windels
e0b99b5cc8
Merge pull request #3342 from matrix-org/bwindels/cider-replace-emoticons
...
Auto-replace emoticons with emojis in new composer
2019-08-27 14:40:53 +00:00
Travis Ralston
08339abd35
Merge pull request #3348 from matrix-org/travis/fix-discovery
...
Adjust copy and include identity server changing when terms are pending
2019-08-27 08:27:03 -06:00
Bruno Windels
56606a46f4
don't assume preceding space for emoticon at start of document
...
also add more inline comments to explain what is going on
2019-08-27 09:50:36 +02:00
Travis Ralston
abbc8ffef0
Adjust copy and include identity server changing when terms are pending
...
Fixes https://github.com/vector-im/riot-web/issues/10636
Fixes https://github.com/vector-im/riot-web/issues/10635
2019-08-26 11:26:21 -06:00
Bruno Windels
0273795f5d
add transform step to composer to auto-replace emoticons with emoji
2019-08-26 16:16:27 +02:00
Michael Telatynski
d94e2179bf
Migrate away from React.createClass for views/dialogs. React 16 :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-24 11:59:46 +01:00
Travis Ralston
e8b0c41157
minus ;
2019-08-23 12:01:47 -06:00
Travis Ralston
c44ae2df4d
Treat 404 errors on IS as having no terms
...
Fixes https://github.com/vector-im/riot-web/issues/10634
2019-08-23 11:58:04 -06:00
J. Ryan Stinnett
72ec6c7062
Reveal custom IS field only when required
...
This hides the identity server at first from the custom server auth flows. For
the flows that may need an IS if the HS requires it (registration, password
reset), we then check with the HS before proceeding further and reveal the IS
field if it is in fact needed.
Fixes https://github.com/vector-im/riot-web/issues/10553
2019-08-23 18:43:55 +01:00
Travis Ralston
160396ca9e
Appease the linter
2019-08-23 09:16:44 -06:00
Travis Ralston
b3cda4b19a
Support multiple integration managers behind a labs flag
...
Fixes https://github.com/vector-im/riot-web/issues/10622
Implements [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957 )
Design is not final.
2019-08-23 09:12:40 -06:00
Bruno Windels
f39dc6feab
Merge pull request #3287 from matrix-org/bwindels/new-main-composer
...
Support editing composer to be used as main composer (feature flagged)
2019-08-23 10:06:19 +00:00
Michael Telatynski
cd6a980c7e
Only Destroy the expected persistent widget, not *ANY*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 16:57:51 +01:00
Travis Ralston
efe8254985
Merge pull request #3333 from matrix-org/travis/fix-tooltip
...
Remove tooltipClassName from the Field's input
2019-08-22 08:40:23 -06:00
Travis Ralston
fbb2af00da
Merge pull request #3335 from matrix-org/travis/fix-alignment
...
Fix alignment of discovery section addresses
2019-08-22 08:35:11 -06:00
Bruno Windels
944c56d09b
prevent cider history overlapping with slate composer history
2019-08-22 14:07:03 +01:00
Bruno Windels
6a3ecde4e6
duplicate slate code where we changed it drastically
...
to still make it work when the feature flag will be turned off
2019-08-22 14:05:54 +01:00
Bruno Windels
b366b0b3d8
store composer state when typing in new composer
...
this doesn't use the MessageComposerStore on purpose so that
both the new and old composer don't overwrite each others state,
as the format is different.
2019-08-22 13:33:20 +01:00
Bruno Windels
9f72268df7
avoid null-refs when receiving an action before initial rendering
2019-08-22 13:33:20 +01:00
Bruno Windels
6df46cc319
send typing notifs in new composer (both send and edit)
2019-08-22 13:33:20 +01:00
Bruno Windels
e2dfe888cc
only capture Enter when autocompletion list has selection
...
this is the old behaviour and makes sense IMO
also close the auto complete when resetting the composer model,
in case it was still open
2019-08-22 13:33:20 +01:00
Bruno Windels
3c5cf3e778
rename ComposerHistoryManager to SendHistoryManager to avoid confusion
...
...with the undo history manager for the composer.
2019-08-22 13:33:20 +01:00
Bruno Windels
c5cd8b943a
support auto complete for /commands
2019-08-22 13:33:20 +01:00
Bruno Windels
88cc1c428d
add support for emotes and running /commands
...
this does not yet include autocomplete for commands
2019-08-22 13:33:20 +01:00
Bruno Windels
cc82353d8f
bring back composer send history and arrow up to edit previous message
2019-08-22 13:33:20 +01:00
Bruno Windels
ca3539d53e
remove dead code
2019-08-22 13:33:20 +01:00
Bruno Windels
9bc8ff7e1e
clear composer undo history when sending a message
2019-08-22 13:33:20 +01:00
Bruno Windels
ea1faacd8b
support alt+enter on mac, like slate composer
2019-08-22 13:33:20 +01:00
Bruno Windels
9003a8836a
put dispatches together
2019-08-22 13:33:20 +01:00
Bruno Windels
2e71dd3ea8
cleanup, move code out of big switch statement
2019-08-22 13:33:20 +01:00
Bruno Windels
60e10364b0
add quoting functionality to new composer
2019-08-22 13:33:20 +01:00
Bruno Windels
10c218825b
allow inserting multiple parts at a position
2019-08-22 13:33:20 +01:00
Bruno Windels
a9d6d01f10
add reply fields to message content to be sent when replying
2019-08-22 13:33:20 +01:00
Bruno Windels
7b3282185a
update proptypes
2019-08-22 13:33:20 +01:00
Bruno Windels
c135cd60d2
restore insert mention
...
for this, we need to store the last caret in the editor,
to know where to insert the user pill.
Because clicking on a member blurs the editor, and the
selection is moved away from the editor.
For this reason, we keep as cache of the last caretOffset object,
invalidated by a selection with different values.
The selection needs to be cloned because apparently the browser
mutates the object instead of returning a new one.
2019-08-22 13:33:20 +01:00
Bruno Windels
71286b5610
restore reply_to_event action
2019-08-22 13:33:20 +01:00
Bruno Windels
e39c405c55
restore focus_composer action
2019-08-22 13:33:20 +01:00
Bruno Windels
fdf5fca628
add all props to proptypes
2019-08-22 13:33:20 +01:00
Bruno Windels
2cff486ec0
set placeholder same as label
2019-08-22 13:33:20 +01:00
Bruno Windels
f9992a1fc6
implement editor placeholder
2019-08-22 13:33:20 +01:00
Bruno Windels
e2e4ea493f
set aria label on main composer too
2019-08-22 13:33:20 +01:00
Bruno Windels
cfbd2e9cc8
support basic sending with new main composer
...
this removes all formatting options, as the new editor doesn't
have any.
2019-08-22 13:33:20 +01:00
Bruno Windels
df8488e194
pass label through props
2019-08-22 13:33:20 +01:00
Bruno Windels
505846ce53
split up css, update class names
2019-08-22 13:33:20 +01:00
Bruno Windels
341fdcd761
cleanup lint errors
2019-08-22 13:33:20 +01:00
Travis Ralston
6449016d4b
Fix alignment of discovery section addresses
...
We target the addresses specifically to avoid crushing the subsection text.
2019-08-21 14:41:25 -06:00
Travis Ralston
54633f3ad4
Remove extraneous logging
2019-08-21 12:57:54 -06:00
Travis Ralston
6f7bbf958e
Remove tooltipClassName from the Field's input
...
React doesn't want the property on the <input>, so we'll take it off.
2019-08-21 12:51:16 -06:00
Travis Ralston
04bb2ed322
Merge pull request #3327 from matrix-org/travis/discover-terms
...
Handle terms agreement in Discovery section of user settings
2019-08-21 10:14:45 -06:00
Travis Ralston
5bf0587cc5
Don't double translate labs settings
...
SettingsStore.getDisplayName() already calls _t() for us.
Fixes https://github.com/vector-im/riot-web/issues/10586
2019-08-21 08:55:19 -06:00
Travis Ralston
2dc28a608f
Move URL abbreviation to its own util file
2019-08-21 08:46:10 -06:00
Travis Ralston
c758b5d3f1
We don't use reject
2019-08-21 08:43:42 -06:00
Travis Ralston
f55a40001c
Touch up settings: alignment, spacing, error states
...
Fixes https://github.com/vector-im/riot-web/issues/10554
Issues fixed:
* Fields were not ~30px from the avatar (too much right margin)
* Tooltips overflowed the dialog on some resolutions
* SetIdServer didn't have an error state for making the field red
* Spacing between sections in Discovery was wrong (fixed by just removing the problematic n+2 selector - it didn't help anything)
2019-08-20 13:20:07 -06:00
Jason Robinson
29085895a7
Fix regression on widget panel edit button
...
Due to commit ffa49df889
the parameters for the call to open a widget in edit mode from the
widget panel in a room has broken. The `screen` parameter needs
to be prefixed with `type_` as it was before.
This corresponds to parameters supplied when creating the URL when
opening a widget in edit mode through Scalar screens.
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-08-20 15:55:57 +03:00
David Baker
f5da870040
Merge pull request #3326 from matrix-org/dbkr/device_name_public
...
Clarify that device names are publicly visible
2019-08-20 09:29:45 +01:00
Travis Ralston
7cd2fb3718
Appease the linter
...
It really wants a trailing comma.
2019-08-19 23:03:01 -06:00
Travis Ralston
3181829532
Use new InlineTermsAgreement component on IS Discovery section
...
Fixes https://github.com/vector-im/riot-web/issues/10522
2019-08-19 23:00:05 -06:00
Travis Ralston
417de0cac7
Add an inline terms agreement component
...
Handles agreement of terms in an inline way.
2019-08-19 22:59:33 -06:00
Travis Ralston
83af732d05
Rename and export abbreviateIdentityUrl
2019-08-19 22:53:37 -06:00
J. Ryan Stinnett
fef3438ef1
Merge pull request #3325 from matrix-org/jryans/tweak-privacy-copy
...
Tweak privacy settings copy and whitespace
2019-08-19 21:35:49 +01:00
David Baker
f7083ac332
Clarify that device names are publicly visible
...
And also a bunch of other UI fixes in the devices table:
* It's the devices table, don't need 'device' in all the headers
* Not really necessary to label checkboxes with 'select'
* Stop table from moving down when the delete button appears
Fixes https://github.com/vector-im/riot-web/issues/10216
2019-08-19 18:09:37 +01:00
Travis Ralston
2d4c2b76d9
Merge branch 'develop' into travis/is-account-data
2019-08-19 10:36:42 -06:00
Travis Ralston
95bd41aac7
Merge pull request #3317 from matrix-org/travis/terms/inline-is-only
...
Prompt for terms of service on identity server changes
2019-08-19 10:35:58 -06:00
Travis Ralston
32abfbbfc6
Rename functions
2019-08-19 10:27:57 -06:00
David Baker
6879ddd34c
Merge pull request #3323 from matrix-org/dbkr/add_3pid_without_is
...
Allow 3pids to be added with no ID server set
2019-08-19 17:02:56 +01:00
David Baker
93af6cfd8d
Fix up remove threepid confirmation UX
...
Probably still not the best design but hopefully break fewer UX rules:
1. Use red to confirm delete rather than cancel and green to cancel
2. Show the action you're about to perform in the confirmation
3. Label confirmation button with the action rather than yes/no.
2019-08-19 15:37:12 +01:00
David Baker
c1b72fd346
Allow 3pids to be added with no ID server set
...
Fixes https://github.com/vector-im/riot-web/issues/10573
2019-08-19 15:17:14 +01:00
J. Ryan Stinnett
5af9bf7b80
Use designed text for new IS field
2019-08-19 14:44:53 +01:00
J. Ryan Stinnett
d4ecb99d11
Show the default IS as a placeholder in Settings
...
This changes the UX for the set IS field to show the default IS as a placeholder
value (as opposed to an initial value as if the user had actually entered it).
Fixes https://github.com/vector-im/riot-web/issues/10528
2019-08-19 14:20:01 +01:00
J. Ryan Stinnett
07826c5675
Hide 3PID discovery sections when no identity server
...
This hides the email and phone sections of Discovery in the Settings when there
is no IS, as they can't meaningfully be used.
Part of https://github.com/vector-im/riot-web/issues/10528
2019-08-19 14:03:43 +01:00
David Baker
2a626c3f7c
Merge pull request #3318 from matrix-org/dbkr/allow_register_email_no_is
...
Allow registering with email if no ID Server
2019-08-19 11:18:30 +01:00
Travis Ralston
51946d2a74
Persist and maintain identity server in account data
...
Fixes https://github.com/vector-im/riot-web/issues/10094
MSC: https://github.com/matrix-org/matrix-doc/pull/2230
2019-08-16 13:10:41 -06:00
Travis Ralston
3228062954
Merge branch 'travis/terms/inline-is-only' into travis/is-account-data
2019-08-16 12:45:40 -06:00
Michael Telatynski
a96df333e9
Merge pull request #3310 from matrix-org/t3chguy/fix_reply_parent_redacted
...
Fix showing events which were replied to and then redacted
2019-08-16 19:19:25 +01:00
Travis Ralston
2456912ec7
Merge remote-tracking branch 'origin/develop' into travis/terms/inline-is-only
2019-08-16 09:41:00 -06:00
David Baker
41a9db3224
Use new flag in /versions
2019-08-16 15:07:15 +01:00
Travis Ralston
218bee8071
Merge pull request #3316 from matrix-org/travis/terms/inline-im-is
...
Prompt for terms of service on integration manager changes
2019-08-16 07:31:36 -06:00
David Baker
e705d110af
Allow registering with email if no ID Server
...
If the server advertises that it supports doing so
This version uses a random me.dbkr prefix until the MSC is
written.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1017
Implements https://github.com/matrix-org/matrix-doc/pull/2233
2019-08-16 11:57:32 +01:00
David Baker
cde1944cac
Merge pull request #3314 from matrix-org/dbkr/warn_if_bound_threepids
...
Warn on disconnecting from IS
2019-08-16 10:56:39 +01:00
Travis Ralston
02f8b72533
tfw the linter finds bugs for you
2019-08-15 16:08:18 -06:00
Travis Ralston
9860baf0b4
Prompt for terms of service on identity server changes
...
Part of https://github.com/vector-im/riot-web/issues/10539
2019-08-15 16:02:02 -06:00
Travis Ralston
5fe691cf33
Double equals
2019-08-15 13:33:02 -06:00
Travis Ralston
e2f013ddb4
Appease the linter
...
This looks awkward, but should pass.
2019-08-15 13:31:45 -06:00
Travis Ralston
27504e1578
Prompt for terms of service on integration manager changes
...
Part of https://github.com/vector-im/riot-web/issues/10539
2019-08-15 13:28:23 -06:00
David Baker
7d96cc969a
use original bug
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-15 15:39:15 +01:00
David Baker
ded2297523
Merge pull request #3315 from matrix-org/dbkr/fix_set_im
...
Fix set integration manager tooltip
2019-08-15 15:38:34 +01:00
J. Ryan Stinnett
1c6312d999
Store ICE fallback permission in device setting
...
This stores the ICE server fallback permission in a device setting so it is
remembered across sessions.
Part of https://github.com/matrix-org/matrix-react-sdk/pull/3309
2019-08-15 15:04:23 +01:00
David Baker
40f693d0fc
Fix set integration manager tooltip
...
The name of the prop changed in the original PR and this one didn't
get updated.
2019-08-15 14:55:59 +01:00
David Baker
6f07f9157c
lint
2019-08-15 13:10:05 +01:00
David Baker
54fb1b5302
Unused variables / imports
2019-08-15 12:07:59 +01:00
David Baker
75770f7a4a
Warn on disconnecting from IS
...
...if the user has bound threepids
Fixes https://github.com/vector-im/riot-web/issues/10550
2019-08-15 12:04:07 +01:00
David Baker
4afed0fab4
Merge pull request #3313 from matrix-org/t3chguy/fix_jitsi_persisted_breaking_randomly
...
Fix Persisted Widgets (Jitsi) randomly closing on room change
2019-08-15 10:52:24 +01:00
Michael Telatynski
6f529852cd
Skip forceUpdate in ReplyThread if the redacted event is not relevant
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 23:27:04 +01:00
Michael Telatynski
4833d4cb23
Merge pull request #3312 from matrix-org/t3chguy/cleanup_legacy_verification
...
Verifying your own device should not ask you to "contact its owner"
2019-08-14 23:18:43 +01:00
Michael Telatynski
7b17ea1fa5
Fix Persisted Widgets (Jitsi) randomly closing on room change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 23:15:49 +01:00
Travis Ralston
beb6ec4327
Merge branch 'develop' into travis/integs/account_set
2019-08-14 08:45:01 -06:00
Michael Telatynski
8186f1be2e
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 14:08:10 +01:00
Michael Telatynski
e8834930f9
Verifying your own device should not ask you to "contact its owner"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 13:58:27 +01:00
David Baker
c74da125b2
i18n
2019-08-14 10:12:39 +01:00
David Baker
be7956db61
Spell out identity server
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:43 +01:00
David Baker
3c3b530e1e
Spell out identity server
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:30 +01:00
David Baker
85497610e3
Spell out identity server
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:15 +01:00
David Baker
0d560108b6
Kill smart quotes
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-14 10:07:50 +01:00
David Baker
b0420c106e
Prepopulate client default on disconnect
2019-08-14 10:06:05 +01:00
David Baker
735c6d73d8
Merge remote-tracking branch 'origin/develop' into dbkr/disco_is
2019-08-14 10:03:32 +01:00
David Baker
e2c5dc6bac
Merge pull request #3300 from matrix-org/dbkr/change_is
...
Add UI in settings to change ID Server
2019-08-14 09:42:20 +01:00
David Baker
7c35107a37
Update 3pids section visibility when id server set / unset
2019-08-13 18:40:27 +01:00
Michael Telatynski
a44d61fb75
add copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-13 18:17:42 +01:00
Michael Telatynski
6589e5dab9
Fix showing events which were replied to and then redacted
2019-08-13 18:13:47 +01:00
David Baker
c80c8dcf24
prefill id server box with default if there isn't one
2019-08-13 17:55:10 +01:00
David Baker
596ff93049
unused import
2019-08-13 16:38:46 +01:00
David Baker
2539da0dfa
Use fetch instead of browser-request
2019-08-13 16:37:56 +01:00
David Baker
31fd36efba
use accessiblebutton
2019-08-13 16:20:30 +01:00
Travis Ralston
d4bbed31d5
Merge branch 'develop' into travis/integs/account_set
2019-08-13 09:03:50 -06:00
Travis Ralston
831da696ad
Merge pull request #3301 from matrix-org/travis/integs/base
...
Refactor integration manager handling into a common place
2019-08-13 09:00:22 -06:00
David Baker
02504b9959
make it work again
2019-08-13 12:59:34 +01:00
David Baker
e5f913bc11
Merge remote-tracking branch 'origin/develop' into dbkr/change_is
2019-08-13 12:56:58 +01:00
David Baker
7afaba3bf1
link to doc issue
2019-08-13 11:05:41 +01:00
David Baker
860a9dbc82
s/tooltip/tooltipContent/
2019-08-13 11:01:04 +01:00
David Baker
c36c3a9b33
other general grammar
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:51:26 +01:00
David Baker
934b711936
write Identity Server out in full to be less confusing
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:48:56 +01:00
David Baker
c732ae3aa9
Correct license header
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:46:42 +01:00
David Baker
12eeb20574
Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent
...
Fix wrong default-letter-avatar for RoomAvatarEvent
2019-08-13 09:32:26 +01:00
Travis Ralston
03d735f4ed
Support changing your integration manager in the UI
...
Part of https://github.com/vector-im/riot-web/issues/10161
2019-08-12 15:40:50 -06:00
Travis Ralston
e21c12c2c9
Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set
2019-08-12 13:06:36 -06:00
Travis Ralston
60778d843d
Merge branch 'travis/integs/base' into travis/integs/account_set
2019-08-12 13:02:19 -06:00
Michael Telatynski
bb23374b8a
Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings
...
Consolidate Themes into ThemeController. Remove hardcoded themes in view
2019-08-12 15:57:56 +01:00
David Baker
0c4b29faa9
Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is
2019-08-12 14:47:40 +01:00
David Baker
4d33438acb
c+p fail
2019-08-12 14:46:04 +01:00
David Baker
0b51a5f452
c+p fail
2019-08-12 14:45:15 +01:00
David Baker
115e4c0370
Remove IS access token too
2019-08-12 14:40:11 +01:00
David Baker
ebc84b4445
Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is
2019-08-12 14:39:46 +01:00
David Baker
f358b6162d
Remove the access token for the old IS
...
Pretty important that we don't send that to the new IS...
2019-08-12 14:38:49 +01:00
David Baker
384f07adb2
Disconnect from IS button
2019-08-12 14:36:48 +01:00
Michael Telatynski
7bdac85a2a
Break themes out into a separate file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 14:24:12 +01:00
Michael Telatynski
691b9145ee
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig
...
Deduplicate code in ModularServerConfig by extending ServerConfig
2019-08-12 14:19:17 +01:00
David Baker
bc088e4472
add comment
2019-08-12 13:31:31 +01:00
David Baker
10b19622db
Don't clear field on failure
2019-08-12 13:29:52 +01:00
David Baker
bc66545fd0
shorten url by default
2019-08-12 13:11:05 +01:00
David Baker
06905bc5bb
Actually appease linter
2019-08-12 12:05:25 +01:00
David Baker
bf9caa7fd8
add the rest of the files
2019-08-12 11:51:44 +01:00
David Baker
417d9b6af8
nicer way to appease linter
2019-08-12 11:50:11 +01:00
Michael Telatynski
916af736ad
Consolidate Themes into ThemeController. Remove hardcoded themes in view
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:43:34 +01:00
Michael Telatynski
3e08bf6ecb
Deduplicate code in ModularServerConfig by extending ServerConfig
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:34:12 +01:00
Travis Ralston
ffa49df889
Refactor integration manager handling into a common place
...
It was already in a common place, but this is the boilerplate for supporting multiple integration managers, and multiple integration manager sources.
For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161
2019-08-09 16:08:06 -06:00
David Baker
4075cdde7f
lint
2019-08-09 18:59:57 +01:00
Michael Telatynski
242f23c753
RegistrationForm: the Fields are controlled, fix default values
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 18:08:17 +01:00
David Baker
c76514fceb
Add UI in settings to change ID Server
...
Just changes the current ID server being used
To come in subsequent PRs:
* Store this in account data
* Check for terms or support the proper UI for accepting terms when setting
* Support disconnecting
Part 1 of https://github.com/vector-im/riot-web/issues/10094
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013
2019-08-09 18:07:58 +01:00
Michael Telatynski
13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard
...
Add mount-guards to MImageBody
2019-08-09 16:55:08 +01:00
David Baker
fcdbce1dda
Change throttle to debounce
...
And add an explanation of whyI think one's more apropriate than the
other for this.
2019-08-09 15:30:05 +01:00
Michael Telatynski
72a83a8e6e
Add mount-guards to MImageBody
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 14:51:07 +01:00
Michael Telatynski
ee3542453e
Fix RoomAvatarEvent historic fallback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 11:31:04 +01:00
Michael Telatynski
423a74c99c
Clean up implementation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 20:21:53 +01:00
Michael Telatynski
28b42d512a
Use the room name rather than sender name for fallback room avatar event
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 20:07:38 +01:00
J. Ryan Stinnett
c2f81a00c4
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid
...
Add controls for toggling discovery in user settings
2019-08-08 17:48:17 +01:00
Michael Telatynski
d92f8e6d34
fix indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 16:47:16 +01:00
Michael Telatynski
22ee809922
Add way to report the content of a message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 16:39:15 +01:00
Travis Ralston
07d6fa7fdb
Merge pull request #3286 from matrix-org/travis/immutable-dms/basic
...
Reuse DMs whenever possible instead of asking to reuse them
2019-08-08 07:26:17 -06:00
J. Ryan Stinnett
11cf7493d9
Disable binding 3PIDs when adding to account
...
Binding 3PIDs on the IS is now handled by a separate step in the Discovery
section of settings.
Fixes https://github.com/vector-im/riot-web/issues/10510
2019-08-08 11:52:21 +01:00
J. Ryan Stinnett
178d6605c4
Add controls for toggling discovery in user settings
...
This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.
Fixes https://github.com/vector-im/riot-web/issues/10159
2019-08-08 11:35:35 +01:00
David Baker
54ca7b708e
Merge pull request #3285 from matrix-org/dbkr/work_without_is
...
Work with no ID server set
2019-08-08 09:48:44 +01:00
Travis Ralston
f85898cdca
Remove ChatCreateOrReuseDialog
...
Part of https://github.com/vector-im/riot-web/issues/10416
All usages of the dialog have been replaced with new DM logic.
2019-08-07 12:18:41 -06:00
Travis Ralston
3144b9f1a2
Disable 'Start New Chat' button in MemberInfo if we already have chats
...
Part of https://github.com/vector-im/riot-web/issues/10416
2019-08-07 12:06:27 -06:00
David Baker
d31f1ea7f2
Disable addign threepids if no IS configured
2019-08-07 11:51:42 +01:00
David Baker
366f7e277a
Make registration work without an IS.
2019-08-07 11:15:56 +01:00
Bruno Windels
66ef08120e
Merge pull request #3282 from matrix-org/bwindels/extract-common-editor-code
...
Split MessageEditor up in edit-specifics & reusable parts for main composer
2019-08-07 07:58:52 +00:00
Michael Telatynski
f6dbeef204
Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help
...
Add help slash command
2019-08-06 18:50:49 +01:00
Michael Telatynski
c022f58f3b
Merge pull request #3278 from matrix-org/t3chguy/electron_keep_alt_menu
...
Allow setting in electron whether or not to auto hide menu bar
2019-08-06 18:20:22 +01:00
Michael Telatynski
daf1a794e6
Merge pull request #3276 from matrix-org/t3chguy/react16_1
...
Progress towards React 16 compatibility
2019-08-06 18:09:30 +01:00
Michael Telatynski
5d048972ab
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:06:47 +01:00
Michael Telatynski
ae834f8d05
Split out SlashCommandHelpDialog, group by category and style it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:03:38 +01:00
Michael Telatynski
71338d5140
Hide settings button on Room Tile Context Menu for myMembership=invite
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 16:25:29 +01:00
Michael Telatynski
8c446bbd29
Merge pull request #3279 from matrix-org/t3chguy/remove_withMatrixClient
...
Remove withMatrixClient as we are committed to using Contexts
2019-08-06 14:12:14 +01:00
Michael Telatynski
d99fb4796f
avoid using import * as Matrix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 14:04:33 +01:00
J. Ryan Stinnett
accb1eea9f
Move existing 3PID settings UX to account directory
2019-08-06 13:03:49 +01:00
J. Ryan Stinnett
aa0a2a579e
Add copyright headers
2019-08-06 12:43:30 +01:00
J. Ryan Stinnett
11f2b4320d
Update existing 3PID management UX
...
This tweaks the appearance of the existing 3PID management UX to use a different
style for the remove button. This styling will more closely match the soon to be
added 3PID discovery settings.
Part of https://github.com/vector-im/riot-web/issues/10159
2019-08-05 16:34:04 +01:00
Bruno Windels
299cf8542c
Split MessageEditor in edit-specifics & reusable part for main composer
2019-08-05 15:31:18 +02:00
Michael Telatynski
224dac3ffb
Remove withMatrixClient as we are committed to using Contexts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 12:26:31 +01:00
Michael Telatynski
1e9881dd7d
Allow setting in electron whether or not to auto hide menu bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 11:58:53 +01:00
Michael Telatynski
e400053b69
s/hasCloseX/hasCloseButton/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:45:49 +01:00
Andrew Morgan
f80cbebb9d
Don't switch rooms when forgetting a room ( #3275 )
...
Don't randomly change to another room upon forgetting a room.
2019-08-05 10:34:46 +01:00
Michael Telatynski
debc124714
Use the documented syntax for default props in CreateReactClass
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:08:07 +01:00
Bruno Windels
9d49a5bb73
pass caret to history manager upon initial render
...
otherwise caret is put at editor start when undoing last step
2019-08-01 11:28:01 +02:00
Bruno Windels
234404e598
add mod+z/y shortcuts, set editor state to what history manager returns
2019-08-01 11:27:09 +02:00
Bruno Windels
98bc0d24f4
push changes to history manager
2019-08-01 11:26:20 +02:00
Michael Telatynski
4694a9bf12
Merge pull request #3263 from matrix-org/t3chguy/prop-types
...
Replace React.PropTypes with usage of the `prop-types` package
2019-07-31 14:24:27 +01:00
Bruno Windels
3e07d29926
Merge pull request #3261 from matrix-org/bwindels/edithistorywarning
...
Get rid of warning of required prop
2019-07-31 11:57:47 +00:00
Michael Telatynski
201d7fb448
Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types
...
# Conflicts:
# test/components/structures/MessagePanel-test.js
2019-07-31 12:21:00 +01:00
Michael Telatynski
1087e04bb5
Replace React.PropTypes with usage of the prop-types
package
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-31 12:19:29 +01:00
J. Ryan Stinnett
fb77802d54
Merge pull request #3260 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms
...
Introduce RoomContext for sharing state between RoomView and children
2019-07-31 11:43:26 +01:00
J. Ryan Stinnett
c338f8bf1f
Add room
context to test
2019-07-31 11:17:28 +01:00
J. Ryan Stinnett
ddf558b3ed
Fix context when using subtree of components
2019-07-31 11:10:49 +01:00
Bruno Windels
17e838e23b
this is optional, and not provided for first edit
2019-07-31 09:47:02 +02:00
Michael Telatynski
4517fea496
Introduce RoomContext for sharing state between RoomView and children
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-31 00:47:38 +01:00
J. Ryan Stinnett
5bb68b4b3b
Display lookup errors in the UI
2019-07-30 17:41:26 +01:00
J. Ryan Stinnett
4ebafb93c3
Rename isAccessToken to identityAccessToken
2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
dacb5d42ac
Support IS v2 auth in preview bar
2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
244b613623
Convert 3PID lookup in preview bar to async / await
2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
4d01d6a5b1
Move auth steps to IdentityAuthClient
2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
432e70e2ce
Add IS auth to AddressPickerDialog
2019-07-30 17:35:36 +01:00
J. Ryan Stinnett
dd792e10a9
Convert 3PID lookup in address picker to async / await
2019-07-30 17:35:35 +01:00
Bruno Windels
e855a056c7
Merge pull request #3247 from matrix-org/bwindels/editortests
...
Unit tests for new editor
2019-07-30 14:46:33 +00:00
Michael Telatynski
106af39a82
Merge pull request #3255 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms
...
Show MessageActionBar buttons conditionally on room state permissions
2019-07-29 23:11:19 +01:00
Michael Telatynski
c70e404f65
Merge pull request #3249 from matrix-org/t3chguy/AddressPickerDialog_pasting
...
Handle onPaste AddressPickerDialog, allow addressing CSV/NL/Space delim list
2019-07-29 23:10:35 +01:00
Michael Telatynski
90a3fedbef
Add close button to Slash Commands /help dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 22:33:56 +01:00
Michael Telatynski
883b3d1563
iterate PR based on feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 22:30:07 +01:00
Michael Telatynski
31ab97772c
Match code-style better
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 22:27:31 +01:00
Michael Telatynski
f45b1bfdda
Fix StubRoom for react-sdk tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 13:18:02 +01:00
Michael Telatynski
856e161c8b
add Debug
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 12:54:09 +01:00
Michael Telatynski
48f219f090
null-guard
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 12:28:30 +01:00
Michael Telatynski
7b2e18ff7c
Show MessageActionBar buttons conditionally on room state permissions
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 12:13:23 +01:00
Michael Telatynski
bf1d65623c
Move history with alt up/down regardless of where selection is
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 11:31:22 +01:00
Michael Telatynski
a97e2e6ef2
clean up onPaste error handling in AddressPickerDialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-25 21:49:22 +01:00
Michael Telatynski
c9e1c68726
Handle onPaste AddressPickerDialog, allow addressing CSV/NL/Space delim list
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-25 21:45:32 +01:00
Bruno Windels
9bfba9db3e
make PartCreator a bit more testable by not asking for deps of dep
2019-07-25 14:50:20 +02:00
J. Ryan Stinnett
cef67d5784
Merge pull request #3245 from matrix-org/jryans/tooltip-larger-buffer
...
Tweak interactive tooltip buffer area allow for overshoot
2019-07-25 13:16:20 +01:00
J. Ryan Stinnett
f5fbd30a28
Tweak interactive tooltip buffer area allow for overshoot
...
This uses a larger buffer area around the tooltip, as it easy to overshoot and
mouse the cursor past the tooltip.
Fixes https://github.com/vector-im/riot-web/issues/10400
2019-07-25 12:17:07 +01:00
J. Ryan Stinnett
7296fb8fd3
Merge pull request #3243 from matrix-org/jryans/app-perm-url
...
Keep widget URL in permission screen to one line
2019-07-25 11:38:24 +01:00
J. Ryan Stinnett
a5ac50f90f
Merge pull request #3242 from matrix-org/jryans/terms-modal
...
Avoid visual glitch when terms appear for Integration Manager
2019-07-24 14:27:43 +01:00
Bruno Windels
ac31b4b8f4
Merge pull request #3244 from matrix-org/bwindels/diffhtmledits
...
Show diff for formatted messages in the edit history
2019-07-24 09:59:23 +00:00
Bruno Windels
3753e5261d
Implement diffing html messages in the edit history
2019-07-24 11:28:56 +02:00
J. Ryan Stinnett
2d4264c39d
Keep widget URL in permission screen to one line
...
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.
Fixes https://github.com/vector-im/riot-web/issues/10402
2019-07-23 18:06:37 +01:00
J. Ryan Stinnett
846a908bb4
Add missing copyright header
2019-07-23 17:52:00 +01:00
J. Ryan Stinnett
39d5aa7cf4
Avoid visual glitch when terms appear for IM
...
This avoids a visual glitch where the Integration Manager portal would briefly
appear, but then be replaced by a smaller Terms dialog when there's something to
agree to.
To resolve this minimal code churn, this cheats a bit and customises the size of
the terms dialog to match the IM portal modal when terms are shown for IM
purposes.
Fixes https://github.com/vector-im/riot-web/issues/10386
2019-07-23 15:11:38 +01:00
Bruno Windels
58fd828944
Merge pull request #3241 from matrix-org/bwindels/dofocuscomposer
...
Restore manual composing focusing logic
2019-07-23 11:55:44 +00:00
David Baker
2eb8a8879b
Merge pull request #3199 from matrix-org/dbkr/terms
...
ToS for ISes/IMs: prompt on use screen
2019-07-23 10:32:11 +01:00
Bruno Windels
ceb53dc0bb
Revert "remove unnessary manual focussing of composer"
...
This reverts commit 57abbc4273
.
2019-07-23 09:13:51 +02:00
David Baker
84bb0eb696
Remove random capital
2019-07-22 12:25:12 +01:00
J. Ryan Stinnett
09c2d899ac
Defer IM token until widget is shown and permission granted
...
This defers the work to request the IM token when displaying a widget until
after we know that widget will actually be shown and the user has granted
permission for this widget to be displayed.
This is useful in general to avoid making unnecessary token checks, but it's
particularly helpful with the new Terms API, so that we only show the Terms flow
when widget are actually being used (as opposed to entering the room where
widgets exist, but haven't been shown / permitted).
Part of https://github.com/vector-im/riot-web/issues/10088
2019-07-22 11:50:54 +01:00
Bruno Windels
c713172a37
add proptypes
2019-07-19 16:34:50 +02:00
Bruno Windels
de1c4e0cfe
better naming
2019-07-19 16:34:39 +02:00
Bruno Windels
f305d8ac08
Basic diff visualisation for plain text edits
2019-07-19 16:09:23 +02:00
Bruno Windels
4fa7302f69
Merge pull request #3224 from matrix-org/bwindels/focus-composer-on-type
...
Focus composer when typing anywhere in the app
2019-07-18 16:10:23 +00:00
Bruno Windels
aca41fe80a
dont show remove button for original event in edit history
2019-07-18 14:09:29 +02:00
J. Ryan Stinnett
599c49613f
Remove reactions feature flag
...
Fixes https://github.com/vector-im/riot-web/issues/10282
2019-07-17 17:00:36 +01:00
J. Ryan Stinnett
674f33917f
Remove editing feature flag
...
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-17 16:56:15 +01:00
Bruno Windels
03f577bea9
use keydown here, as its a div element
2019-07-17 17:23:19 +02:00
Bruno Windels
50c88279a0
remove non-existing keypress handler
2019-07-17 17:05:56 +02:00
J. Ryan Stinnett
fc8cdc5661
Improve interactive tooltip safe mousing area
...
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.
Fixes https://github.com/vector-im/riot-web/issues/10185
2019-07-17 14:11:27 +01:00
Michael Telatynski
df26840d9e
ChatCreateOrReuse show only rooms both you and the other party still in
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-15 23:07:59 +01:00
Bruno Windels
57abbc4273
remove unnessary manual focussing of composer
...
now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
2019-07-15 18:21:10 +02:00
Travis Ralston
d08cb70fa6
Merge pull request #3219 from matrix-org/travis/fix-delay
...
Fix autocomplete delay text field not accepting text
2019-07-15 09:30:33 -06:00
Travis Ralston
31339aa11f
Don't show a reason if there's no reason for a kick/ban
...
Fixes https://github.com/vector-im/riot-web/issues/9677
2019-07-14 23:31:38 -06:00
Travis Ralston
345dbce6e4
Fix autocomplete delay text field not accepting text
...
SettingsStore.setValue is async (fire&forget) however getValueAt is cached. Theory was supposed to be that getValueAt local echos, however the animation loop of React is probably just too fast to actually make the local echo happen.
Fixes https://github.com/vector-im/riot-web/issues/9907
2019-07-14 23:28:23 -06:00
Travis Ralston
78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin
...
Autojoin rooms when clicking the tombstone
2019-07-12 08:14:42 -06:00
Travis Ralston
ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia
...
Send the correct UIA alongside the wrong UIA for backwards comaptibility
2019-07-12 08:14:01 -06:00
Travis Ralston
5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag
...
Remove unused identityEnabled property from ValidatedServerConfig
2019-07-12 08:11:55 -06:00
J. Ryan Stinnett
b27c1a45e4
Adjust spelling on debug log screen
2019-07-12 09:42:02 +01:00
Bruno Windels
7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste
...
Prevent autocomplete on paste, and verserev-ing text before and after :
2019-07-12 08:25:06 +00:00
Travis Ralston
7a3aa9be2e
Remove unused identityEnabled property from ValidatedServerConfig
...
See https://github.com/vector-im/riot-web/issues/10229
2019-07-11 15:11:09 -06:00
Travis Ralston
ba5238d86a
Finally fix tests
2019-07-11 15:01:56 -06:00
Travis Ralston
733401652b
Close settings after deactivating
...
Fixes https://github.com/vector-im/riot-web/issues/9566
2019-07-11 14:54:49 -06:00
Travis Ralston
862fb16120
Send the correct UIA alongside the wrong UIA for backwards comaptibility
...
Fixes https://github.com/vector-im/riot-web/issues/10312
2019-07-11 14:28:10 -06:00
Travis Ralston
c89a864a82
update copy
2019-07-11 12:54:26 -06:00
Bruno Windels
507b89fc61
manually attach input event handler, as React doesn't pass inputType
2019-07-11 18:46:56 +02:00
Travis Ralston
5f9a123a80
Require an issue URL (or notes) on rageshakes
...
Fixes https://github.com/vector-im/riot-web/issues/8155
2019-07-11 09:14:31 -06:00
Travis Ralston
ed2f88fd79
Autojoin rooms when clicking the tombstone
...
Fixes https://github.com/vector-im/riot-web/issues/10299
2019-07-11 08:39:41 -06:00
David Baker
99d1ed5efe
s/terms/policies/
2019-07-11 14:48:18 +01:00
David Baker
18dde859af
s/terms/policies/
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-11 14:46:20 +01:00
Michael Telatynski
56b1775209
Merge pull request #3198 from matrix-org/t3chguy/kick
...
Show anything other than ban/invite -> leave as a kick
2019-07-11 11:33:53 +01:00
David Baker
f77e7fc3e8
Use m.accepted_terms account data
...
To remember what policies the user has agreed to
2019-07-11 10:53:45 +01:00
J. Ryan Stinnett
9b3848d083
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files
...
Run stylelint on all SCSS files
2019-07-11 09:38:18 +01:00
Bruno Windels
dd12824a52
Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history
...
Show original event in edit history
2019-07-11 08:10:01 +00:00
Travis Ralston
2a54fe321f
Use the state variable for the password when deactivating
...
The Field is controlled, so we should be using the state. Otherwise the value is undefined, which means we don't supply the required auth.
Fixes https://github.com/vector-im/riot-web/issues/10302
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3071
2019-07-10 11:26:09 -06:00
J. Ryan Stinnett
38d6953bf6
Manually fix remaining stylelint issues
2019-07-10 16:56:40 +01:00
David Baker
0316aa11b7
Rest of terms/policies renaming
2019-07-10 15:12:05 +01:00
David Baker
8de5c348f3
focus is a bit silly if its starts disabled
2019-07-10 14:33:20 +01:00
David Baker
06c0bce053
These can be pure components
2019-07-10 14:32:37 +01:00
David Baker
72b1ad37a2
Remove random space
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:30:48 +01:00
David Baker
fcf82efc7c
Bots isn't a proper noun so no real reason for it to get a capital
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:17:42 +01:00
David Baker
189dd4c7b1
SERVICE_TYPES
2019-07-10 12:08:26 +01:00
Michael Telatynski
8d4356a5b9
Show anything other than ban/invite -> leave as a kick
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-10 08:57:00 +01:00
David Baker
83f697a9a2
lint
2019-07-09 19:01:22 +01:00
David Baker
d4af8d4993
Use showIntegrationsManager in other places
2019-07-09 18:56:39 +01:00
David Baker
54aaabac74
Initial support for ToS dialogs for IS/IM
...
as per MSC2140
2019-07-09 18:51:56 +01:00
Travis Ralston
4b1d78e04d
Merge branch 'develop' into travis/soft-logout-design
2019-07-09 11:35:49 -06:00
Travis Ralston
a33e5f1918
Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs
...
Fix React crash when using a non-default homeserver on soft logout
2019-07-09 11:32:31 -06:00
Bruno Windels
11718a982a
use originalEvent if present and append it to list
2019-07-09 17:54:59 +02:00
Bruno Windels
31723e9e5b
Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions
...
Don't try to call bodyToHtml with an empty content
2019-07-09 15:05:03 +00:00
Bruno Windels
7ab665bf31
Merge pull request #3193 from matrix-org/bwindels/replace-server-date
...
Take server-side aggregation into account for timestamp on (edited) tooltip
2019-07-09 15:03:21 +00:00
Bruno Windels
f03187190e
Don't try to call bodyToHtml with an empty content
...
with the stripReply flag, this crashes.
2019-07-09 15:00:26 +02:00
Michael Telatynski
349afb13f3
Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches
...
Fix some React errors
2019-07-09 10:59:29 +01:00
Bruno Windels
58d7ed02b7
use method that also takes server aggregations into account for tooltip date
2019-07-09 11:31:29 +02:00
Bruno Windels
f6e71b2335
turn flag into options object
2019-07-08 16:55:56 +02:00
Bruno Windels
e601037cd2
don't show reply fallback in edit history
2019-07-08 15:32:38 +02:00
Bruno Windels
888e4d1ec2
preserve reply fallback when editing
2019-07-08 15:25:44 +02:00
Michael Telatynski
dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl
...
Don't show Remove button in ImageView if can't redact, delint ImageView
2019-07-08 10:23:51 +01:00
Bruno Windels
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions
...
Edit history actions
2019-07-08 08:19:27 +00:00
Bruno Windels
1af2ca6b36
constistent jsx bracket and indent styling
2019-07-08 10:12:26 +02:00
Bruno Windels
cf11a3758f
set analyticsInfo for dialogs
2019-07-08 10:12:04 +02:00
Michael Telatynski
c2905bd33b
make things a tad saner
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:16:01 +01:00
Michael Telatynski
89ece266c6
Make id used in EditableItemList unique, namespace mx_EditableItemList_*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:15:10 +01:00
Michael Telatynski
6b9c6a31f0
Don't show Remove button in ImageView if can't redact, delint ImageView
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 10:42:14 +01:00
Michael Telatynski
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying
...
Don't allow editing via up-arrow when Replying
2019-07-06 08:53:22 +01:00
Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit
...
If oldContent matches newContent, skip sending the edit
2019-07-06 08:52:58 +01:00
Travis Ralston
ae79ce97f3
Dress up the soft logout page to look like the design
...
Fixes https://github.com/vector-im/riot-web/issues/10262
Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
2019-07-05 15:05:31 -06:00
Travis Ralston
1f1a5b2aac
Fix React crash when using a non-default homeserver on soft logout
...
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
2019-07-05 14:35:21 -06:00
J. Ryan Stinnett
74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text
...
Allow diplayed reaction values to contain anything
2019-07-05 16:35:06 +01:00
J. Ryan Stinnett
87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null
...
Fix interactive tooltip null target error
2019-07-05 16:28:12 +01:00
J. Ryan Stinnett
eb0e1eade4
Clamp reaction content width to at most 100px
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:16 +01:00
J. Ryan Stinnett
2a8f9a81f7
Allow diplayed reaction values to contain anything
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:06 +01:00
Bruno Windels
70334b69ec
implement view source for edits
2019-07-05 16:11:15 +02:00
Bruno Windels
f4a8314c4f
make dom tree similar to eventtile so red lozenge style applies
2019-07-05 16:05:40 +02:00
Bruno Windels
0aa1252d01
monitor associated send status for edit history events
...
to update local echo if needed
2019-07-05 16:04:34 +02:00
Bruno Windels
2182248d7c
mark events from /relations as locally redacted if any pending redaction
2019-07-05 16:03:34 +02:00
J. Ryan Stinnett
5496a4dce6
Fix interactive tooltip null target error
...
Fixes https://github.com/vector-im/riot-web/issues/10232
2019-07-05 15:02:09 +01:00
Michael Telatynski
89d568ce97
Don't allow editing via up-arrow when Replying
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-05 08:36:16 +01:00
Travis Ralston
f3c6c73329
Merge pull request #3177 from matrix-org/travis/soft-logout-base
...
Implement basic soft logout handling
2019-07-04 10:22:18 -06:00
Bruno Windels
8468f7cdc3
support redactions in edit history dialog
2019-07-04 16:33:05 +02:00
Bruno Windels
375976575b
add redact button
2019-07-04 11:07:22 +02:00
Bruno Windels
3f28f2e4a6
Merge pull request #3174 from matrix-org/bwindels/edit-history-error
...
show /relations error in edit history dialog
2019-07-04 09:05:29 +00:00
Travis Ralston
42e6287bdb
Implement basic soft logout handling
...
Fixes https://github.com/vector-im/riot-web/issues/10235
CSS and copy are left as an exercise for a later iteration.
Login page handling is left for https://github.com/vector-im/riot-web/issues/10236
This implementation reuses as much of the Lifecycle flow as it can without causing problems. Most importantly, it requires https://github.com/matrix-org/matrix-js-sdk/pull/975 to be able to detect a soft logout and react to it. When it comes time to starting/stopping the Lifecycle, additional parameters are provided so that the auxiliary services can (re)start themselves without the client starting to sync.
2019-07-03 16:46:37 -06:00
Bruno Windels
4dc8de0e71
log server errors in edit history dialog
2019-07-03 17:53:32 +02:00
Bruno Windels
e7e6af2592
use existing strings
2019-07-03 17:51:16 +02:00
David Baker
668d24111c
Merge pull request #3173 from matrix-org/t3chguy/MELS_3pid
...
MELS handle m.room.third_party_invite
2019-07-03 16:02:10 +01:00
David Baker
b43a04634a
Merge pull request #3172 from matrix-org/t3chguy/invites_list
...
Fix logic around MemberList invites section, specifically regarding 3pid
2019-07-03 16:01:01 +01:00
Travis Ralston
7dbd17c137
Merge pull request #3150 from matrix-org/travis/less-typing
...
Track the user's own typing state external to the composer
2019-07-03 08:33:42 -06:00
Bruno Windels
344cc079c5
show /relations error in edit history dialog
2019-07-03 12:16:58 +02:00
Bruno Windels
353f5a205c
Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures
...
Handle associated event send failures
2019-07-03 09:02:58 +00:00
Michael Telatynski
429b8e94df
MELS handle m.room.third_party_invite
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-03 08:58:34 +01:00
Michael Telatynski
bc4bff64f6
Fix logic around MemberList invites section, specifically regarding 3pid
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-03 08:38:08 +01:00
J. Ryan Stinnett
cf8eeedcc7
Merge pull request #3169 from matrix-org/jryans/reactions-tooltip-tweaks
...
Improve interactive tooltip hover behaviour
2019-07-02 18:28:09 +01:00
Bruno Windels
daa2250023
fix lint
2019-07-02 18:30:57 +02:00
Bruno Windels
3fd96008c3
Fixup: dont assume there is a prior edit
2019-07-02 17:34:07 +02:00
J. Ryan Stinnett
a4275e6d89
Merge pull request #3171 from matrix-org/jryans/login-field-border
...
Fix login type selector border
2019-07-02 15:38:39 +01:00
J. Ryan Stinnett
7fc1288614
Fix login type selector border
...
This fixes a regression in the login type selector's border and placement.
Fixes https://github.com/vector-im/riot-web/issues/10223
2019-07-02 15:09:51 +01:00
Travis Ralston
1d54911581
Merge pull request #3159 from matrix-org/travis/pick-server-tombstone
...
Use the event sender instead of event ID for viaServers off a tombstone
2019-07-02 07:52:40 -06:00
Bruno Windels
357ad3d50c
cancel pending edit when sending new edit
2019-07-02 14:52:29 +02:00
Bruno Windels
d0d327620b
hide reactions for redacted events
2019-07-02 13:56:27 +02:00
J. Ryan Stinnett
a4587c5013
Merge pull request #3165 from matrix-org/t3chguy/tooltip_accessible_button
...
Add AccessibleTooltipButton and use it for RoomSubList buttons
2019-07-02 10:34:51 +01:00
Michael Telatynski
904a096f72
Update AccessibleTooltipButton.js
2019-07-02 10:28:36 +01:00
Bruno Windels
515ed2e1bb
Also cancel associated events when canceling sending from ctx menu
2019-07-02 10:11:38 +02:00
J. Ryan Stinnett
dd94bf799d
Improve interactive tooltip hover behaviour
...
This gives the interactive tooltip a more natural hover behaviour by removing
the full screen div behind it. This allows the target button to keep its hover
state, for example.
This also removes the click to close behaviour, which was too easy to trigger
accidentally.
Fixes https://github.com/vector-im/riot-web/issues/10179
Fixes https://github.com/vector-im/riot-web/issues/10222
Fixes https://github.com/vector-im/riot-web/issues/10225
2019-07-01 18:00:59 +01:00
Travis Ralston
64f0a7cbe7
Merge pull request #3162 from matrix-org/travis/cleanup-breadcrumbs
...
Clean up legacy breadcrumbs persistence fallback
2019-07-01 09:47:28 -06:00
Bruno Windels
4be16a380a
only show resend options if event hasn't been redacted
...
(which can now be only local, which is why this wasn't neccesary before)
2019-07-01 17:39:30 +02:00
Bruno Windels
0d79b03f53
support resending reactions
2019-07-01 17:39:00 +02:00
Bruno Windels
8160759a52
show the various resend options as different menu items
2019-07-01 17:37:32 +02:00
Bruno Windels
d66d3ca4d2
support resending redaction in context menu
2019-07-01 11:06:55 +02:00
Bruno Windels
6d458154a9
support resending edit in context menu
2019-07-01 11:06:55 +02:00
Michael Telatynski
46a6043e9b
Use title prop instead to minimize changes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-30 11:00:21 +01:00
Michael Telatynski
8ed336ea08
Add AccessibleTooltipButton and use it for RoomSubList buttons
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-30 10:58:59 +01:00
Michael Telatynski
d774d96290
Fix some React errors
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-30 10:41:39 +01:00
Michael Telatynski
e591d3ef76
take dirty-flag into account for editing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-29 06:52:19 +01:00
Michael Telatynski
bf9353f3af
Merge branches 'develop' and 't3chguy/edit_skip_if_no_edit' of github.com:matrix-org/matrix-react-sdk into t3chguy/edit_skip_if_no_edit
2019-06-29 06:45:06 +01:00
Michael Telatynski
443c7343a0
Merge branches 'develop' and 't3chguy/fix_MELS_labs' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_MELS_labs
2019-06-29 06:36:20 +01:00
Travis Ralston
4f6db320e3
Appease the linter
2019-06-28 16:44:19 -06:00
Travis Ralston
8905566cfb
Clean up legacy breadcrumbs persistence fallback
...
It's been more than a few weeks.
2019-06-28 16:30:59 -06:00
Travis Ralston
083c1a78ab
Use the event sender instead of event ID for viaServers off a tombstone
...
Fixes https://github.com/vector-im/riot-web/issues/10206
2019-06-28 12:34:46 -06:00