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

14607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
18d897298d ensure flair is 16px high 
so it doesn't push the message down
 2019-03-05 14:49:07 +01:00
Andrew Morgan
0516556be9 Prevent space characters from stopping big emoji messages 2019-03-05 13:07:11 +00: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
J. Ryan Stinnett
a3d6d43f69
Merge pull request #2742 from jryans/limit-field-label 
Limit Field label to size of input
 2019-03-05 11:16:05 +00:00
J. Ryan Stinnett
1336508a4e Add comment, fix bad math 
This adds a comment to explain the `max-width` and also fixes it actually use
the right value. (I had grabbed the wrong part of `margin` the first time.)
 2019-03-05 11:13:39 +00:00
Travis Ralston
e1cb2ae3a6 fix i18n 2019-03-04 23:14:55 -07:00
Travis Ralston
879fa22416 Merge branch 'develop' into travis/encryption-warning 2019-03-04 23:14:30 -07:00
Travis Ralston
5a9095288e
Merge pull request #2743 from matrix-org/travis/infinite-ignore 
Don't loop forever if you demote yourself via Enter on a PowerSelector
 2019-03-04 15:57:39 -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
c1688d2be3 Limit Field label to size of input 
This avoids awkward wrapping if the label is longer than the input. This will
show an ellipsis to suggest there's more text in the label than can be shown.
 2019-03-04 18:02:36 +00:00
Travis Ralston
a5b4d4ba95 Include tag name when warning about rooms running off lists 2019-03-04 10:56:18 -07:00
Travis Ralston
3c1da4e875
Merge pull request #2734 from matrix-org/travis/reinvite 
Check if users are already in the room before inviting them
 2019-03-04 10:34:49 -07:00
Travis Ralston
7d9e58b3c3
Merge pull request #2735 from matrix-org/travis/duplicated-people 
Don't duplicate direct chats from other tags
 2019-03-04 10:34:32 -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
86b79ef51d
Merge pull request #2738 from matrix-org/travis/fix-user-not-existing 
Patch users not existing when opening settings
 2019-03-03 12:59:58 -07: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
ead73ee7b7
Merge pull request #2737 from matrix-org/travis/continuation-icon 
Use a mask for the continuation icon
 2019-03-01 18:40:50 -07:00
Travis Ralston
329c1eec1a
Merge pull request #2736 from matrix-org/travis/upgraded-rooms 
Always insert rooms into lists when they get lost
 2019-03-01 18:40:31 -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
49f506cef4 More clearly fix issues with room insertion to lists 
Instead of having a catch-all insert, try and fix the common cases with a bit more care.
 2019-03-01 17:18:16 -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
43d099836b Always insert rooms into lists when they get lost 
Room upgrades, direct chats, etc all end up being lost in these scenarios. Instead of losing them to the list, try and put them into a relevant spot of the list.

Fixes https://github.com/vector-im/riot-web/issues/9020
 2019-03-01 15:48:10 -07:00
Travis Ralston
3c2403ca54 Don't duplicate direct chats from other tags 
Fixes https://github.com/vector-im/riot-web/issues/8971
 2019-03-01 15:29:24 -07:00
Travis Ralston
4c4b2eedaf Check if users are already in the room before inviting them 
Fixes https://github.com/vector-im/riot-web/issues/8965

This also addresses another issue where inviting a banned user shows up as "Unknown server error".
 2019-03-01 13:36:24 -07:00
David Baker
133dfe0807 v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
738bc4d2d5 Prepare changelog for v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
784f468d94
Merge pull request #2733 from matrix-org/travis/misc-roomlist 
Misc room list improvements & invite fix
 2019-03-01 17:28:30 +00:00
Travis Ralston
593bd8ff66
Merge pull request #2732 from matrix-org/travis/rageshake-errors 
Convert objects and such to usable strings in rageshake
 2019-03-01 10:20:23 -07:00
Travis Ralston
e1f26059a7 Convert objects and such to usable strings in rageshake 
Fixes https://github.com/vector-im/riot-web/issues/7844
 2019-03-01 09:58:54 -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
eb33b2dcbb
Merge pull request #2731 from matrix-org/bwindels/bringback528fix 
Bring back #528 fix as it still seems broken on OSX
 2019-03-01 16:49:52 +01:00
Bruno Windels
65807c7a66 Revert "remove test for #528 as we removed that fix" 
This reverts commit 42030796c7.
 2019-03-01 16:08:58 +01:00
Bruno Windels
37593c117a Revert "remove fix for old chrome bug" 
This reverts commit ecb074862e.
 2019-03-01 16:08:41 +01:00
David Baker
9d2ef8a3cd v1.0.2-rc.2 2019-03-01 12:17:26 +00:00
David Baker
e8213bc5c3 Prepare changelog for v1.0.2-rc.2 2019-03-01 12:17:25 +00:00
David Baker
4f430db981
Merge pull request #2730 from matrix-org/dbkr/langs_file_resolve_alias 
Use webpack alias to resolve the languages file
 2019-03-01 12:13:31 +00:00
David Baker
4f84311bde Use $webapp rather than Webapp 2019-03-01 12:03:04 +00:00
David Baker
f2328904cd stray semicolon 2019-03-01 11:48:48 +00:00
David Baker
53aceaa412 Add fallback for languages file 
So we're not completely dependent on the alias being set
 2019-03-01 11:44:44 +00:00
David Baker
63c6f600bf Use webpack alias to resolve the languages file 
Hopefully this will end up simpler than having to figure out in
riot-web what the relative path is from react-sdk's
src/languageHandler.js to riot-web's webapp directory.
 2019-03-01 11:30:50 +00:00
Bruno Windels
60c4c55010
Merge pull request #2721 from matrix-org/bwindels/e2emembericonmargin 
Fix margin on e2e icon in member panel
 2019-03-01 11:11:14 +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