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
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