1009faf9dc
Merge pull request #171 from matrix-org/rav/typing_notifs_cleanups
...
Don't forceUpdate the whole roomview on typing notifs
2016-02-24 16:45:45 +00:00
7a19bad388
Merge pull request #170 from matrix-org/rav/video_resize
...
Factor out a separate auxpanel, and cleanup the maxHeight management
2016-02-24 16:45:25 +00:00
4ce3598274
Make the initialSyncLimit configurable
...
I keep wanting to change this to test things, and can never find the right
place to change it. Make it configurable.
2016-02-24 16:42:23 +00:00
b088651211
Use the --tags option so it works with non-annoated tags (seriously, git?)
2016-02-24 15:05:13 +00:00
a69c63cc60
Master is no longer stale.
2016-02-24 14:25:34 +00:00
04b51f6f0f
Merge branch 'develop'
2016-02-24 14:24:57 +00:00
ebd5399626
Bump to version 0.2.0
2016-02-24 14:24:15 +00:00
5d63d2269e
Use newly released versions of js-sdk & react-sdk
2016-02-24 14:21:53 +00:00
4b13d71bb4
Bump to 0.1.0
2016-02-24 14:14:53 +00:00
cd92f0ea62
Use new release of js-sdk
2016-02-24 14:06:03 +00:00
1e095e105a
Don't update state when no change to read marker
...
It turns out to be quite expensive to update the state, because we can't do
shouldComponentUpdate on any of the sub-components (because RRs and local echo
sneak in through the back door), and we don't want to trigger a whole render
cycle every time someone presses a key.
2016-02-24 12:53:39 +00:00
ef00bc6d56
Manually merge relevant remaining parts of https://github.com/vector-im/vector-web/pull/790 that aren't covered by @richvdh's PR.
2016-02-24 11:59:29 +00:00
8e25a4ca36
Merge pull request #999 from vector-im/dbkr/more_readme_foolproofing
...
Make the README more idiot-proof
2016-02-24 11:50:13 +00:00
1ecedd2769
Add back deployment info
2016-02-24 11:48:51 +00:00
9c9e260410
Make the README more idiot-proof
2016-02-24 11:36:57 +00:00
3f9f3e9d92
Merge pull request #998 from vector-im/rav/fix_the_sodding_deployment_instructions
...
Update the README to give clearer dev instructions
2016-02-24 11:24:48 +00:00
ca89c09e73
formatting
2016-02-23 21:00:27 +00:00
10f6277de2
Update the README to make the development instructions clearer
2016-02-23 20:55:37 +00:00
9db58de119
remove some dead code
2016-02-23 19:09:51 +00:00
4f417f7a82
Merge branch 'rav/roomview_works' into rav/read_marker
2016-02-23 18:56:11 +00:00
029f47d91c
Merge branch 'rav/roomview_works' into rav/read_marker
...
Conflicts:
src/components/structures/MessagePanel.js
src/components/structures/TimelinePanel.js
2016-02-23 18:55:53 +00:00
68e0192acc
reinstate event-continuation logic
...
Forgot to set prevEvent in the merge from develop, so we were never applying
the correct continuation logic.
2016-02-23 18:43:51 +00:00
3f51cda846
Register a s a guest even if email invite: this is ok now.
2016-02-23 18:30:35 +00:00
e2bafcbf02
Don't redirect to registration on 3pid invite: it's ok to be a guest now.
2016-02-23 18:26:15 +00:00
f1dd3d381a
Merge pull request #172 from matrix-org/dbkr/guest_access_by_default
...
Allow guest access by default (by specifying initial state)
2016-02-23 18:12:54 +00:00
acb443537a
Merge pull request #997 from vector-im/dbkr/fix_new_room_crash
...
Sender can be null, so null check.
2016-02-23 18:12:42 +00:00
b2b7354018
Comment guest access initial state
2016-02-23 18:10:48 +00:00
55c7c08ac2
Sender can be null, so null check.
2016-02-23 17:59:13 +00:00
72393bf75f
Merge branch 'rav/read_marker' into develop
2016-02-23 17:57:50 +00:00
418bf8e39c
Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this.
2016-02-23 17:55:45 +00:00
b384d8c91a
Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites
...
Wire up support for keypair 3pid invites.
2016-02-23 16:37:55 +00:00
07822e20cb
Don't forceUpdate the whole roomview on typing notifs
...
updating the roomview is expensive, so we shouldn't do it every time we get a
typing notification (which may or may not correspond to a user in this
room). Push it down to RoomStatusBar, and use a state var to keep track of it.
2016-02-23 16:17:50 +00:00
7a20fda7e7
Factor out a separate auxpanel, and cleanup the maxHeight management
...
Basically two changes here:
1. Factor out auxpanel from RoomView
2. Rather than setting maxHeight attributes by poking directly into the DOM,
pass them down as properties.
2016-02-23 15:54:15 +00:00
d599c8fbd2
Merge remote-tracking branch 'origin/develop' into rav/roomview_works
2016-02-23 13:37:21 +00:00
2c1b353c18
Merge pull request #169 from matrix-org/rav/regemini_on_status_update
...
Wire up StatusBar size changes to a geminipanel update
2016-02-23 13:36:54 +00:00
e656cbe8f3
Merge branch 'develop' into rav/roomview_works
2016-02-23 13:32:32 +00:00
ac4b36c0dd
Merge commit '99d2392' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:32:23 +00:00
862e3c8c43
Merge commit '3f1db5a' into rav/roomview_works
2016-02-23 13:26:11 +00:00
4a22fb9763
Merge commit '26e6632' into rav/roomview_works
2016-02-23 13:25:09 +00:00
21850d7e2f
Merge commit 'd7b3a24' into rav/roomview_works
2016-02-23 13:24:58 +00:00
9eff426819
Merge commit '71e2495' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:24:38 +00:00
6aaced04fa
Merge commit 'd2a731e' into rav/roomview_works
2016-02-23 13:02:26 +00:00
776b6a26c3
Merge commit '9a0ea56' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:02:02 +00:00
b1093f3f4b
Merge commit 'e972686' into rav/roomview_works
2016-02-23 12:57:53 +00:00
4c571cf1bf
Merge commit 'eb91faf' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:56:54 +00:00
7f4f30d7d5
Merge commit 'e3feae3' into rav/roomview_works
2016-02-23 12:01:53 +00:00
3acfab48fc
Merge commit '014acba' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:00:54 +00:00
8161a18efd
Merge commit 'b1a6575' into rav/roomview_works
2016-02-23 11:56:51 +00:00
497cb8bc9c
Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites
...
Pass through params for other URLs
2016-02-23 11:08:28 +00:00
d673249681
Wire up StatusBar size changes to a geminipanel update
...
When the statusbar changes size, we need to tell the gemini panel to
update. This is slightly tortuous as figuring out the size of the statusbar
isn't completely trivial.
Fixes https://github.com/vector-im/vector-web/issues/945 and
https://github.com/vector-im/vector-web/issues/986
2016-02-23 11:06:16 +00:00
Richard van der Hoff