Commit graph

460 commits

Author SHA1 Message Date
Richard van der Hoff
a863839063 Don't try to fiddle with the scroll state in search mode 2015-12-10 22:04:52 +00:00
Richard van der Hoff
669fae48ea Merge remote-tracking branch 'origin/develop' into rav/preserve_room_scroll 2015-12-10 21:53:59 +00:00
Richard van der Hoff
b7699c0544 Save scroll state when swapping to non-room pages too 2015-12-10 21:53:14 +00:00
Richard van der Hoff
d9782b35e1 Fix review comments
camelcasing and comments
2015-12-10 21:44:30 +00:00
Richard van der Hoff
1a3fb9aca9 Preserve scroll position when backfilling
Save the scroll state whenever the user does a scroll operation, and use that
to update the scroll after a backfill completes.
2015-12-10 21:34:10 +00:00
Richard van der Hoff
a1d88722aa Avoid kicking off two pagination requests at once
Make sure that we don't end up with two concurrent pagination requests by
firing off the second from the completion handler of the first. This ends up
making the code a bit simpler.
2015-12-10 20:53:21 +00:00
Richard van der Hoff
00656fc1dc Preserve scroll offset when switching rooms
When we change rooms, save the scroll offset, and restore the scroll when we
switch back.

Hopefully this fixes https://github.com/vector-im/vector-web/issues/80.
2015-12-10 16:26:36 +00:00
Erik Johnston
1bb0f4859f Merge pull request #48 from matrix-org/erikj/search-compat
Handle the fact that newer homeservers return lists rather than dicts for /search
2015-12-10 14:05:09 +00:00
Erik Johnston
5a1853210e Handle the fact that newer homeservers return lists rather than dicts 2015-12-10 13:58:06 +00:00
Matthew Hodgson
072130466c hopefully fix vector-im/vector-web#475 2015-12-08 19:49:16 +00:00
Kegan Dougal
8edfd60b64 Actually use room.name on invites. Fixes #321 2015-12-08 10:21:40 +00:00
Kegsay
47b50be4b5 Merge pull request #47 from matrix-org/kegan/resending
Resend ordering glue
2015-12-07 17:00:36 +00:00
Kegan Dougal
b64e5d49cc Add magic flag to say 'dump pending events to the end' 2015-12-07 15:33:58 +00:00
Kegan Dougal
b110e315ec Add removeFromQueue function to cancel sending a queued event 2015-12-07 11:36:28 +00:00
Matthew Hodgson
08d7c0232a svgize images 2015-12-06 22:07:49 +00:00
David Baker
681138678e Fix bolding 2015-12-04 19:14:14 +00:00
Kegsay
ae615b5c5e Merge pull request #46 from matrix-org/kegan/ops-level-update
Recalculate levels when the member prop is updated.
2015-12-04 16:27:56 +00:00
David Baker
142ac67799 Add a logic class to determine whether an event affects a room's unread count / status & use it 2015-12-04 16:20:05 +00:00
Kegan Dougal
257dc62a73 Recalculate levels when the member prop is updated. 2015-12-04 16:15:55 +00:00
David Baker
29b3b237d5 Refresh room list on timeline event even if it doesn't change highlight status since we still want to update the ordering. Fixes #413. 2015-12-04 14:24:02 +00:00
David Baker
6a67342d02 Comment + 1 2015-12-04 12:02:54 +00:00
David Baker
141d757a01 Don't recalculate atBottom here - we do it in onScroll and it should only be necessary to do it once. Also remove the magic 150px leeway. 2015-12-04 12:00:55 +00:00
David Baker
c0391145e5 Merge pull request #45 from matrix-org/file_uploads
Improve file uploads
2015-12-03 10:57:55 +00:00
David Baker
4c2fe55fdc Don't show the error dialog if the request was canceled. Handle 'request entity too large'. 2015-12-03 10:52:06 +00:00
David Baker
e8f5131ed6 Make file uploads cancelable, make them not go weird if you change rooms, error if they fail and move upload status bar out into its own component. 2015-12-02 18:16:16 +00:00
Matthew Hodgson
aeb8e21b5d better typing test :D 2015-12-02 17:38:02 +00:00
Kegan Dougal
cd13041b31 Make the X on the desktop notification bar work again
See vector-im/vector-web #464 for more info.
2015-12-02 16:35:16 +00:00
Kegsay
aceb85130e Merge pull request #44 from matrix-org/kegan/vector-references
Remove all references to 'Vector'
2015-12-02 09:39:34 +00:00
David Baker
40e4ae9759 Remove temporary vector stuff as the sister PR makes it obsolete. 2015-12-01 18:34:01 +00:00
David Baker
6978436b07 Update component index 2015-12-01 18:33:46 +00:00
David Baker
4446f1d781 Merge branch 'develop' into kegan/vector-references 2015-12-01 18:21:44 +00:00
David Baker
83c3c43c27 Merge pull request #41 from matrix-org/skindex-nextgen
Update skindexing for new world order
2015-12-01 18:11:49 +00:00
David Baker
d7a00a5a86 Merge branch 'develop' into skindex-nextgen 2015-12-01 18:10:04 +00:00
Kegan Dougal
bb289a4145 Add CustomServerDialog class 2015-12-01 16:49:15 +00:00
Kegan Dougal
673b01267a Use LoginHeader everywhere 2015-12-01 16:29:58 +00:00
Kegan Dougal
05a6121934 Add default LoginHeader 2015-12-01 16:27:48 +00:00
Kegan Dougal
52f3d7f18b Add generic LoginFooter. Remove vector reference 2015-12-01 16:12:13 +00:00
Kegsay
8b103da3d3 Merge pull request #43 from matrix-org/kegan/vector-components
Move remaining Vector-only components
2015-12-01 15:59:01 +00:00
David Baker
77b99de46b Update component index 2015-12-01 15:52:32 +00:00
David Baker
5e2a4fa537 Merge branch 'develop' into skindex-nextgen 2015-12-01 15:48:05 +00:00
Kegan Dougal
636be0c003 Update getComponent paths 2015-12-01 15:45:11 +00:00
Kegan Dougal
726c893663 Merge branch 'develop' into kegan/vector-components 2015-12-01 15:39:15 +00:00
Kegan Dougal
d5819d54db Fix typos 2015-12-01 15:36:40 +00:00
Matthew Hodgson
4fe2cc54d6 Merge pull request #42 from matrix-org/kegan/controller-merging4
Phase 4 controller merging
2015-12-01 15:15:39 +00:00
Kegan Dougal
fe16b221f8 s/vector.im/matrix.org/ 2015-12-01 13:48:53 +00:00
Kegan Dougal
784c1b63dc Move remaining vector molecules to components 2015-12-01 11:19:25 +00:00
David Baker
7f27ffd7bd Fix typos & variable shadowing from PR comments 2015-12-01 10:26:08 +00:00
David Baker
1de5d68e95 Un-commit accidentally committed file upload stuff 2015-12-01 10:25:35 +00:00
David Baker
1df03aa82a Remove unintentional logging 2015-12-01 10:20:21 +00:00
Kegan Dougal
1e694da460 Move MatrixChat and login components to react SDK.
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
2015-11-30 18:11:04 +00:00