mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
7342 commits 216 branches 561 tags 417 MiB
Commit graph

7342 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
5990e41bd7 Use the correct userId when displaying who redacted a message 2017-10-25 17:24:45 +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
David Baker
19364c25ee Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name 
Fix room address picker tiles default name
 2017-10-25 14:25:51 +01:00
Luke Barnard
fbe0cc4927 Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50 
T3chguy/hide level change on 50
 2017-10-25 14:09:59 +01:00
Luke Barnard
813d0cd64c Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep 
fix missing date sep caused by hidden event at start of day
 2017-10-25 14:07:28 +01:00
Michael Telatynski
f3c8951d4e
remove unused lastPresenceTs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-25 12:56:23 +01:00
Michael Telatynski
1bbc26a27f
fix missing date sep caused by hidden event at start of day 
if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it
due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-25 12:52:51 +01:00
Luke Barnard
27f845a7aa Match on any alias 2017-10-25 12:42:58 +01:00
Luke Barnard
7029ab07fc If no canonical alias, use first alias (and fallback to Unnamed) 2017-10-25 12:38:39 +01:00
Luke Barnard
37b55984ec Fix group Leave button tooltip 2017-10-25 12:09:13 +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
Richard Lewis
fd85c74bc5 Merge pull request #1520 from matrix-org/rxl881/deleteWidget 
Add a delete confirmation dialog for widgets
 2017-10-25 10:45:52 +01:00
Richard Lewis
2e3bdfd55d Fix string indentation. 2017-10-25 10:45:17 +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
Andrew (anoa)
9821f0d459
Fix linting 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-10-24 16:42:06 -07:00
Andrew (anoa)
f032284eff
Remember whether widget drawer was hidden per-room 
Fixes #4850

Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-10-24 16:28:10 -07: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
88fd60066f Fix typo 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-24 20:07:57 +02:00
Stefan Parviainen
bc034f3083 Update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-24 19:34:32 +02:00
Stefan Parviainen
b5024cca75 Further simplify MemberEventListSummary a bit 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-24 19:34:08 +02:00
Luke Barnard
e9ce7f97f5 canSetRelatedRooms -> canSetRelatedGroups 2017-10-24 17:57:26 +01:00
Stefan Parviainen
6406fc3865 Use plurals in WhoIsTyping 2017-10-24 18:32:50 +02:00
Stefan Parviainen
4ff369c884 Merge branch 'develop' into departify 2017-10-24 18:27:24 +02:00
Luke Barnard
0463f0e581 Merge pull request #1530 from matrix-org/luke/fix-room-tile-highlighted-viewing-groups 
When dispatching view_[my_]group[s], reset RoomViewStore
 2017-10-24 16:41:52 +01:00
Luke Barnard
7b666af24c When dispatching view_[my_]group[s], reset RoomViewStore 
so that RoomTiles are not highlighted when the user is looking at MyGroups or GroupView
 2017-10-24 16:32:52 +01:00
Luke Barnard
640d88f25d Typo 2017-10-24 16:21:18 +01:00
Luke Barnard
ee7ebc425c Only show editing UI for aliases/related_groups for users /w power 2017-10-24 16:19:09 +01:00
David Baker
f7dce8ec70 Merge pull request #1528 from matrix-org/luke/groups-settings-privileged-only 
Prevent editing of UI requiring user privilege if user unprivileged
 2017-10-24 15:51:16 +01:00
David Baker
9e54002983 Merge pull request #1526 from matrix-org/luke/fix-group-rooms-guest-can-join- 
Use the correct property of the API room objects
 2017-10-24 15:31:49 +01:00
Luke Barnard
459ffc47d6 Prevent editing of UI requiring user privilege if user unprivileged 2017-10-24 15:25:35 +01:00
David Baker
8b4b3565a7 Merge pull request #1527 from matrix-org/dbkr/geni18n-no-other 
Don't include the |other in the translation value
 2017-10-24 14:40:25 +01:00
David Baker
8447d15013 Don't include the |other in the translation value 2017-10-24 14:26:30 +01:00
David Baker
def3bcce5f Merge pull request #1525 from matrix-org/dbkr/rerun_i18n 
Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521
 2017-10-24 13:56:42 +01:00
Luke Barnard
e955d27b5f Use the correct property of the API room objects 2017-10-24 13:47:10 +01:00
David Baker
f9c45d2c45 Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521 2017-10-24 13:40:44 +01:00
David Baker
ba46faf1b1 Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings 
Fix some react warnings in GroupMemberList
 2017-10-24 11:18:03 +01:00
David Baker
93fca8439e Merge pull request #1521 from matrix-org/dbkr/geni18n-addplural 
Fix bug with gen-i18n/js when adding new plurals
 2017-10-24 11:15:51 +01:00
David Baker
f29f627c31 Merge pull request #1524 from matrix-org/luke/groups-store-true-global 
Make GroupStoreCache global for cross-package access
 2017-10-24 11:05:14 +01:00
Luke Barnard
d1db0d6426 Deduplicate members, key by userId 2017-10-24 10:50:31 +01:00
Luke Barnard
353744b7f7 Merge pull request #1523 from matrix-org/luke/fix-group-rooms 
Add fields needed by RoomDetailList to groupRoomFromApiObject
 2017-10-24 10:40:37 +01:00
Luke Barnard
3ae31dd426 Make GroupStoreCache global for cross-package access 2017-10-24 10:39:47 +01:00
David Baker
46e9d4197a Use the 'and' feature! 2017-10-24 10:21:41 +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
Luke Barnard
1cc427ba46 Fix some react warnings in GroupMemberList 
- If the list contains two users twice, react would warn about duplicate keys. Use `index` instead.
 - Check if unmounted before setting state after fetching members.
 2017-10-24 09:58:45 +01:00