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

62626 Commits (54765b447338eb42bf735e67e175a7042c48f19c)

Author SHA1 Message Date
Kegan Dougal a20cabb06f Merge branch 'develop' into kegan/tab-complete 2015-12-22 15:16:39 +00:00
Kegan Dougal e077517faf Ignore more keys when determining if the user is typing 
Specifically ignore CTRL, ALT, META, SHIFT, WINDOWS.
 2015-12-22 15:13:11 +00:00
David Baker 05d9e1261c Merge remote-tracking branch 'origin/develop' into notif_sync 2015-12-22 14:47:11 +00:00
David Baker 755ea0dfb8 Merge remote-tracking branch 'origin/develop' into notif_sync 2015-12-22 14:46:57 +00:00
Kegan Dougal e541ddb060 Auto-complete clicked suggestions 2015-12-22 11:14:36 +00:00
Richard van der Hoff cc90f4c0c6 Merge pull request #64 from matrix-org/rav/fix_date_separator 
Fix bug with date separator flashing up on scrollback
 2015-12-22 11:05:26 +00:00
Richard van der Hoff 360806a8f1 RoomView: add whitespace for disambiguation 2015-12-22 11:04:39 +00:00
Richard van der Hoff 6b07de05f3 Merge pull request #65 from matrix-org/rav/marker_at_top_of_search_results 
Add a 'top-of-search' marker
 2015-12-22 11:00:00 +00:00
Kegan Dougal 0dbb8d5294 Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic 2015-12-22 10:00:30 +00:00
Matthew Hodgson ea2405ab3a escape double-slash commands 2015-12-22 00:57:57 +00:00
Matthew Hodgson f681ce5cdb add CSS for TabCompleteBar 2015-12-22 00:47:33 +00:00
Matthew Hodgson 618978d955 add appropriate CSS for the TabCompleteBar 2015-12-22 00:47:04 +00:00
Matthew Hodgson ceadfef942 fix missing webkit prefixes for flexbox 2015-12-21 23:20:44 +00:00
Matthew Hodgson f665848c5e speed up search anim 2015-12-21 23:20:10 +00:00
Matthew Hodgson 031b048c07 fix missing webkit prefixes for flexbox 2015-12-21 23:19:53 +00:00
Matthew Hodgson d82c4c5ef3 fix safari flexbox bug 2015-12-21 23:16:44 +00:00
Kegan Dougal c8aaee46d7 Mark a TODO for timeout handling 2015-12-21 17:58:36 +00:00
Kegan Dougal ba63b5dfff Add image URLs to TabComplete.Entry objects 2015-12-21 17:28:04 +00:00
Kegan Dougal 4e79c3c4c8 Add allowLooping opt for tab completion. Make peeking work. 2015-12-21 17:16:49 +00:00
Kegan Dougal ab0a277d94 Rewrite tab-complete logic to allow peeking ahead 
This primarily means pre-calculating the list of things we'll be looping over
and then returning matches from this list. Make the regex match be more generic
rather than sorta-kinda-user-id-like-ish.
 2015-12-21 16:35:39 +00:00
Kegan Dougal 41d4c1d14e Add TabComplete.Entry so we can render images AND text(!) - Add peek() option, all broken. 2015-12-21 14:34:25 +00:00
Kegan Dougal 400b5196bb Add TabCompleteBar. Hook up display to whether we are currently tab completing. 2015-12-21 14:11:34 +00:00
Richard van der Hoff 7c285f9ad0 Add a 'No results' marker when there are no search results at all. 
Also reword the 'no more results' marker.
 2015-12-21 13:46:27 +00:00
Matthew Hodgson ae02d8d30a Merge branch 'develop' into matthew/settings 2015-12-21 13:10:34 +00:00
Matthew Hodgson b9ba4475b8 Merge branch 'develop' into matthew/settings 2015-12-21 13:09:33 +00:00
David Baker 6ea3f21a8e Favicon badges 2015-12-21 12:55:13 +00:00
Matthew Hodgson 85db381153 Merge pull request #550 from vector-im/kegan/archived-rooms 
Kegan/archived rooms
 2015-12-21 12:39:48 +00:00
Richard van der Hoff 765e5bdeb1 Add a 'top-of-search' marker 
Ugly as hell, pending better suggestions.

This fixes https://github.com/vector-im/vector-web/issues/547
 2015-12-21 12:39:10 +00:00
Matthew Hodgson 67aff6b9f2 adopt MacOS style chevrons 2015-12-21 12:37:51 +00:00
Matthew Hodgson 50aa988a34 fix layout 2015-12-21 12:37:50 +00:00
Matthew Hodgson fdc94ccf98 ensure even hyperlinks are highlighted 2015-12-21 12:37:50 +00:00
Kegan Dougal 26dc3cc553 Push up instantiation of TabComplete to RoomView 
RoomView is the parent component which creates MessageComposer AND the status
bar. By making RoomView instantiate TabComplete we can scope instances
correctly rather than relying on singleton behaviour through dispatches. This
also makes communication between status bar and the MessageComposer infinitely
easier since they are now sharing the same TabComplete object.
 2015-12-21 10:59:10 +00:00
Richard van der Hoff afadb23f89 Fix bug with date separator flashing up on scrollback 
Refactor the event-tile generation loop to go forwards rather than backwards,
which makes it easier to figure out whether we are displaying a continuation of
the previous event, and whether we need a date separator.

Also only display the date separator at the top of the room if there's no more
scrollback to be shown.

This fixes vector-im/vector-web#431
 2015-12-21 10:49:00 +00:00
Kegan Dougal c6d02b2c26 Move tab-complete logic out from MessageComposer 
Moved to a `TabComplete` class. Make it more generic (list of strings rather
than RoomMembers) and sort the member list by last_active_ago. Everything still
seems to work.
 2015-12-21 10:38:37 +00:00
Richard van der Hoff ff6d9454fd Merge pull request #63 from matrix-org/rav/paginate_search 
Pagination for search results
 2015-12-21 09:16:42 +00:00
David Baker cb1fabc578 Highlight status is now the room's unread notif count 2015-12-18 17:53:31 +00:00
David Baker 5f6fe74ca8 Highlight status is now taken from the server's unread notif count 2015-12-18 17:51:17 +00:00
Kegsay e57d0601b6 Merge pull request #62 from matrix-org/kegan/archived-rooms 
Show archived rooms and implement forgetting
 2015-12-18 17:36:36 +00:00
Kegsay 59f419b310 Merge pull request #541 from vector-im/kegan/archived-rooms 
Add more props to RoomSubList
 2015-12-18 17:36:16 +00:00
Kegan Dougal d1baf5854c Only display the MessageComposer if you're joined and not viewing search results 2015-12-18 17:23:46 +00:00
Matthew Hodgson fa99c1fc59 make it clear result count is approx 2015-12-18 17:18:08 +00:00
Kegan Dougal dcea0dd601 Move min-height to RoomList; remove bottommost prop 2015-12-18 17:13:57 +00:00
Kegan Dougal f0ff62166b Remove bottommost prop - can't DND on the bottom list anymore 2015-12-18 17:13:26 +00:00
Kegan Dougal dc1e2010a6 Merge branch 'develop' into kegan/archived-rooms 2015-12-18 17:00:20 +00:00
Kegan Dougal a2872deb53 Merge branch 'develop' into kegan/archived-rooms 2015-12-18 16:59:25 +00:00
Kegan Dougal 461e3f46dc Show an ErrorDialog when failing to forget a room 2015-12-18 16:56:37 +00:00
Richard van der Hoff 44c42394ae Fix scroll for search results 
Make sure that we save scroll position when searching, and use it to preserve
offset when backfilling.
 2015-12-18 16:42:46 +00:00
Matthew Hodgson 831aaec457 Merge pull request #57 from matrix-org/matthew/inbound-calls 
Position the inbound call box correctly
 2015-12-18 15:59:18 +00:00
Matthew Hodgson d7b87743f3 Merge pull request #533 from vector-im/matthew/inbound-calls 
position the inbound call box correctly
 2015-12-18 15:59:05 +00:00
Kegan Dougal c3bd81b83a Make rooms the user is banned in be treated as a joined room for position in room list 
This is so users can still find the room they've been expelled from, rather than
have it drop to the Historical section.
 2015-12-18 15:56:27 +00:00