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

16145 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
21344609a4 released js-sdk 2019-06-19 15:47:31 +01:00
RiotRobot
a835d916e1 v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot
043cae2aa9 Prepare changelog for v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot
27a94bb250 js-sdk rc.2 2019-06-18 15:46:23 +01:00
David Baker
ab4142ab5a Merge remote-tracking branch 'origin/develop' into release-v1.2.2 2019-06-18 15:25:44 +01: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
b6ca0ea6bf Appease the linter 2019-06-18 08:01:38 -06:00
Travis Ralston
be37332bb0 Further simplify usage of integrations 2019-06-18 07:55:43 -06:00
Bruno Windels
f7c03acb58
Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo 
Blend pending redactions
 2019-06-18 13:09:25 +00:00
Bruno Windels
c4fc2a8089 remove redundant localecho part from method name 2019-06-18 14:57:58 +02:00
Bruno Windels
f9188bca92 reduced opacity for pending redactions 2019-06-18 13:48:51 +02:00
Bruno Windels
02c9e29937 use renamed method that also takes local redactions into account now 2019-06-18 13:47:33 +02:00
Bruno Windels
cc155ac049
Merge pull request #3116 from matrix-org/bwindels/feature-guard-arrowup-to-edit 
Keep old arrow-up behaviour when editing is not enabled
 2019-06-18 09:57:04 +00:00
Bruno Windels
f95f194b6a keep old arrow-up behaviour when editing is not enabled 
also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise
 2019-06-18 11:49:36 +02:00
Bruno Windels
32840fc274
Merge pull request #3098 from matrix-org/t3chguy/restore_composer_history 
Restore Composer History under shift-up & down
 2019-06-18 08:59:11 +00:00
David Baker
5e7b4564cf
Merge pull request #3114 from matrix-org/dbkr/allow_server_change_if_dead 
Allow changing server if validation has failed
 2019-06-18 09:37:31 +01:00
Travis Ralston
b0d340f578
Merge pull request #3109 from matrix-org/t3chguy/upload_all_button 
Add Upload All button to UploadConfirmDialog
 2019-06-17 18:06:15 -06:00
Travis Ralston
d5db0077ed Remove unused imports 2019-06-17 15:53:11 -06:00
Travis Ralston
8f6e8c1ec7 Appease the linter 2019-06-17 15:51:14 -06:00
Travis Ralston
d58ab8e6d0 Remove excessive scalar auth checks in manager util class 2019-06-17 15:50:09 -06:00
Travis Ralston
974a11ed20 Defer scalar auth in AppsDrawer to widgets/manager dialog 2019-06-17 15:39:32 -06:00
Travis Ralston
d2d0cb2e9e Port AppTile (widgets) over to new integration manager dialog props 2019-06-17 15:34:30 -06:00
Travis Ralston
f699fed720 Defer sticker picker scalar auth to integration manager dialog 
or when needed, instead of up front.
 2019-06-17 15:30:24 -06:00
Travis Ralston
ebabc5238d Port integration manager class to new dialog props 2019-06-17 15:30:01 -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
Travis Ralston
6cc443cd01 spelling 2019-06-17 15:27:35 -06:00
Travis Ralston
7c80355ea7 Convert IntegrationsManager to a class 2019-06-17 15:26:58 -06:00
David Baker
10f6abfe17 Allow changing server if validation has failed 
Show the server config section if there's an error and fix an if
case where we forgot to un-set the busy flag
 2019-06-17 18:47:20 +01:00
David Baker
fac6dc25f6
Merge pull request #3112 from matrix-org/dbkr/reenable_register_button 
Re-enable register button
 2019-06-17 18:45:39 +01:00
Bruno Windels
536f78eaf5
Merge pull request #3111 from matrix-org/bwindels/fix-register-layout 
keep mx_Field stretching
 2019-06-17 17:42:52 +00:00
Bruno Windels
872c1acdea keep mx_Field stretching 2019-06-17 18:29:03 +02:00
David Baker
3f6bb0c7ca Use default cursor for disabled submit button 2019-06-17 16:57:13 +01:00
David Baker
e3bf4a0b8e Re-enable register button on change to working HS 
Register button disabling is done via serverErrorIsFatal so we need
to reset this on a successful validation.

https://github.com/vector-im/riot-web/issues/10029
 2019-06-17 16:27:35 +01:00
David Baker
2eef3d610e
Merge pull request #3107 from matrix-org/dbkr/multispinner 
Fix double-spinner
 2019-06-17 09:27:45 +01:00
Michael Telatynski
94f6907db5
Merge pull request #3110 from z3ntu/canonical_alias 
Fix display of canonicalAlias in group room info
 2019-06-17 08:11:27 +01:00
Luca Weiss
c68074f532
Fix display of canonicalAlias in group room info 
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
 2019-06-16 21:52:25 +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
Michael Telatynski
03c37821f6 clean up onVerticalArrow 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-15 15:10:34 +01:00
David Baker
4c036c98ee Fix double-spinner 
On registering, we showed a spinner, and then another spinner on
top of the spinner, which led to an interesting spinner-in-box
effect.

Suppress the second type of spinner when we know we already have one.
 2019-06-14 17:21:07 +01:00
David Baker
4ce72fdffa
Merge pull request #3106 from matrix-org/dbkr/resurrect_riot_bot 
Fix welcome user
 2019-06-14 17:20:31 +01:00
Bruno Windels
638b5c6d31
Merge pull request #3105 from matrix-org/bwindels/edit-emotes 
Support editing emote messages
 2019-06-14 15:47:29 +00:00
David Baker
794b04b89a take the debugging out 2019-06-14 16:41:30 +01:00
David Baker
30726d6cf9 Pull out welcome user chat code to a separate function 
also expand on comment
 2019-06-14 16:29:26 +01:00
David Baker
929e9dc653 Don't forget to show the homepage if no welcome user 2019-06-14 16:04:09 +01:00
David Baker
8fa50b26a6 Fix welcome user 
https://github.com/matrix-org/matrix-react-sdk/pull/3101 meant we
don't get logged straight in after registering if using an email
address, but this was the point at which we made a chat with the
welcome user. Instead, set a flag in memory that we should try &
make a chat with the welcome user for that user ID if we get a
session for them.

Of course, if the user logs in on both tabs, this would mean each
would make a chat with the welcome user (although actually this
was a problem with the old code too). Check our m.direct to see if
we've started a chat with the welcome user before making one (which
also means we have to make sure the cached sync is up to date...
see comments).
 2019-06-14 15:31:19 +01:00
Michael Telatynski
6a10f0068d Use Alt-UP/DOWN for Composer History instead of random room change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-14 12:26:52 +01:00
Michael Telatynski
876acc0f76 Merge branches 'develop' and 't3chguy/restore_composer_history' of github.com:matrix-org/matrix-react-sdk into t3chguy/restore_composer_history 
# Conflicts:
#	src/components/views/rooms/MessageComposerInput.js
 2019-06-14 12:26:05 +01:00
Bruno Windels
e4090d6b2e
Merge pull request #3104 from matrix-org/t3chguy/mx_Field_flex_1 
Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more
 2019-06-14 09:23:36 +00:00
Bruno Windels
6ffe910b47
Merge pull request #3099 from matrix-org/t3chguy/MemberInfo_long_mxid 
Use overflow on MemberInfo name/mxid so that the back button stays
 2019-06-14 09:22:58 +00:00
Bruno Windels
3cfdd518ee detect emote when sending (and trim "/me " for content) 2019-06-14 11:02:20 +02:00