Commit Graph

7310 Commits (b2ddcb8027b95cb6bea0306561fb8d651aa32f0f)

Author SHA1 Message Date
Luke Barnard 591a7f4b86 Default to false 2017-10-26 10:06:04 +01:00
Luke Barnard 97b9cf6402 Actually use the synced setting 2017-10-26 09:58:46 +01:00
David Baker e6c3483c8b Add correct telegram link 2017-10-26 09:58:05 +01:00
Matthew Hodgson 5c32b5b11a fix i18n 2017-10-26 02:10:03 +01:00
Matthew Hodgson deb0f902e3 linting 2017-10-26 01:59:18 +01:00
Matthew Hodgson 1237de3ef0 Merge branch 'develop' into matthew/status 2017-10-26 01:47:22 +01:00
Matthew Hodgson 5a9dae5ff1 use generic 'text button' for delete buttons in UserSettings 2017-10-26 01:44:05 +01:00
Matthew Hodgson ac7a94afb2 apply theme tint at launch 2017-10-26 01:43:42 +01:00
Matthew Hodgson b3a8593468 make tinter coarsely theme aware 2017-10-25 22:48:27 +01:00
Luke Barnard 3ae97348f8 Add option to mirror local video feed 2017-10-25 18:17:33 +01:00
Luke Barnard 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
Luke Barnard cedc0b27a9 Handle redaction with no sender 2017-10-25 17:37:20 +01:00
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
Matthew Hodgson 6beb604cd0 fascist linting >:( 2017-10-25 02:31:30 +01:00
Matthew Hodgson ae40ef4460 fix error layouts 2017-10-25 02:18:14 +01:00
Matthew Hodgson eb4b7c78a0 skin register screen 2017-10-25 02:04:02 +01:00
Matthew Hodgson 67cc02df3b hide header when error is up 2017-10-25 01:37:06 +01:00
Matthew Hodgson adbea44d70 hide login options for status 2017-10-25 01:30:09 +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
Matthew Hodgson 59b2189909 unbreak tests 2017-10-24 23:58:54 +01:00
Matthew Hodgson 26e8b2c1b3 switch to a LoginPage wrapper component
as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered
2017-10-24 23:37:26 +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 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