e1e4fc2dac
Make eslint happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 16:18:48 +01:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 15:50:45 +01:00
273aae207a
Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state
...
Display whether the group summary/room list is loading
2017-10-31 17:29:36 +00:00
16dca08b77
Use constants instead of string literals
2017-10-31 16:13:13 +00:00
5bfed67463
Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state
2017-10-31 14:25:10 +00:00
d6cbc44e0f
If groupRoomsLoading, replace RoomDetailList entirely with Spinner
2017-10-31 14:21:00 +00:00
f24c64f071
Merge pull request #1558 from matrix-org/luke/fix-client-side-validation-group-id
...
Change client-side validation of group IDs to match synapse
2017-10-31 13:27:38 +00:00
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state
2017-10-31 11:50:12 +00:00
302bd6c3e9
Escape dash in regex
2017-10-31 11:48:56 +00:00
775468e71a
Display whether the group summary/room list is loading
...
This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.
2017-10-31 11:42:09 +00:00
20bf69c3c2
Prevent non-members from opening group settings
2017-10-31 10:54:44 +00:00
53938f7998
Change client-side validation of group IDs to match synapse
2017-10-31 10:25:06 +00:00
4e234cfc3b
Alter UI for disinviting a group member
...
The same API as kicking is used for disinviting, so only cosmetic changes needed here.
2017-10-30 18:17:35 +00:00
19b798be10
Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools
...
Only show admin tools to privileged users
2017-10-30 18:03:24 +00:00
3e64333ada
Only show admin tools to privileged users
2017-10-30 16:45:45 +00:00
57d516f042
Don't refresh page on password change prompt
...
It's on the form submit but missing a preventDefault
2017-10-30 16:28:27 +00:00
14d600a69f
Fix initial in GroupAvatar in GroupView
2017-10-30 15:04:12 +00:00
580d8dce19
Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method
...
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:40:19 +01:00
5209f29a5c
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:27:54 +01:00
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
4eb8fe3e6a
Lowercase all usernames
...
As synapse doesn't accept usernames with capitals in them now
Fixes https://github.com/vector-im/riot-web/issues/5445
2017-10-27 17:49:44 +01:00
e094c32c62
Simplify GroupStore listener registration
2017-10-27 11:38:10 +01:00
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +01:00
c8a489ca77
Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members
...
Only show group settings cog to members
2017-10-26 14:52:16 +01:00
9643784f85
Only show group settings cog to members
...
Non-members have no settings to change.
2017-10-26 14:31:27 +01:00
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
5871a74228
Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo
...
Add invite button to MemberInfo if user has left or wasn't in room
2017-10-26 11:35:45 +01:00
591a7f4b86
Default to false
2017-10-26 10:06:04 +01:00
97b9cf6402
Actually use the synced setting
2017-10-26 09:58:46 +01:00
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
4cfbd66729
Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip
...
Use the correct userId when displaying who redacted a message
2017-10-25 17:47:22 +01:00
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
5990e41bd7
Use the correct userId when displaying who redacted a message
2017-10-25 17:24:45 +01:00
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-25 18:19:27 +02:00
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
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
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
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
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
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
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
f3c8951d4e
remove unused lastPresenceTs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-25 12:56:23 +01:00
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
27f845a7aa
Match on any alias
2017-10-25 12:42:58 +01:00
7029ab07fc
If no canonical alias, use first alias (and fallback to Unnamed)
2017-10-25 12:38:39 +01:00
37b55984ec
Fix group Leave button tooltip
2017-10-25 12:09:13 +01:00
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
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
2e3bdfd55d
Fix string indentation.
2017-10-25 10:45:17 +01:00
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
Stefan Parviainen