PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
1152 commits 1 branch 0 tags 338 MiB
Commit graph

1152 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
2dbed2aa02 Clarify when room / oobData can/can't be set 2016-03-02 11:59:17 +00:00
David Baker
d61f383748 Oops, actually assign variable 2016-03-02 11:57:05 +00:00
David Baker
acb5f5d69b This should be props, not state 2016-03-02 11:56:18 +00:00
David Baker
7ae2c5b11b Document fields of oob_data 2016-03-02 11:51:47 +00:00
David Baker
10b1b6443d Fix rooms we don't have any info about 2016-03-02 10:59:54 +00:00
David Baker
9085a2a866 Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it. 2016-03-01 18:23:57 +00:00
Richard van der Hoff
db1e1c7df0 Fix NPE when re-joining a room 
Fix the length check on state.events
 2016-02-26 23:05:41 +00:00
Richard van der Hoff
acfc7b3719 Don't throw exceptions when room changes in a timelinepanel 
This does happen - fortunately only in circumstances where it's not a
problem. Downgrade the exception to a warning.

Fixes https://github.com/vector-im/vector-web/issues/1036
 2016-02-26 22:39:25 +00:00
Richard van der Hoff
543f444174 Merge commit 'd9e58d9' into develop 
Undo an over-zealous force-push :(
 2016-02-26 16:31:02 +00:00
Richard van der Hoff
a4402073fb Merge branch 'rav/roomview_works' into develop 2016-02-26 14:04:15 +00:00
Richard van der Hoff
d5c83347a6 Merge pull request #173 from matrix-org/rav/configurable_sync_limit 
Make the initialSyncLimit configurable
 2016-02-26 13:57:30 +00:00
Richard van der Hoff
a9d363c668 Merge pull request #180 from matrix-org/rav/optimise_timeline_load 
Make room-switching quicker
 2016-02-26 13:29:35 +00:00
Richard van der Hoff
65ecbf93fe Merge pull request #178 from matrix-org/rav/reset_timeline 
Reload the timeline when we get a gappy sync
 2016-02-26 13:28:20 +00:00
Richard van der Hoff
c4603d3474 Merge pull request #179 from matrix-org/rav/pagination_spinners 
Show spinners when forward/back paginating.
 2016-02-26 13:28:01 +00:00
Richard van der Hoff
0d1c85eb7c Make room-switching quicker 
Avoid delaying a reactor tick when switching rooms, to make room-switching
(feel) a bit snappier.
 2016-02-26 12:25:46 +00:00
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