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

1220 commits

Author SHA1 Message Date
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
J. Ryan Stinnett
adc3c69022 Update ICE fallback text 2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
67b830c48d Improve fallback ICE setting label 2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
d31f556c1f Move ICE fallback prompt to time of placing / answering calls 
This moves the ICE fallback prompt out of session startup and instead it will
now appear contextually when your either place a call with no ICE server from
the homeserver or a call fails (in either direction).

Fixes https://github.com/vector-im/riot-web/issues/10546
 2019-08-15 15:05:25 +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
J. Ryan Stinnett
c1378f8e0b Prompt for ICE server fallback permission 
This adds a prompt at the start of each session when the homeserver does not
have any ICE servers configured. The fallback ICE server is only used if the
user allows it. The dialog also recommends notifying the homeserver admin to
rectify the issue.

Fixes https://github.com/vector-im/riot-web/issues/10173
 2019-08-15 15:04:23 +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
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
Travis Ralston
7a1a245899 Fix i18n 2019-08-14 08:52:05 -06:00
Travis Ralston
beb6ec4327 Merge branch 'develop' into travis/integs/account_set 2019-08-14 08:45:01 -06: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
735c6d73d8 Merge remote-tracking branch 'origin/develop' into dbkr/disco_is 2019-08-14 10:03:32 +01:00
David Baker
f88349530a rerun i18n 2019-08-13 18:41:18 +01: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
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
David Baker
b694a56689 i18n 2019-08-12 14:48:02 +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
David Baker
1067457d63 rerun i18n 2019-08-12 11:51:08 +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
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
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
2ecabd2195 Reuse direct chats when starting new ones 
Part of https://github.com/vector-im/riot-web/issues/10416

This section of code applies to the + button next to PEOPLE in the room list.
 2019-08-07 12:01:51 -06:00
David Baker
c09f86f347 re-run i18n 2019-08-07 13:37:24 +01:00
David Baker
9fa5e01f2f Disable password reset if no ID server 2019-08-07 13:30:52 +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
5e76019b63 fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:35:33 +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
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
2fd371e1dd prune i18n and get rid of /help header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 17:07:56 +01:00
Bruno Windels
a24e41c34f make i18n build pass (unrelated) 2019-08-05 15:33:42 +02:00
Bruno Windels
7a5167b1a3 Let user know their account has been deactivated upon trying to login 2019-08-05 13:48:25 +02: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
6d959f826b Fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 18:14:37 +01:00
Michael Telatynski
d2e2c4edb6 Add help slash command 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 17:58:34 +01: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
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
David Baker
28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 12:32:24 +01:00
J. Ryan Stinnett
b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Travis Ralston
5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston
c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Travis Ralston
000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06: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
David Baker
be7680c065 update i18n strings 2019-07-10 14:18:59 +01:00
Travis Ralston
2ca6633fda Update copy as per design 2019-07-09 23:55:20 -06: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
370fa27de3
Merge pull request #3187 from matrix-org/travis/soft-logout-keys 
Change soft logout rehydrate text if there's pending key backups
 2019-07-09 11:32:17 -06:00
Travis Ralston
7b869f2824
Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate 
Ask for the user's password to rehydrate their soft logged out session
 2019-07-09 11:31:51 -06: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
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
55b4ef2169 Change soft logout rehydrate text if there's pending key backups 
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
 2019-07-05 13:52:14 -06:00
Travis Ralston
93872e6fa5 Ask for the user's password to rehydrate their soft logged out session 
Fixes https://github.com/vector-im/riot-web/issues/10236

The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().

Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262
 2019-07-04 16:51:16 -06: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
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
e7e6af2592 use existing strings 2019-07-03 17:51:16 +02: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
Bruno Windels
1a4bdbaf96 add (s) for singular to tr 2019-07-01 18:12:42 +02:00
Bruno Windels
0d79b03f53 support resending reactions 2019-07-01 17:39:00 +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
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
J. Ryan Stinnett
33425240f6
Merge pull request #3152 from matrix-org/jryans/reactions-show-all 
Limit reactions row on initial display
 2019-06-28 15:12:48 +01:00
Travis Ralston
7f2ab39609
Merge pull request #3142 from matrix-org/travis/preview-loading 
Show a loading state for slow peeks
 2019-06-27 09:24:25 -06:00
Bruno Windels
dff6ca85f2
Merge pull request #3146 from matrix-org/bwindels/dontfailonmissingwebcam 
Don't show error dialog when user has no webcam
 2019-06-27 13:16:36 +00:00
J. Ryan Stinnett
59b4a3398d Limit reactions row on initial display 
This limits the reactions row below messages to initially show at most 8 keys.
For those messages with more than that, a "Show all" option appears to reveal
all the keys.

Fixes https://github.com/vector-im/riot-web/issues/9570
 2019-06-27 13:17:23 +01:00
Bruno Windels
f6e0cd9a03 don't show error dialog when user has no webcam 
instead, retry with just audio.
Also when mounted, check if the user has given enough permissions
to return non-empty labels for the devices, something both ff & chrome
do if you haven't going through the permissions popup yet. If not,
show the permissions button.
 2019-06-26 18:54:15 +02:00
Bruno Windels
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history 
Edit history dialog
 2019-06-26 14:38:53 +00:00
Bruno Windels
54de0b298b add "Click to see edits." to tooltip 2019-06-26 16:13:32 +02:00
Travis Ralston
8d85967824
Merge pull request #3139 from matrix-org/travis/upgrades-final 
Fix room upgrade warning being chopped off and a spelling mistake
 2019-06-26 07:12:39 -06:00
Bruno Windels
ef71e6fd4f very basic & hackish edit history dialog 2019-06-26 11:59:56 +02:00
Travis Ralston
ca6ddf324f Show a loading state for slow peeks 2019-06-25 20:56:33 -06:00
Travis Ralston
b6242dbad2 Fix spelling 2019-06-25 13:54:48 -06:00
J. Ryan Stinnett
c1821fabd3 Remove toggling reaction dimensions 
This removes the v1 Reactions UX which only allowed you to choose only one emoji
out of each pair. It is replaced by a different UX inside a tooltip and without
these constraints.

Part of https://github.com/vector-im/riot-web/issues/9753
 2019-06-25 16:23:31 +01:00
J. Ryan Stinnett
fd2723585f Add quick reaction buttons in tooltip 
This adds the set of quick reactions as buttons in a new tooltip accessed via
the react action in the message action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
 2019-06-25 16:23:13 +01:00
J. Ryan Stinnett
8926992feb Add react button to action bar 
This adds a (temporarily non-functional) react button to the action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
 2019-06-25 15:12:30 +01:00
Michael Telatynski
f3641eaa32 Add ability to render null-rejoins in Timeline and MELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-23 21:41:28 +01:00
Travis Ralston
bf443149b5 Make the verification cancelled dialog say OK instead of Cancel 
Fixes https://github.com/vector-im/riot-web/issues/9306

Includes unexpected cleanup of i18n
 2019-06-19 15:07:45 -06:00
David Baker
9641110315
Merge pull request #3118 from matrix-org/dbkr/already_registered 
Restore warning for if you're already logged in
 2019-06-19 09:27:31 +01:00
David Baker
c8e121dc70 Restore warning for if you're already logged in 
...when clicking an email link. Although now we can complete the
registration because we can do so without replacing your session.
 2019-06-18 18:43:14 +01:00
Bruno Windels
bb97653455
Merge pull request #3113 from matrix-org/bwindels/mediadeviceslabels 
Provide default name if device label is missing
 2019-06-18 16:44:43 +00:00
Travis Ralston
7b514b0573
Merge pull request #3115 from matrix-org/travis/reduce-scalar-calls 
Defer scalar API calls until they are needed
 2019-06-18 08:17:21 -06:00
Travis Ralston
a5f296457f Make the Manage Integrations Button defer scalar auth to the manager 
This moves the responsibility of creating a URL to open from the button (and other components) to the integrations manager dialog itself.

By doing this, we also cut down on scalar API calls because we don't pick up on account information until the user opens the dialog.
 2019-06-17 15:29:28 -06:00
Bruno Windels
a35c9ea585 provide default for missing device labels 2019-06-17 19:39:40 +02:00
Michael Telatynski
2fc2e32e60 Add Upload All button to UploadConfirmDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-16 11:43:13 +01:00
David Baker
048d8d2ec7 Simplify email registration 
You now don't get automatically logged in after finishing
registration. This makes a whole class of failures involving race
conditions and multiple devices impossible.

https://github.com/vector-im/riot-web/issues/9586
 2019-06-13 16:24:09 +01:00
Travis Ralston
aacb942d57 Don't handle identity server failure as fatal, and use the right message 
Fixes https://github.com/vector-im/riot-web/issues/10002
 2019-06-10 19:28:32 -06:00
J. Ryan Stinnett
a1d0b8c5f3
Merge pull request #3080 from matrix-org/jryans/lowercase-letters 
Clarify that only lowercase letters are allowed
 2019-06-07 20:40:55 +01:00
J. Ryan Stinnett
b2a9402d3f Clarify that only lowercase letters are allowed 
We only allow lowercase letters in localparts.

Fixes https://github.com/vector-im/riot-web/issues/9983
 2019-06-07 13:57:30 +01:00
Travis Ralston
ace1bde238 Implement design and copy for errors 2019-06-05 11:32:02 -06:00
Travis Ralston
e2fdeec71a Fail more softly on homeserver liveliness errors 
This performs liveliness checks on the auth pages to try and show a friendlier error. Earlier checks in the app startup are expected to not block the app from loading on such failures.

See https://github.com/vector-im/riot-web/issues/9828
 2019-06-04 23:42:38 -06:00
Travis Ralston
635b1ff612
Merge pull request #2928 from Half-Shot/hs/custom-notif-sounds 
Custom notification sounds for rooms
 2019-06-03 14:31:38 -06:00
Travis Ralston
7f0282a2e8 Convert breadcrumbs from labs to real setting 
Fixes https://github.com/vector-im/riot-web/issues/9391
 2019-06-03 00:15:33 -06:00
Will Hunt
9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
Travis Ralston
0d47222132 Add LB setting to new user settings 
Put under labs out of concern for https://github.com/vector-im/riot-meta/issues/66
 2019-05-30 19:57:17 -06:00
J. Ryan Stinnett
1e3e9f4f87 Remove username on HS input label 
Removes redundant HS name on the username input that duplicates the header above
it.

Fixes https://github.com/vector-im/riot-web/issues/9884
 2019-05-29 17:48:16 +01:00
Travis Ralston
14dc4b47fa Merge branch 'develop' into travis/feature/wellknown2 2019-05-22 23:05:54 -06:00
Travis Ralston
a551ef1a72 Label message edit field as such for screen readers 
See https://github.com/vector-im/riot-web/issues/9747
 2019-05-21 20:00:15 -06:00
Travis Ralston
c2c55e06e6 Add voice labels for quick add room buttons 
See https://github.com/vector-im/riot-web/issues/9747
 2019-05-21 12:16:34 -06:00
Travis Ralston
907c7ed119
Merge pull request #2994 from matrix-org/travis/screenreader/topleftmenu 
Update TopLeftMenu for accessibility: Keyboard shortcut, reduced screen reader noise
 2019-05-21 09:52:26 -06:00
Travis Ralston
3476be3327 Merge branch 'develop' into travis/feature/wellknown2 2019-05-20 19:50:02 -06:00
J. Ryan Stinnett
0e5f0f24cc Extract MELS-style comma separated list to shared utility 
This allows other UI components to use the same formatting for a long list.
 2019-05-20 15:21:18 +01:00
Travis Ralston
c5757d8303 Support CTRL+I for opening TopLeftMenu 2019-05-17 15:29:16 -06:00
J. Ryan Stinnett
45cdf880b1 Change setting style 2019-05-17 17:43:08 +01:00
J. Ryan Stinnett
3a405701a3 Debug: Show all events 2019-05-17 16:34:01 +01:00
J. Ryan Stinnett
43c9e6d942 Reactions / editing tooltip tweaks 2019-05-17 15:10:35 +01:00
J. Ryan Stinnett
603e6b7055 Adjust edited tooltip to use shared styles 2019-05-17 12:19:02 +01:00
J. Ryan Stinnett
3da1f73ea4 Add a basic tooltip showing who reacted 
This adds a first attempt at tooltip showing who reacted to a message. It
doesn't limit senders or position the tooltip nicely, but the info is there at
least.

Part of https://github.com/vector-im/riot-web/issues/9722
 2019-05-17 12:11:01 +01:00
Bruno Windels
4a6725d4c2 Message editing: show (edited) marker on edited messages, with tooltip 2019-05-17 11:36:36 +01:00
Travis Ralston
bc5227a191 Fix some source strings noticed as incorrect by translators 2019-05-16 14:35:56 -06:00
Travis Ralston
0c7aa39273 Merge branch 'develop' into travis/feature/wellknown2 2019-05-16 12:59:50 -06:00
Travis Ralston
6f22acc3c6
Merge pull request #2979 from aaronraimist/imageview-tooltip 
Add tooltips to rotate and close buttons in ImageView (#9686)
 2019-05-15 21:14:20 -06:00
Aaron Raimist
c38b5cabb1
Allow the strings to be translated 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-15 22:11:51 -05:00
Will Hunt
2994d99378
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-15 16:09:55 +01:00
Will Hunt
d752de0972 Improve UX 2019-05-15 15:52:42 +01:00
Will Hunt
079bdd44a4 Update il8n 2019-05-14 21:07:29 +01:00
Will Hunt
277c4ab809
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-14 21:07:03 +01:00
Will Hunt
46132a2463 Merge branch 'hs/custom-notif-sounds' of github.com:Half-Shot/matrix-react-sdk into hs/custom-notif-sounds 2019-05-14 21:05:55 +01:00
Will Hunt
626cb46915 Cleanup interface buttons 2019-05-14 21:05:22 +01:00
Bruno Windels
0b18ff52c5 pass feature flag to js-sdk 2019-05-14 15:43:10 +01:00
Bruno Windels
036cb02c0e add feature flag 2019-05-14 15:39:24 +01:00
Travis Ralston
83737654ff Merge branch 'develop' into travis/feature/wellknown2 2019-05-13 09:20:10 -06:00
Travis Ralston
201fef8b11
Merge pull request #2947 from matrix-org/travis/password-score-config 
Add configuration flag to disable minimum password requirements
 2019-05-13 09:19:23 -06:00
J. Ryan Stinnett
f5aa32bc96
Merge pull request #2954 from matrix-org/jryans/aggregations 
Send and undo reaction events
 2019-05-13 15:20:28 +01:00
Will Hunt
e8c8762e34
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-13 03:09:59 +01:00
Travis Ralston
909354c195
Merge branch 'develop' into t3chguy/cmd_rainbow 2019-05-12 18:51:22 -06:00
Travis Ralston
76f37d691d
Merge pull request #2953 from matrix-org/t3chguy/roomavatar 
Command to change avatar for a single room, including upload of mxc res
 2019-05-12 18:46:06 -06:00
Will Hunt
64a384477e Resolve issues 2019-05-12 17:14:21 +01:00
Will Hunt
2023b3d905 Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-12 16:55:36 +01:00
Michael Telatynski
d9b03b0196 fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-12 16:42:13 +01:00
Michael Telatynski
4c8593a91f Add i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-12 16:40:27 +01:00
J. Ryan Stinnett
8903f65fcb Enable client-side aggregations for reactions 
If reactions are enabled, we need to enable client-side aggregation in the
`MatrixClient` to access the data.
 2019-05-10 17:19:27 +01:00
Michael Telatynski
16c027dc61 Merge branches 'develop' and 'devtools_serverlist' of github.com:matrix-org/matrix-react-sdk into devtools_serverlist 2019-05-09 22:27:37 +01:00
Will Hunt
efc93abb50
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-07 20:04:29 +01:00
Travis Ralston
c636f890b5 Add configuration flag to disable minimum password requirements 
The configuration flag is intentionally long and annoying - the vast majority of people should not need this. The flag is intended to be used in development environments where accounts are often registered with no intention of them sticking around.
 2019-05-06 09:55:27 -06:00
Travis Ralston
bb6ee10d8c Add language features to support server config changes 2019-05-03 11:34:30 -06:00
Travis Ralston
a7a50351d1
Merge pull request #2798 from matrix-org/travis/tombstone-notif 
Support changing options for .m.rule.tombstone push rule
 2019-05-02 09:47:41 -06:00
Travis Ralston
5a204edf90 Remove timeline explosion rageshake prompt 
Concludes https://github.com/vector-im/riot-web/issues/8593

We are no longer seeing this error being triggered, and are considering it fixed. As a result, the dialog can be removed to reduce the amount of dead code in the project.
 2019-05-01 13:37:57 -06:00
J. Ryan Stinnett
784599d9e9 Add primary reactions to action bar 
This adds the primary reactions to the action bar. They act as toggles where you
can only select one from each group at a time.

Note that currently we aren't actually sending the reaction at all. That's left
for a separate task.

Fixes https://github.com/vector-im/riot-web/issues/9576
 2019-04-30 18:09:10 +01:00