0cc4497ef0
Merge pull request #307 from matrix-org/dbkr/fix_peeking
...
Fix peeking and member list vanishing
2016-06-16 11:13:20 +01:00
40b1b99c38
underscore prefix internal method
2016-06-14 14:40:03 +01:00
a95d8b5ed6
Move init logic into componentWillMount
...
to simplify getInitialState
2016-06-14 14:38:45 +01:00
0ef5cc891e
Add currentRoomId / Alias to getInitialState
...
with docs
2016-06-14 14:10:49 +01:00
b8eee08d69
Fix member list vanishing
...
Add a callback to RoomView that it can give the room ID to once it's resolved it, since this lookup is now the responsibility of the roomview and only the roomview. The view_room action now has either an alias or an ID, not both. Also fix RoomView to load the room properly and not try to peek when it shouldn't.
2016-06-14 12:56:37 +01:00
e973d18085
Hide e2e features if not enabled
...
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
aaefdf19c5
Fix MatrixChat syntax fail
2016-06-14 11:57:07 +01:00
11a38fce48
Fix peeking
...
Sorts out more of the room joining mess. currentRoom which held the room ID is now more appropriately called currentRoomId. RoomView will now take a roomID or alias as before but will now look up the room ID as required if given the alias. Also, now look up the alias every time you click on it so it's never stale, rather than looking in your current rooms for a room that thinks it has that ID.
2016-06-14 11:37:04 +01:00
5831a68e11
Labs improvements
2016-06-13 23:25:31 +05:30
727e6daaae
Fix key attr placement in UserSettings
2016-06-13 22:11:21 +05:30
c3a9658392
Add experimental "Labs" section to settings
2016-06-13 22:04:12 +05:30
719928f389
Remove view_room_alias
...
As it was basically the same as view_room. Use view_room instead which will handle whether we pass an ID or an alias into RoomView
2016-06-10 15:12:42 +01:00
b60ab9d695
Remove XXX now it's fixed (yay!)
2016-06-09 18:50:18 +01:00
72b3ce200d
Make the room directory join rooms by alias
...
Also makes some improvement on the multiple code path mess for joining rooms
2016-06-09 18:49:06 +01:00
049e3a968b
Merge pull request #303 from matrix-org/rav/factor_out_createroom
...
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
de36aa63fb
Factor out common parts of room creation
...
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
98ef793809
Default IS should be vector.im now
2016-06-09 10:56:14 +01:00
bb405563c8
Fix default servers
2016-06-09 10:54:56 +01:00
ef764c112e
Merge pull request #300 from matrix-org/rav/device_verification
...
Support for marking devices as verified
2016-06-09 10:44:42 +01:00
05404efa34
Remove if (this.props.config)
...
Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).
2016-06-09 09:53:37 +01:00
1dfb3f71ae
Merge branch 'develop' into rav/device_verification
2016-06-08 21:34:47 +01:00
c123f02842
Make the config optional
2016-06-08 18:45:46 +01:00
086698cd11
Add device info to user settings
...
Requires e81ce23 from matrix-js-sdk
2016-06-08 17:02:42 +01:00
7e8c8dd336
Remove SdkConfig
...
just take a config in MatrixChat, pass the individual things down through the chain.
This may become unwieldy: let's see how it goes.
2016-06-08 14:54:34 +01:00
b54376aa2a
Add singleton object to hold SDK configuration
2016-06-07 21:49:06 +01:00
943d7e18e1
Add _ to internal member
2016-06-07 19:55:24 +01:00
d5a522fdfe
Second attempt at fixing the Velocity memory leak
...
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
2016-06-07 18:22:01 +01:00
e20a1acb88
label our versions sensibly
2016-06-02 19:22:11 +01:00
1d31463140
set email branding after registration
2016-06-02 13:14:52 +01:00
83fd02bdfa
specify a brand when registering accounts
2016-06-02 11:51:26 +01:00
272afe39dc
do not list rooms by default
2016-06-01 02:03:53 +01:00
c3fc76cdaa
warn guests to register nicely to upload files
2016-05-31 23:59:36 +01:00
e1ba7df66e
fix the Add button for email addies
2016-05-31 23:50:53 +01:00
118eec8cc0
Add a fallback home server to log into
...
If login fail with a credential error on the default HS, try
logging in on the fallback one.
2016-05-27 14:57:43 +01:00
817a3debec
debug HS & IS
2016-05-18 11:42:51 +01:00
1459478ee0
use right check for end of timeline
...
and avoid bad interactions with forward pagination. thanks @richvdh
2016-05-17 21:32:20 +01:00
24adf2847e
better comment
2016-05-17 20:32:38 +01:00
7879be1704
implement basic local echo for resetting unread message count when opening a room without a scroll offset. hopefully largely fixes https://github.com/vector-im/vector-web/issues/967
2016-05-17 20:28:11 +01:00
fd09d5c570
switch badge count to per-conversation, and add per-room badges
2016-05-17 11:14:12 +01:00
62a1100fca
Merge pull request #289 from matrix-org/dbkr/email_notifs
...
Support for enabling email notifications
2016-05-10 16:39:37 +02:00
b86af8939a
fix usersettings cancel fail on new accounts
2016-05-05 15:30:56 +01:00
fab7111fd7
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-29 11:09:02 +01:00
ca0c697b6e
Avoid rerendering during Room unmount
...
might speed up room changing by a few milliseconds
2016-04-22 17:06:53 +01:00
0fd0b0c5f3
Whitespace fixes
...
Fix some trailing whitespace
2016-04-22 17:05:48 +01:00
c3365f993b
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-22 16:25:09 +01:00
afb301ffb7
Reduce timeline limit to 250 events
...
... maybe this will help improve responsiveness in firefox.
2016-04-22 11:08:39 +01:00
30f273c611
Merge pull request #283 from matrix-org/rav/issue_1427
...
Fix bug which stopped us scrolling down after we scrolled up
2016-04-21 14:26:42 +01:00
2f435f4836
Fix bug which stopped us scrolling down after we scrolled up
...
Make sure that, if we scroll up enough to move the timelinewindow away from the
end of the timeline, we reset the canForwardPaginate flag.
2016-04-21 14:20:12 +01:00
3381e2b057
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-21 10:12:27 +01:00
fa34dee091
Rewrite Read-receipt animation
...
... hopefully fixing https://github.com/vector-im/vector-web/issues/1437 in the
process.
The idea here is that, when we remove a read-receipt from the DOM, we stash its
position in a map. Then, when the read-receipt appears again attached to
another event, we know where to start the transition.
2016-04-20 23:06:53 +01:00
Richard van der Hoff