Commit Graph

1637 Commits (62a1100fcafcd0381ca6bd8b87d23ed8673dbaaa)

Author SHA1 Message Date
Richard van der Hoff e634f98a13 Show spinners when forward/back paginating. 2016-02-25 18:44:07 +00:00
Richard van der Hoff 4be29401ce Reload the timeline when we get a gappy sync
After a resume from sleep, we don't want to start paginating through the whole
timeline. If we were in 'stuckAtBottom' mode before, treat a gappy sync
similarly to how we handle the 'scroll to bottom' knob, which is to reload the
timelinewindow starting from scratch.

Fixes https://github.com/vector-im/vector-web/issues/932, and will probably
also fix https://github.com/vector-im/vector-web/issues/943, though I haven't
tested it yet.
2016-02-25 18:42:59 +00:00
Richard van der Hoff 2bd6529ca0 Merge remote-tracking branch 'origin/develop' into develop 2016-02-25 18:38:14 +00:00
Richard van der Hoff 030b8fe113 Merge remote-tracking branch 'origin/0_1_0_fixes' into develop 2016-02-25 17:32:22 +00:00
Richard van der Hoff 757f1b228c chmod +x jenkins.sh 2016-02-25 17:25:36 +00:00
Richard van der Hoff 8a346dd0ec Remove old tarball before building new one 2016-02-25 17:24:13 +00:00
Richard van der Hoff c1bb527539 s/version.txt/git-revision.txt/ 2016-02-25 16:50:27 +00:00
David Baker d9e58d9626 Merge pull request #177 from Half-Shot/develop
Fixed default avatars not working with unicode.
2016-02-25 16:28:21 +00:00
Will Hunt 081a975d2a Added ES6 function 'fromCodePoint' to retrive first initial for default avatars that begin with a large unicode character. 2016-02-25 16:23:38 +00:00
David Baker 78e5adeb2c Merge branch 'master' into 0_1_0_fixes 2016-02-25 16:18:23 +00:00
David Baker e3b7330e3f Add CONTRIBUTING.rst file 2016-02-25 16:17:55 +00:00
Richard van der Hoff dceb4a9297 Add a 'version.txt' file to the tarball
This will enable the vector build to know what it got
2016-02-25 15:24:10 +00:00
Richard van der Hoff 2e5df1a96f Merge pull request #173 from matrix-org/rav/configurable_sync_limit
Make the initialSyncLimit configurable
2016-02-25 14:19:31 +00:00
Richard van der Hoff 46a2d4079d jenkins.sh for react-sdk 2016-02-25 14:18:26 +00:00
David Baker 246025a45f Add barebones changelog 2016-02-25 11:56:50 +00:00
David Baker 2d977c54ad Add barebones changelog 2016-02-25 11:56:13 +00:00
David Baker 4bfae230fc Merge pull request #174 from matrix-org/dbkr/missed_delayedupdate_roomlist
Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup.
2016-02-25 11:26:31 +00:00
David Baker e915d7e215 Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup.
Fixes https://github.com/vector-im/vector-web/issues/544
2016-02-25 11:06:47 +00:00
Richard van der Hoff 10b55036f9 Merge branch 'rav/roomview_works' into develop
Implementation of new read-marker semantics (PR #160).
2016-02-24 17:26:46 +00:00
Richard van der Hoff 87945d2a97 Merge pull request #160 from matrix-org/rav/read_marker
Implementation of new read-marker semantics
2016-02-24 17:01:29 +00:00
Richard van der Hoff c9f9ccc43f Merge branch 'rav/roomview_works' into rav/read_marker
Conflicts:
	src/components/structures/RoomView.js
2016-02-24 17:00:49 +00:00
Richard van der Hoff 1959b03104 Land refactored roomview branch 'rav/roomview_works'.
This branch has been sitting around a while; it includes a substantial refactor
of RoomView (into separate MessagePanel and TimelinePanel), as well as a number
of fixes.
2016-02-24 16:52:12 +00:00
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 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
David Baker 4b13d71bb4 Bump to 0.1.0 2016-02-24 14:14:53 +00:00
David Baker cd92f0ea62 Use new release of js-sdk 2016-02-24 14:06:03 +00:00
Richard van der Hoff 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
Richard van der Hoff 9db58de119 remove some dead code 2016-02-23 19:09:51 +00:00
Richard van der Hoff 4f417f7a82 Merge branch 'rav/roomview_works' into rav/read_marker 2016-02-23 18:56:11 +00:00
Richard van der Hoff 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
Richard van der Hoff 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
David Baker 3f51cda846 Register a s a guest even if email invite: this is ok now. 2016-02-23 18:30:35 +00:00
David Baker 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
David Baker 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
David Baker b2b7354018 Comment guest access initial state 2016-02-23 18:10:48 +00:00
David Baker 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
David Baker 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
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff d599c8fbd2 Merge remote-tracking branch 'origin/develop' into rav/roomview_works 2016-02-23 13:37:21 +00:00
Richard van der Hoff 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
Richard van der Hoff e656cbe8f3 Merge branch 'develop' into rav/roomview_works 2016-02-23 13:32:32 +00:00
Richard van der Hoff ac4b36c0dd Merge commit '99d2392' into rav/roomview_works
Conflicts:
	src/components/structures/RoomView.js
2016-02-23 13:32:23 +00:00
Richard van der Hoff 862e3c8c43 Merge commit '3f1db5a' into rav/roomview_works 2016-02-23 13:26:11 +00:00
Richard van der Hoff 4a22fb9763 Merge commit '26e6632' into rav/roomview_works 2016-02-23 13:25:09 +00:00
Richard van der Hoff 21850d7e2f Merge commit 'd7b3a24' into rav/roomview_works 2016-02-23 13:24:58 +00:00
Richard van der Hoff 9eff426819 Merge commit '71e2495' into rav/roomview_works
Conflicts:
	src/components/structures/RoomView.js
2016-02-23 13:24:38 +00:00
Richard van der Hoff 6aaced04fa Merge commit 'd2a731e' into rav/roomview_works 2016-02-23 13:02:26 +00:00
Richard van der Hoff 776b6a26c3 Merge commit '9a0ea56' into rav/roomview_works
Conflicts:
	src/components/structures/RoomView.js
2016-02-23 13:02:02 +00:00