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

6746 commits

Author SHA1 Message Date
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
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
J. Ryan Stinnett
426bdafe22
Merge pull request #2672 from jryans/password-validation 
Report validity state of all registration fields on any change
 2019-02-26 18:20:38 +00:00
J. Ryan Stinnett
4b29d5e228 Clarify finding first non-null field error 2019-02-26 16:41:17 +00:00
Bruno Windels
68ba14909b
Merge pull request #2671 from matrix-org/bwindels/permalinkperf 
Improve permalink performance
 2019-02-26 10:48:20 +01:00
Bruno Windels
4d95af705d fix lint 2019-02-26 10:26:33 +01:00
Travis Ralston
18b27a72d8
Merge pull request #2692 from matrix-org/t3chguy/room_context_menu_settings 
Settings button in Room Context Menu
 2019-02-25 20:28:38 -07:00
Michael Telatynski
7029695224 make it i18n friendly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 23:26:24 +00:00
Michael Telatynski
8d149575ea Merge branches 'develop' and 't3chguy/room_context_menu_settings' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_context_menu_settings 2019-02-25 23:12:06 +00:00
Michael Telatynski
d4b6ce6932 Apply PR feedback, don't change room to go to its settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 23:08:51 +00:00
Michael Telatynski
dd9077f1e4 Merge branches 'develop' and 't3chguy/pretty_Devtools' of github.com:matrix-org/matrix-react-sdk into t3chguy/pretty_Devtools 2019-02-25 22:39:37 +00:00
Michael Telatynski
56d58f8600 make better use of space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 22:38:33 +00:00
Michael Telatynski
5bdd61111d Fix textareas 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 22:12:06 +00:00
Travis Ralston
1aef157d2a Fix variable reference 2019-02-25 11:52:45 -07:00
Travis Ralston
24099de2a4 Merge branch 'develop' into travis/settings-cleanup-1 2019-02-25 10:56:43 -07:00
Travis Ralston
e0a5eeca75
Merge pull request #2686 from matrix-org/travis/old-room-sorting 
Support the old room sorting algorithm and SettingsStore watchers
 2019-02-25 10:51:10 -07:00
Bruno Windels
77f979ed6d also pass permalinkCreator here 2019-02-25 18:43:08 +01:00
Bruno Windels
b8c6bed906 adjust permalink code for tombstone message 2019-02-25 18:43:08 +01:00
Bruno Windels
fb672ffb28 change handling of event permalinks in replies 2019-02-25 18:43:08 +01:00
Bruno Windels
31dda34e6b use new permalink class in share dialog & context menu 2019-02-25 18:43:08 +01:00
Bruno Windels
f7ea9cfeb2 rename all instances of permalinkCreator 2019-02-25 18:43:08 +01:00
Bruno Windels
f97ea37717 permalink is one word 2019-02-25 18:43:08 +01:00
Bruno Windels
29be28919d create permalink creator in roomview and pass it on to the event tiles 2019-02-25 18:43:08 +01:00
Travis Ralston
5bf9f721c8 Port minimize to tray to new settings tab (post-merge) 
Brings in b02b371250
 2019-02-25 09:43:39 -07:00
Travis Ralston
4801b25f77 Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1 2019-02-25 09:40:50 -07:00
Travis Ralston
addc7e519b
Merge pull request #2699 from matrix-org/travis/fix-bug-in-notifications 
Fix NPE relating to toggling notifications
 2019-02-25 07:31:59 -07:00
Travis Ralston
8049d5c2b2
Merge pull request #2684 from matrix-org/travis/fix-e2e-menu-item 
Only set e2e info callback if the event is encrypted
 2019-02-25 07:31:17 -07:00
Travis Ralston
1c10b3050d Revert "Add some logging for riot-web#7838" 
This reverts commit f5ff580e35.
 2019-02-24 18:05:40 -07:00
Travis Ralston
c12bea06c8
Merge pull request #2698 from matrix-org/t3chguy/room_member_filter_clear 
Add abilities to clear Filter room members input
 2019-02-24 18:00:02 -07:00
Travis Ralston
2b9b07c29d
Merge pull request #2696 from matrix-org/t3chguy/pretty_view_source 
make ViewSource less awkward
 2019-02-24 17:55:07 -07:00
Travis Ralston
acbd3fb748
Merge pull request #2695 from matrix-org/t3chguy/guest_share_community 
Fix share community for guests
 2019-02-24 17:52:05 -07:00
Travis Ralston
6cc534e503 Fix NPE relating to toggling notifications 
The fallthrough for `notifier_enabled` caused a NPE on `payload.error`, so this moves the fallthrough to where it is intended and sanity checks `payload.error` for next time.
 2019-02-24 17:45:03 -07:00
Travis Ralston
896a8c1c1d
Merge pull request #2693 from matrix-org/t3chguy/search_toggle 
Toggle Search using Room Header button
 2019-02-24 17:41:23 -07:00
Travis Ralston
8ca1c96df4
Merge pull request #2691 from matrix-org/t3chguy/user_typing_memberinfo 
view user on click typing tile
 2019-02-24 17:38:25 -07:00
Travis Ralston
c261879ba7
Merge pull request #2690 from matrix-org/t3chguy/share_permalink 
Change Share Message to Share Permalink if !m.room.message||redacted
 2019-02-24 17:37:25 -07:00
Travis Ralston
f0353dbc3f
Merge pull request #2688 from matrix-org/t3chguy/minimize_tray 
Allow configuration of whether closing window closes or minimizes to tray
 2019-02-24 17:33:26 -07:00
Matthew Hodgson
ef3b729ff4 s/google.com/recaptcha.net/ as per https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally 2019-02-24 23:35:08 +00:00
Michael Telatynski
ee47e0f72e pass through className 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 04:44:38 +00:00
Michael Telatynski
5052039b36 Re-use SearchBox from filter rooms for filter room members 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 04:42:04 +00:00