OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
62,694 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

62694 Commits (e3f8a7b13d7feda2b1ed5ceeb7ab926b2bd9542c)

Author SHA1 Message Date
Kegsay 2e154c7478 Merge pull request #110 from matrix-org/kegan/3pid-invite-refresh-mlist 
Refresh the membership list on 3PID invites
 2016-01-22 16:13:42 +00:00
Kegan Dougal 99da0ef656 Fix vector-im/vector-web#694 - Empty invitee list 
The invitee list is lazy-loaded 50ms after the first render. We were relying
on setState from the member lazy-load to also kick the invitee list. However,
setState is synchronous and we were loading the invitee list afterwards, which
meant that the SearchableEntityList wouldn't have any invitees until the next
render().
 2016-01-22 16:11:09 +00:00
Matthew Hodgson 5e21059144 Merge pull request #729 from vector-im/matthew/truncateroomlist 
truncate room list
 2016-01-22 16:09:28 +00:00
Matthew Hodgson 0a32874b39 oops, reset truncate state on hide, not collapse 2016-01-22 16:09:06 +00:00
Kegan Dougal 38d5c7d5c5 Filter out undefined/null children which won't render 2016-01-22 15:57:42 +00:00
Matthew Hodgson 1dd2cbed63 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2016-01-22 15:51:34 +00:00
Matthew Hodgson 0bef94a6ce fudge around https://github.com/vector-im/vector-web/issues/731 2016-01-22 15:51:27 +00:00
Kegan Dougal 302c63058b Invoke onShowMoreRooms to allow parents to kick their scrollbars.. 2016-01-22 15:46:58 +00:00
Kegan Dougal 675e0f176f Add onShowMoreRooms prop for kicking gemini 2016-01-22 15:46:38 +00:00
Matthew Hodgson 0ee1892a0b truncate room list 2016-01-22 15:31:42 +00:00
Matthew Hodgson 0bdd674f7f fix invalid powerlevel setting 2016-01-22 15:29:57 +00:00
Kegan Dougal ec54c7cf6c Match entities based on uid/displayname and include partials/stripping 
"foo" would now match:
 - @foobar:matrix.org    - User ID matching
 - Foobar                - Display name matching
 - f (@foo2:matrix.org)  - user ID localpart matching
 - Bar Foo               - Word matching
 2016-01-22 15:21:41 +00:00
Kegan Dougal 366a24bbe4 Refresh the membership list on 3PID invites 2016-01-22 15:11:36 +00:00
David Baker 12afbcbc45 Merge pull request #727 from vector-im/dbkr/rule_kinds 
Add vector rules with the appropriate kind
 2016-01-22 14:15:49 +00:00
David Baker e11ae99a9f Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings. 2016-01-22 14:12:29 +00:00
Kegsay 4775f39e1d Merge pull request #109 from matrix-org/kegan/room-swap-perf 
Improve room swap performance
 2016-01-22 14:08:20 +00:00
Kegan Dougal 0752c3a6d5 Add start:prod - same as 'npm run start' but with NODE_ENV=production 2016-01-22 13:17:09 +00:00
Kegan Dougal 7ef1ba0b44 Unbreak RoomHeader 2016-01-22 11:48:26 +00:00
Kegan Dougal f213901e29 Return early when calculating one-to-one room avatars 
Object.keys() is O(n) and is wasted because we only care if the keys are 1 or 2.
Use `for .. in` instead and return early if there are >2 keys.

Profiling indicates this cuts wasted time from ~74ms to ~32ms for me (who has
a large number of rooms with large numbers of people in them).
 2016-01-22 11:11:56 +00:00
manuroe 87f3603047 Merge pull request #721 from vector-im/push-rules-dont-notify 
Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF
 2016-01-22 11:37:58 +01:00
manuroe ce45f0b1e6 Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF 2016-01-22 09:30:31 +01:00
manuroe e72323c405 Removed unexpected commit on .gitignore 2016-01-22 08:57:06 +01:00
manuroe a627ee7ef6 Fixed ternary operation 2016-01-22 08:54:40 +01:00
Matthew Hodgson 8ccc3f04c3 correct layout for truncated lists 2016-01-21 17:39:12 +00:00
Matthew Hodgson a76167d175 correct layout for truncated lists 2016-01-21 17:38:46 +00:00
Kegsay b45e5e6eb5 Merge pull request #108 from matrix-org/kegan/member-list-perf 
Add "and X more" overflow tile to joined member list
 2016-01-21 16:15:12 +00:00
Kegan Dougal dfab32394d Set truncation to 10 for now. 2016-01-21 16:03:32 +00:00
Kegan Dougal d72ab641d0 Expand the list when the overflow element is clicked 
Negative truncateAt values means "do not truncate".
 2016-01-21 15:57:59 +00:00
manuroe 3a23189435 Merge pull request #716 from vector-im/push-rules-add-bot-rule 
Added notif settings for "Messages sent by bot" (#692)
 2016-01-21 16:39:19 +01:00
manuroe f3064a2994 Put back removing of "When people join or leave a room" settings push rule 2016-01-21 16:37:17 +01:00
manuroe 029cf754ee Added notif settings for "Messages sent by bot" (https://github.com/vector-im/vector-web/issues/692) 
In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules
 2016-01-21 16:16:44 +01:00
Matthew Hodgson c5099a837b doh - anyone can set their own tags... 2016-01-21 15:08:14 +00:00
David Baker 1a248c8e5c Merge pull request #710 from vector-im/unread_sync 
Use read receipts to calculate unread room status
 2016-01-21 13:29:49 +00:00
David Baker 97d42b3ad7 Merge pull request #107 from matrix-org/unread_sync 
Use read receipts to calculate unread room status
 2016-01-21 13:29:45 +00:00
David Baker 876646ac54 Hopefully make unread loop a bit more digrestable. 2016-01-21 13:22:13 +00:00
David Baker 568f9bb19d Merge pull request #713 from vector-im/dbkr/remove_member_event_rule 
Remove member event rule as per SYN-607
 2016-01-21 12:30:03 +00:00
David Baker b913e72735 Remove member event rule as per SYN-607 2016-01-21 12:01:28 +00:00
Kegan Dougal eed83f982e Add a suitable overflow tile for the member list 2016-01-21 11:41:28 +00:00
Kegan Dougal 9f362e488c Add a TruncatedList component, which truncates children passed to it. 2016-01-21 11:30:37 +00:00
David Baker 4d4c6e06ec Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:39:35 +00:00
David Baker 13e70e6956 Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:36:29 +00:00
David Baker 2d917910da Merge pull request #556 from vector-im/notif_sync 
Use unread count for room highlight state
 2016-01-21 10:31:46 +00:00
David Baker 99a491bb0e Merge pull request #68 from matrix-org/notif_sync 
Set room highlight from unread_notification_count
 2016-01-21 10:31:42 +00:00
David Baker 0a70fe2bd1 Argh, revert accidental config commit 2016-01-21 10:30:52 +00:00
David Baker acce08194d Apply patch to the right branch: update for new count format 2016-01-21 10:23:18 +00:00
David Baker a08d00c672 Apply patch to the right branch: update for new count format 2016-01-21 10:20:45 +00:00
David Baker 1c54c64850 Merge pull request #99 from matrix-org/user_settings_on_register 
Show user settings screen on registration
 2016-01-21 10:11:28 +00:00
David Baker a0cc3720a9 Merge pull request #106 from matrix-org/dbkr/dont_spam_read_receipts 
Don't spam the same RR at the server until it acks it.
 2016-01-21 10:01:30 +00:00
Matthew Hodgson 9bbb9f7b29 pretty invites! 2016-01-21 00:45:22 +00:00
Matthew Hodgson bd75234a2f make CSS work on FF 2016-01-21 00:39:26 +00:00