mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 02:38:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
994 commits 219 branches 562 tags 474 MiB
Commit graph

994 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kegsay
da81d240e2 Merge pull request #146 from matrix-org/kegan/warning-bars-dom 
Use constant div nesting when warning bars appear
 2016-02-09 11:03:31 +00:00
Richard van der Hoff
4996164b46 Merge pull request #145 from matrix-org/rav/outdent_roomview_render 
Drop a redundant 'else' from RoomView.render, and outdent a load of code
 2016-02-08 18:07:12 +00:00
Kegan Dougal
ecaa2c1e11 Fix the mess of warning bars so it doesn't trigger remounts of alllll the components 2016-02-08 17:20:52 +00:00
Richard van der Hoff
3ca2bbe31e Drop a redundant 'else' from RoomView.render, and outdent a load of code 
... in the hope of aiding readability slightly
 2016-02-08 16:43:08 +00:00
David Baker
a2e50eb496 Merge pull request #143 from matrix-org/dbkr/fix_display_name_prompt_when_peeking 
Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined.
 2016-02-08 16:03:37 +00:00
David Baker
9bf8f37e5f explicitly check join status as it's clearer 2016-02-08 16:03:04 +00:00
Kegsay
fba497d367 Merge pull request #144 from matrix-org/kegan/invite-autocompleting-race 
Factor out Invite / Search into its own component
 2016-02-08 15:54:45 +00:00
Kegan Dougal
2027ed9f49 Fix bug where clicking on the email tile didn't work 2016-02-08 15:21:23 +00:00
Kegan Dougal
70ed0be389 Merge branch 'develop' into kegan/invite-autocompleting-race 2016-02-08 15:06:13 +00:00
Kegan Dougal
3fa23798ea Split out invite memberlist logic into its own component 2016-02-08 15:05:35 +00:00
David Baker
baba500150 Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined. 
Fixes https://github.com/vector-im/vector-web/issues/885
 2016-02-08 14:33:10 +00:00
David Baker
05f1e1e205 Merge pull request #140 from matrix-org/dbkr/fix_tab_complete 
Fix tab complete
 2016-02-08 14:19:06 +00:00
Kegan Dougal
7ccce1dc91 Reset truncation when the text box is cleared 2016-02-05 16:58:37 +00:00
Kegan Dougal
5dafe1f4a6 Fix canonical alias bug showing the first alias if one was not set. 
<select> rests on the first value if the defaultValue is null. This first value
should've been 'not set'.
 2016-02-05 16:22:24 +00:00
Kegsay
ac67cd556a Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list 
Fix vector-im/vector-web#851 by truncating the search results
 2016-02-05 15:56:23 +00:00
Kegsay
4ce41f7f6c Merge pull request #141 from matrix-org/kegan/room-settings-refactor 
Refactor room settings
 2016-02-05 15:50:39 +00:00
Kegan Dougal
b99c6b9a97 camelCasePlease 2016-02-05 15:48:04 +00:00
Kegan Dougal
a0c5b30fd6 Fix vector-im/vector-web#851 by truncating the search results 2016-02-05 15:24:51 +00:00
Kegan Dougal
03f19eba55 Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits. 2016-02-05 14:38:28 +00:00
David Baker
500c12b1f2 Fix tab complete 
rate limited functions can't have arguments, so don't pass the room into
_updateTabCompleteList as it's always the room in our state.
 2016-02-05 14:32:30 +00:00
Kegan Dougal
ef9b4ab1e6 Log when sessions are saved/restored/not found 2016-02-05 13:32:01 +00:00
Kegan Dougal
0cbf9dba87 Glue more things back together 2016-02-05 11:59:19 +00:00
Kegan Dougal
78354d0bc7 Yank out color settings from RoomSettings to ColorSettings 2016-02-05 11:27:11 +00:00
David Baker
9525808cd0 Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers 
Unregister some event handlers we'd registered but never unregister.
 2016-02-05 10:48:22 +00:00
David Baker
0ae548cf5d Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs 
Make the function call-rate limiting a generic thing and use it in more places.
 2016-02-05 10:15:55 +00:00
David Baker
239abf4eca Style things from PR comments 2016-02-05 09:51:09 +00:00
David Baker
63776509a6 Make the function call-rate limiting a generic thing and use it in more places. 2016-02-04 18:06:24 +00:00
Richard van der Hoff
5ae532dae2 Merge pull request #138 from matrix-org/rav/update_rr_semantics 
Tweaks to the semantics for sending RRs and handling room switches
 2016-02-04 17:42:15 +01:00
Richard van der Hoff
d14c1a82b2 Tweaks to the semantics for sending RRs and handling room switches 
* Only send read receipts when we are at the bottom of a room; this is a simple
  and effective way of stopping the green bar of doom from jumping down the
  room slightly behind the scroll.

* Jump to read-up-to mark when switching back to a room if we were following
  the live timeline before.
 2016-02-04 16:27:49 +00:00
Kegan Dougal
74e16ac83e Merge branch 'develop' into kegan/room-settings-refactor 2016-02-04 16:20:24 +00:00
Kegan Dougal
73df5a2828 Modify how checked state is passed around 
Prefer onChange -> setState to ref grabbing so we can expose public setters
and not be tied down to certain element implementations.
 2016-02-04 16:18:59 +00:00
David Baker
c0d93a78bc Unregister some event handlers we'd registered but never unregister. 2016-02-04 15:55:24 +00:00
Kegsay
75ff4f0f95 Merge pull request #135 from matrix-org/kegan/sync-limit 
Set the sync limit back to sane levels
 2016-02-04 15:47:31 +00:00
David Baker
d1467d2319 Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join 
Prompt for display name before joining your first room
 2016-02-04 15:32:52 +00:00
Kegan Dougal
4013dae770 Start refactoring RoomSettings 
- Don't manipulate settings in RoomView. Make it RoomSettings' job.
- Return Promise[] from AliasSettings.save() rather than an allSettled promise
  so callers can have more granularity over what to do with it (.all vs .allSettled)
- General refactoring of RoomSettings. Most things are broken now and are not
  submitted. Add util methods to grab values out of events.
 2016-02-04 15:26:12 +00:00
David Baker
167da10b8b address PR comments 2016-02-04 15:07:30 +00:00
David Baker
6e424780f1 typo 2016-02-04 14:38:05 +00:00
David Baker
d0c8dadaf6 Merge pull request #134 from matrix-org/dbkr/fix_preview_bar 
Put the room preview bar back for rooms that aren't peekable
 2016-02-04 14:10:18 +00:00
Richard van der Hoff
309f1e2c8f Merge pull request #131 from matrix-org/rav/search_clickthrough 
Enable clicking on search results to switch to the result in context.
 2016-02-04 15:06:39 +01:00
Richard van der Hoff
63b50ed230 Merge pull request #132 from matrix-org/rav/fix_404_on_echo 
Don't try to use local echoes as scroll tokens
 2016-02-04 15:05:35 +01:00
Richard van der Hoff
8f5c739886 Clean up scrollToken assignment 2016-02-04 14:05:16 +00:00
Kegan Dougal
f3fa5d6a2a Set the sync limit back to sane levels 2016-02-04 13:30:25 +00:00
David Baker
b0da54533d Don't do this check - it's not valid since we set the room in onRoomName 2016-02-04 13:25:45 +00:00
David Baker
891f4761a0 Add comments and only set a room / init the timeline if we don't already have a room 2016-02-04 13:21:42 +00:00
Kegsay
6c9d48bd3a Merge pull request #128 from matrix-org/kegan/alias-settings 
Split out alias settings into its own component: AliasSettings
 2016-02-04 13:14:19 +00:00
David Baker
574560cc05 remove listener on unmount 2016-02-04 13:06:59 +00:00
David Baker
47fef0896f Prompt for display name before joining your first room (if you haven't set one). 
Fixes https://github.com/vector-im/vector-web/issues/758
 2016-02-04 11:49:10 +00:00
David Baker
3c2c2b051b Listen for Room and use this to init the timeline, not Room.name 2016-02-04 11:29:00 +00:00
David Baker
c9a3ad31ab Comment error handling 2016-02-04 11:17:39 +00:00
David Baker
5c430395ea init timeline when we get the room, as otherwise we never load it after joining 2016-02-04 10:50:21 +00:00