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
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
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
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
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
b16f983a1f
put display name in user pill text fallback instead of mxid
2019-08-30 11:51:29 +02:00
42ba5f6f0a
force model update after composition finishes
2019-08-30 11:37:42 +02:00
abf111ecbd
Migrate away from React.createClass for non-auth structures. React 16 :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-30 10:34:59 +01:00
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
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
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
7dd6471059
Merge pull request #3018 from Sorunome/soru/spoilers
...
Add Spoilers as per MSC2010
2019-08-29 13:24:06 -06:00
c144edfcac
dont capture enter to close autocomplete
2019-08-29 18:39:35 +02:00
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
dc292d332d
Merge pull request #3357 from matrix-org/bwindels/cider-ime
...
New composer: don't update model while doing IME compositions
2019-08-29 16:31:05 +00:00
c1d7ad40c5
Merge pull request #3356 from matrix-org/bwindels/cider-paste-newlines
...
New composer: handle newlines properly when pasting
2019-08-29 16:24:27 +00:00
4ae130bd27
add license header, descriptive comment and change to class
2019-08-29 18:13:52 +02:00
be79cdddb0
apply autocomplete changes to mock to fix editor unit tests
2019-08-29 18:00:38 +02:00
c9572250be
only append colon to user-pill when at start of composer
...
by passing position to autocomplete, so completion
can depend on where the pill-candidate appears.
2019-08-29 17:47:14 +02:00
2ff2ff0e75
support autocomplete replacing text with multiple parts
...
and append ": " to user pills
2019-08-29 17:43:18 +02:00
eb22ddfea9
Merge pull request #3360 from matrix-org/dependabot/npm_and_yarn/eslint-utils-1.4.2
...
Bump eslint-utils from 1.4.0 to 1.4.2
2019-08-29 08:33:37 -06:00
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
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
8ff2c42f39
Bump eslint-utils from 1.4.0 to 1.4.2
...
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils ) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases )
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
2019-08-29 14:23:57 +00:00
fe7ac11abc
New composer: support pasting files
2019-08-29 16:19:05 +02:00
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
80523f5dbe
still convert \n to NewlinePart when pasting/dropping
...
before we skipped the complete validation (which creates NewlineParts)
when pasting or dropping text. We don't want to create PillCandidatePart
when inserting text like this, as it would open the auto-complete, but
newlines should still be applied. So instead of skipping validation,
pass the inputType to the validation code so they can only reject
pill candidate characters when not pasting.
2019-08-29 13:00:31 +02:00
e531b29307
don't ignore BR elements when converting to editor dom to text
2019-08-29 13:00:31 +02:00
fe9ae46ffb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers
2019-08-28 20:23:24 +02:00
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
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
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
7ef087db86
Merge pull request #3354 from matrix-org/t3chguy/avatar_change_cursor_perms
...
Don't use cursor: pointer on roomsettings avatar if you can't change it
2019-08-28 17:44:31 +01:00
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
eddaece43e
add visual bell color to theme + choose better value for dark mode
2019-08-28 18:00:57 +02:00
29f96e659a
remove leftover code
2019-08-28 17:53:03 +02:00
665e3f44e1
Merge pull request #3355 from matrix-org/dbkr/email_help_text_update
...
Update email help text
2019-08-28 10:59:47 -04:00
aa9c0b24fe
re-run i18n
2019-08-28 10:37:57 -04:00
c749b6355f
Update email help text
...
Fixes https://github.com/vector-im/riot-web/issues/10674
2019-08-28 10:34:50 -04:00
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
c44fbb73d0
fix bug when replacing range starting at end of previous part
2019-08-28 15:52:39 +02:00
591fa3d8c5
Don't use cursor: pointer on roomsettings avatar if you can't change it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 14:46:47 +01:00
86fcaa2af0
Merge pull request #3350 from matrix-org/dbkr/dont_infinite_loop_on_server_change
...
Don't infinite loop on server change
2019-08-28 09:18:35 -04:00
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
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
7000b5a5ad
Update i18n
2019-08-28 11:32:36 +01:00
ac6b03551a
Describe props default
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-28 11:24:11 +01:00
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
8e799b7136
Merge pull request #3341 from matrix-org/travis/tabbed-managers
...
Support multiple integration managers behind a labs flag
2019-08-27 09:08:17 -06:00
3eddded039
Merge branch 'develop' into travis/tabbed-managers
2019-08-27 09:07:52 -06:00
Bruno Windels