PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
17643 commits 1 branch 0 tags 338 MiB
Commit graph

17643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
9a409a7acc
Merge pull request #3381 from matrix-org/bwindels/plain-command 
/plain command to bypass markdown conversion
 2019-09-03 16:04:07 +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
0d02ab59d6 allow starting a range with both positions known already 
we'll need this to start a range for the selection
 2019-09-03 16:00:50 +02:00
Bruno Windels
eb87301855 allow getting the DocumentOffset for any node+offset, not just focusNode 
we need this to get both offsets of the selection boundaries

getSelectionOffsetAndText offers the extra flexibility,
getCaretOffsetAndText keeps the old api for focusNode/focusOffset

Also did some renaming here now that it's not just for the caret anymore
 2019-09-03 15:58:50 +02:00
Bruno Windels
648ae37ff4 make DocumentOffset compatible with what is returned from dom/getCaret 
so we can return a DocumentOffset from there without breakage
 2019-09-03 15:58:05 +02:00
Bruno Windels
917700a1fc
Merge pull request #3383 from matrix-org/revert-3378-bwindels/cider-md-legend 
Revert "New composer: show markdown legend on focus"
 2019-09-03 08:36:48 +00: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
41ca54bb09 /plain command to bypass markdown conversion 2019-09-02 17:44:31 +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
6a0842d1ab
Merge pull request #3379 from matrix-org/bwindels/cider-deserialize-headers 
Message editing: deserialize headers from html back to markdown
 2019-09-02 14:58:54 +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
Bruno Windels
eaed07fcbf
Merge pull request #3377 from matrix-org/bwindels/cider-noemptymsg 
New composer: dont allow sending empty messages
 2019-09-02 14:57:41 +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
5b54cf566d deserialize headers from html back to markdown 2019-09-02 16:23:56 +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
5565eca0cb
Merge pull request #3376 from matrix-org/bwindels/cider-pills-spellcheck 
New composer: disable spell check for pills
 2019-09-02 12:41:45 +00:00
Bruno Windels
b9cb22e153 dont allow sending empty messages 2019-09-02 14:36:31 +02:00
Bruno Windels
2683627a82 disable spell check for pills in the new composer 2019-09-02 14:26:15 +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
J. Ryan Stinnett
c219f925c6
Merge pull request #3373 from matrix-org/jryans/dialog-link-colour 
Restrict green link colours to address picker dialog
 2019-09-02 12:40:36 +01: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
J. Ryan Stinnett
3feeaceb68 Restrict green link colours to address picker dialog 
This changes to a more targeted selection of what becomes green (just the
actionable links in address picker).

Fixes https://github.com/vector-im/riot-web/issues/10703
 2019-09-02 10:33:19 +01: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
00d81eece9 don't accept @/#/: as part of command, allow to create pill candidate 
so if you type these 3 characters, you get the correct autocomplete
 2019-09-02 11:26:20 +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
J. Ryan Stinnett
7032dc6fa1
Merge pull request #3367 from matrix-org/jryans/features-without-is 
Add a dialog when inviting via slash command without IS
 2019-09-02 10:14:09 +01: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
Michael Telatynski
517c7cba76
Merge pull request #3365 from matrix-org/t3chguy/react16_7 
Migrate away from React.createClass for non-auth structures. React 16 :D
 2019-09-01 22:46:43 +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
J. Ryan Stinnett
8ff0883c22 Add a dialog when inviting via slash command without IS 
This adds a dialog to ask how you want to proceed when trying to invite via
email when there is no IS configured.

Fixes https://github.com/vector-im/riot-web/issues/10619
 2019-08-30 18:29:07 +01:00
Bruno Windels
63be16beff
Merge pull request #3366 from matrix-org/bwindels/cider-user-pill-text-fallback 
New composer: put display name in user pill text fallback instead of mxid
 2019-08-30 16:03:28 +00: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
Bruno Windels
ec0d048cf0
Merge pull request #3361 from matrix-org/bwindels/autocomplete-colon 
New composer: append colon to completed user pill when at start of message
 2019-08-30 16:02:58 +00:00
Michael Telatynski
de0719151f
Merge pull request #3351 from matrix-org/t3chguy/pl_control_e2e 
Expose power level toggle for enabling e2ee to room settings
 2019-08-30 16:16:30 +01: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