mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 08:21:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
14350 commits 219 branches 562 tags 474 MiB
Commit graph

6793 commits

Author SHA1 Message Date
David Baker
c1056025ed
Merge pull request #2748 from matrix-org/dbkr/shameless_plugging 
Support linking to hosting providers
 2019-03-05 18:22:02 +00:00
Travis Ralston
6eaaa8b687
Merge pull request #2728 from matrix-org/travis/encryption-warning 
Get confirmation before enabling encryption
 2019-03-05 10:15:32 -07:00
David Baker
0244990731 Add utm_campaign to the hosting links 
According to where in the app the link was clicked
 2019-03-05 16:42:22 +00:00
David Baker
b68a71b294 Lint 2019-03-05 16:20:18 +00:00
David Baker
57d8f6d8a2 Support linking to hosting providers 
From link in app config
 2019-03-05 16:12:02 +00:00
Bruno Windels
66b9363466 clear min-height for typing notifs when the timeline viewport changes size 2019-03-05 16:14:38 +01:00
Bruno Windels
96196d8c3d
Merge pull request #2746 from matrix-org/bwindels/flairnolayout 
Prevent flair pushing timeline downwards
 2019-03-05 15:34:09 +01:00
Bruno Windels
624572daa9 show flair container when no profiles loaded to ensure same height 2019-03-05 14:50:39 +01:00
J. Ryan Stinnett
b6351f2607
Merge pull request #2740 from jryans/reorg-field-props 
Reorganise props handling in Field
 2019-03-05 11:30:06 +00:00
J. Ryan Stinnett
d4a148d56c Use oneOf to check the input element 2019-03-05 11:18:58 +00:00
Travis Ralston
879fa22416 Merge branch 'develop' into travis/encryption-warning 2019-03-04 23:14:30 -07:00
Travis Ralston
363964e423 Don't loop forever if you demote yourself via Enter on a PowerSelector 
The included comment explains what happens and why this is bad.

Fixes https://github.com/vector-im/riot-web/issues/9039
 2019-03-04 13:08:54 -07:00
J. Ryan Stinnett
7c672e608d Reorganise props handling in Field 
Several small tweaks to the props handling:

* Use destructuring instead of `delete`
* Emphasize the `element` as a primary prop
* Document `textarea` as supported
 2019-03-04 17:25:19 +00:00
David Baker
a6a3716576
Merge pull request #2739 from matrix-org/dbkr/devices_toggle_update 
Fix media device selectors not updating
 2019-03-04 14:49:50 +00:00
David Baker
c7b019830d Fix media device selectors not updating 
Missed a setState

Fixes https://github.com/vector-im/riot-web/issues/9036
 2019-03-04 14:35:41 +00:00
Michael Telatynski
080c67439b
Merge pull request #2708 from matrix-org/fix_room_dict 
Fix Room Directory custom homeserver entry not showing properly
 2019-03-04 11:44:11 +00:00
Michael Telatynski
6b0b5e4aa3
Merge pull request #2729 from matrix-org/t3chguy/missing_permalinkCreator 
Add missing permalinkCreator prop
 2019-03-04 11:15:53 +00:00
Travis Ralston
71630af201 Patch users not existing when opening settings 
Fixes https://github.com/vector-im/riot-web/issues/9022
 2019-03-02 10:59:53 -07:00
Travis Ralston
454251d17c Use a div instead of an image 
There's no source, so just make it a block element
 2019-03-01 17:21:37 -07:00
Travis Ralston
8a6ae6b48e Use a mask for the continuation icon 
Fixes https://github.com/vector-im/riot-web/issues/7990
 2019-03-01 15:59:19 -07:00
Travis Ralston
3ce2c3a76d
Merge pull request #2724 from matrix-org/travis/stacked-dialogs 
Support stacking dialogs to prevent unmounting
 2019-03-01 09:03:39 -07:00
Travis Ralston
5a4676ac66
Merge pull request #2725 from matrix-org/travis/settings/pl-dropdowns 
Convert PowerSelector to use mxField instead
 2019-03-01 09:03:16 -07:00
Travis Ralston
f9d6d42781
Merge pull request #2726 from matrix-org/travis/settings/save-feedback 
Don't re-enable the save button after saving profiles
 2019-03-01 09:02:54 -07:00
Travis Ralston
ad2a98926a
Merge pull request #2727 from matrix-org/travis/email-notifs 
Support multiple email pushers and remove the legacy UserSettingsStore
 2019-03-01 09:02:36 -07:00
Bruno Windels
37593c117a Revert "remove fix for old chrome bug" 
This reverts commit ecb074862e.
 2019-03-01 16:08:41 +01:00
Bruno Windels
fe3fe208e1
Merge pull request #2676 from matrix-org/bwindels/improvedscrolling 
Improved scrolling & pagination
 2019-03-01 11:09:23 +01:00
Michael Telatynski
eb46e62a2e delint NetworkDropdown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-01 09:39:39 +00:00
Michael Telatynski
6b07195b63 Add missing permalinkCreator prop 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-01 09:36:36 +00:00
Travis Ralston
7d207ca2c3 speeling 2019-02-28 20:45:31 -07:00
Travis Ralston
9402e81835 Get confirmation before enabling encryption 
Fixes https://github.com/vector-im/riot-web/issues/8843
 2019-02-28 20:39:07 -07:00
Travis Ralston
12d939b36f Support multiple email pushers and remove the legacy UserSettingsStore 
Fixes https://github.com/vector-im/riot-web/issues/5496
Fixes https://github.com/vector-im/riot-web/issues/8424
 2019-02-28 19:57:45 -07:00
Travis Ralston
b84b11d3bd Don't re-enable the save button after saving profiles 
Fixes https://github.com/vector-im/riot-web/issues/8569
 2019-02-28 19:13:28 -07:00
Travis Ralston
a41df7ab68 Convert PowerSelector to use mxField instead 2019-02-28 19:00:57 -07:00
Travis Ralston
0978ab3da0 Support stacking dialogs to prevent unmounting 
Fixes https://github.com/vector-im/riot-web/issues/8371
 2019-02-28 15:55:58 -07:00
Travis Ralston
b5ffd4a538 Stop listening to account data when the stickerpicker is unmounted 
Fixes https://github.com/vector-im/riot-web/issues/8994
 2019-02-28 14:15:01 -07:00
Bruno Windels
0c06a702dc pr feedback 2019-02-28 16:05:55 +01:00
Jason Robinson
a74cb001b4 Remove unnecessary ref from Stickerpicker 
There is a ref=target in the call to render AccessibleButton for
the hide stickers button. This ref is not present in the show case.

When clicking the stickerpicker show button, React gives a warning:

> Warning: Stateless function components cannot be given refs
> (See ref "target" in AccessibleButton created by Stickerpicker).
> Attempts to access this ref will fail.

Removed the ref. Stickerpicker hide/show still works fine, no warning.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-02-28 15:51:36 +02:00
Travis Ralston
93043c8cc0
Merge pull request #2709 from matrix-org/t3chguy/badge_51 
Show nearest lower badge, e.g show Mod for 51... etc
 2019-02-27 18:30:57 -07:00
Michael Telatynski
9dede7ab65
Merge pull request #2710 from matrix-org/t3chguy/composer_demote 
move canSendMessages into state so that it will re-render the composer
 2019-02-27 15:40:00 +00:00
J. Ryan Stinnett
209ac2c587
Merge pull request #2706 from jryans/move-non-feather-icons 
Move non-feather icons out of feather dir
 2019-02-27 13:08:23 +00:00
David Baker
6cdb318cd0
Merge pull request #2713 from matrix-org/dbkr/fix_logout_dialog_backup 
Fix backup button in logout dialog
 2019-02-27 12:45:52 +00:00
David Baker
98402e7eae Fix backup button in logout dialog 
We set the caption appropriately but forgot to actually do the
right thing depending on whether there was a key backup already.

Also fix the loadihng spinner which was never shown.

Fixes https://github.com/vector-im/riot-web/issues/8369
 2019-02-27 11:45:00 +00:00
J. Ryan Stinnett
404c60fb0e Keep registration spinner inside the auth modal 
The spinner was taking on the full height of the modal and escaping off the
page. This keeps it contained inside the modal.

Fixes https://github.com/vector-im/riot-web/issues/8661
 2019-02-27 11:21:39 +00:00
J. Ryan Stinnett
4b340450b9 Rename Feather icon directory to feather-customised 
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
 2019-02-27 10:42:10 +00:00
Michael Telatynski
f16011394e Merge branches 'develop' and 't3chguy/composer_demote' of github.com:matrix-org/matrix-react-sdk into t3chguy/composer_demote 
# Conflicts:
#	src/components/views/rooms/MessageComposer.js
 2019-02-27 00:28:16 +00:00
Michael Telatynski
7dfbf3feb2 move canSendMessages into state so that it will re-render the composer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-27 00:23:37 +00:00
Michael Telatynski
93323421de Show nearest lower badge, e.g show Mod for 51... etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-26 23:59:40 +00:00
Michael Telatynski
fbe4d52b48 Fix Room Directory custom homeserver entry not showing propely 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-26 23:25:31 +00:00
J. Ryan Stinnett
1a89a4e87d Move logos out of feather dir 
These clearly aren't from the Feather set.
 2019-02-26 20:41:33 +00:00
J. Ryan Stinnett
3b3f0ea957 Move E2E icons out of feather dir 
They appear to all be created by Nad, according to
https://github.com/matrix-org/matrix-react-sdk/pull/2557.
 2019-02-26 20:31:32 +00:00