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

1448 commits

Author SHA1 Message Date
David Baker
df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
David Baker
08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
David Baker
adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
David Baker
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room 
Give autocomplete providers the room they're in
 2017-11-03 14:29:59 +00:00
Luke Barnard
151f9917b1 Fix group invites such that they look similar to room invites 
- Change GroupInviteTile to use RoomTile CSS
 - Give group invites their own sub list, with heading "Community Invites"
 2017-11-03 12:19:37 +00:00
David Baker
843d797ded Better type checking 2017-11-02 18:17:57 +00:00
David Baker
7f9967389d Pass room into Autocompleter 2017-11-02 18:15:26 +00:00
David Baker
498b117d5a copyrights 2017-11-02 18:01:28 +00:00
David Baker
4953d4de4d Give autocomplete providers the room they're in 
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
 2017-11-02 17:51:08 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info 2017-11-02 10:56:33 +00:00
Luke Barnard
0dcd52d88f Fix some react warnings firing 2017-11-01 17:12:22 +00:00
Stefan Parviainen
95b2392104 Merge branch 'develop' into departify 2017-10-27 19:23:13 +02:00
Michael Telatynski
1d5b4a9d50 Merge branch 'develop' into t3chguy/mention_user 2017-10-26 18:10:10 +01:00
Luke Barnard
eec6ed36cd Use correct icon for group room deletion and make themeable 
Also fix cancel icons to have class mx_filterFlipColor
 2017-10-26 14:05:58 +01:00
Stefan Parviainen
53e983f9c7 Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-25 18:19:27 +02:00
Michael Telatynski
fd7e057ec0 Merge branch 'develop' into t3chguy/invite_in_memberinfo 2017-10-25 16:33:50 +01:00
David Baker
8ed3474b64 Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists 
Only show editing UI for aliases/related_groups for users /w power
 2017-10-25 15:52:51 +01:00
Luke Barnard
39fa866d68 Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui 
Swap from `ui_opacity` to `panel_disabled`
 2017-10-25 15:47:18 +01:00
Luke Barnard
b1f2a6c1e9 Dramatically simplify use of mx_fadable 
by applying it to parent elements of things that need to be faded.
 2017-10-25 15:15:49 +01:00
Michael Telatynski
f3c8951d4e
remove unused lastPresenceTs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-25 12:56:23 +01:00
Luke Barnard
2f8f2ce76e Swap from ui_opacity to panel_disabled 
to simplify the process of disabling panels in the UI.
 2017-10-25 11:23:51 +01:00
Michael Telatynski
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-25 01:00:13 +01:00
Michael Telatynski
5514d81683
Add Mention button to MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-24 23:01:40 +01:00
Michael Telatynski
c896dfb17b
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-24 22:21:33 +01:00
Michael Telatynski
f813a752e7
only show change power level option in MemberInfo if we can actually 
send m.room.power_level AND are lower PL than them

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-24 22:12:48 +01:00
Stefan Parviainen
4ff369c884 Merge branch 'develop' into departify 2017-10-24 18:27:24 +02:00
Luke Barnard
ee7ebc425c Only show editing UI for aliases/related_groups for users /w power 2017-10-24 16:19:09 +01:00
Luke Barnard
e419446081 Add fields needed by RoomDetailList to groupRoomFromApiObject 
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
 2017-10-24 10:13:38 +01:00
Stefan Parviainen
115772d526 Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-23 19:57:52 +02:00
Stefan Parviainen
fc860c66bc De-partify RoomPreviewBar 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-17 22:03:49 +02:00
Stefan Parviainen
8083dccfa5 De-partify SenderProfile 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

Also, text does not need to be EmojiText
 2017-10-16 20:53:43 +02:00
Luke Barnard
47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
David Baker
e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque 
Modify GroupView UI
 2017-10-16 10:17:44 +01:00
Stefan Parviainen
ad2f54f8ab Fix italics and parens 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-15 18:01:57 +02:00
Stefan Parviainen
15d1dc1f3b Fix indentation 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-15 16:57:22 +02:00
Stefan Parviainen
9a5cffb5eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify 2017-10-15 16:49:27 +02:00
Matthew Hodgson
1d75d9e90d yet more horrifically strict linting :/ 2017-10-15 01:47:11 +01:00
Matthew Hodgson
635996c083 more bizarrely strict linting :/ 2017-10-15 01:19:06 +01:00
Matthew Hodgson
247e32115f bizarrely strict linting :/ 2017-10-15 01:13:52 +01:00
Matthew Hodgson
2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:03:18 +01:00
Matthew Hodgson
e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Travis Ralston
8a641c7173 Hide message pinning behind a labs setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:40:10 -06:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson
3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar 
Buttons to remove room/self avatar
 2017-10-14 22:13:32 +01:00
Michael Telatynski
b0b7472901
undo bad merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:14:57 +01:00
Michael Telatynski
e79f9ef011
=== > == 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:10:51 +01:00
Michael Telatynski
6ad8532bed
lowerCase query so that searching for Erik will actually find Erik.. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:58 +01:00
Michael Telatynski
a000439948
pass search query to filter fn in _updateList 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:30 +01:00
Travis Ralston
e5c8e3e7ad Add option to unset room avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:57:15 -06:00
Stefan Parviainen
a84b42bf24 Departify RoomSettings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-13 21:10:50 +02:00