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

14116 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
a26b62ef94
Merge pull request #2703 from matrix-org/bwindels/fixhighlightdep 
pin highlight.js as they seem to have broken something in 9.15.2
 2019-02-25 18:35:41 +01:00
Bruno Windels
37f54a929b pin highlight.js as they seem to have broken something in 9.15.2 2019-02-25 18:24:59 +01: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
4d1872d0ab
Merge pull request #2700 from matrix-org/travis/revert-debugging-7838 
Revert "Add some logging for riot-web#7838"
 2019-02-25 07:26:31 -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
e8e9e9bcdc
Merge pull request #2694 from matrix-org/t3chguy/mx_WhoIsTypingTile_remainingAvatarPlaceholder 
Fix z ordering of the overflow tile
 2019-02-24 17:51:10 -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
Michael Telatynski
7b88d5d21c make ViewSource less awkward 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 03:43:44 +00:00
Michael Telatynski
e6bf9fe9bf Fix share community for guests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 03:25:02 +00:00
Michael Telatynski
fa5f1df194 Fix z ordering of the overflow tile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 03:18:21 +00:00
Michael Telatynski
e12e2c4a3d tidy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 02:57:13 +00:00
Michael Telatynski
ac17e22556 Toggle Search using Room Header button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 02:56:27 +00:00
Michael Telatynski
c99b4bda32 view user on click typing tile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 02:30:45 +00:00
Michael Telatynski
f2624beca4 Change Share Message to Share Permalink if !m.room.message||redacted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 02:03:20 +00:00
Michael Telatynski
4472c66b96 delint s'more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:38:31 +00:00
Michael Telatynski
45e9dbe49d delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:20:49 +00:00
Michael Telatynski
b02b371250 Allow configuration of whether closing window closes or minimizes to tray 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:06:53 +00:00
Travis Ralston
20cd198784 Only set e2e info callback if the event is encrypted 
Fixes https://github.com/vector-im/riot-web/issues/8551
 2019-02-22 10:31:14 -07:00
J. Ryan Stinnett
150c941340
Merge pull request #2682 from jryans/simplify-composer-state-change 
Remove duplicated conversion from `enableRichText`
 2019-02-22 16:57:37 +00:00
J. Ryan Stinnett
f99c35c5d9
Merge pull request #2683 from jryans/phase-for-server-type 
Use correct initial phase for server type
 2019-02-22 16:56:50 +00:00
Travis Ralston
d6f89f422b
Merge pull request #2679 from matrix-org/travis/settings/field-editable-list 
Fix AliasSettings and RelatedGroups UX
 2019-02-22 09:40:34 -07:00
J. Ryan Stinnett
c45ca58689
Merge pull request #2677 from jryans/composer-input 
Add `onClick` to Markdown buttons
 2019-02-22 16:19:22 +00:00
J. Ryan Stinnett
ec35423a0d Use correct initial phase for server type 
The initial phase of registration can differ by the default server type. In
particular, the Matrix.org HS type wants to skip to the registration form.

Fixes https://github.com/vector-im/riot-web/issues/8862
 2019-02-22 16:16:08 +00:00
J. Ryan Stinnett
f5c477bbc8 Remove duplicated conversion from enableRichText 
`enableRichText` would convert the editor state between rich and md versions
explicitly, but then it would also call `createEditorState`, which can do the
same thing.

This removes the duplication, and also supplies the right arguments to
`createEditorState` so it can do its work correctly.
 2019-02-22 15:48:44 +00:00
Travis Ralston
a02508023b
Merge pull request #2678 from matrix-org/travis/fix-email-config 
Fix toggle for email notifications
 2019-02-22 08:22:43 -07:00
J. Ryan Stinnett
ccd4dee0d2 Isolate rich text notifications from other input changes 
The step that would notify parent components of rich text state changes was
stirred into the input's change handler, which leads to race which the parent is
sometimes notified of the old rich text state instead of the new.

Here we avoid this complication by using a separate path for sending the rich
text state when we know we have updated it correctly.
 2019-02-22 15:18:24 +00:00
J. Ryan Stinnett
3e6199c0f7 Change Markdown buttons to onClick 
`AccessibleButton` expects click handlers, which we can use here, as long we
make some additional changes to avoid race processing the new state (see
subsequent patch).

Fixes https://github.com/vector-im/riot-web/issues/8866
 2019-02-22 15:18:06 +00:00
Bruno Windels
ec6c104e51
Merge pull request #2681 from matrix-org/travis/unbreak-new-rooms 
Fix categorization of favourites and new rooms
 2019-02-22 11:34:16 +01:00
J. Ryan Stinnett
ca5c7b03d3
Merge pull request #2675 from jryans/default-hs-to-form 
Skip server details on registration with a default HS
 2019-02-22 10:19:53 +00:00
J. Ryan Stinnett
b6682c0469
Merge pull request #2673 from jryans/username-label 
Clarify what the username error refers to
 2019-02-22 10:17:58 +00:00
Travis Ralston
e7b3cbfdf4 Fix categorization of favourites and new rooms 
New rooms (joined, invited, created, etc) were being ignored because they matched the check as soon as the iterator hit a non-recents section. This fixes the check to ensure there's a positive ID on the room being in the tag (or not, in the case of new rooms) before lying to the rest of the function.

Additionally, a fix for favourites has been included to stop the list expanding to fill the void - turns out it was inserting the room twice into the list, and this was breaking the tile rendering. The room sublist would allocate space for the tile, but React would prevent the tile from showing up because of duplicate keys.

Fixes https://github.com/vector-im/riot-web/issues/8868
Fixes https://github.com/vector-im/riot-web/issues/8857 correctly
 2019-02-21 19:21:32 -07:00
Travis Ralston
d6f8f8a7ba
Merge pull request #2680 from alexte/develop 
RoomDirectory Dropdown should use roomDirectory.servers
 2019-02-21 19:01:44 -07:00
Alexander Terczka
892802e9cc
RoomDirectory Dropdown should use roomDirectory.servers 
The sample config.json in riot-web has "roomDirectory.servers" and not "servers".
Are other systems than riot-web use "servers" without "roomDirectory" ? Then this would break these.
 2019-02-22 02:40:01 +01:00
Travis Ralston
75a2593523 More misc linter cleanup 2019-02-21 18:18:12 -07:00
Travis Ralston
9795161f40 Misc linter cleanup 2019-02-21 17:53:29 -07:00
Travis Ralston
1e6594ceba Disable removal of items if the user doesn't have permission 2019-02-21 17:15:25 -07:00
Travis Ralston
003d0eb0bf Show changes to related groups (flair) in the timeline 2019-02-21 17:03:15 -07:00
Travis Ralston
96eeab23af Convert RelatedGroupSettings to a class component 2019-02-21 16:48:54 -07:00
Travis Ralston
10daa35263 Make related groups direct manipulation 2019-02-21 16:40:12 -07:00