acaacae697
Fix 3pid invite acceptance with desired wording.
...
Fixes https://github.com/vector-im/vector-web/issues/1070
2016-03-02 16:04:24 +00:00
1522c0ad76
Merge pull request #184 from matrix-org/dbkr/roomheader_unused_voip
...
Remove unused voice & video on-clicks from RoomHeader.
2016-03-02 14:58:16 +00:00
45857fa12c
Remove unused voice & video on-clicks from RoomHeader.
2016-03-02 14:54:38 +00:00
0051c91126
Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata
...
Pass room metadata from 3pid invite emails all the way through to the…
2016-03-02 14:31:58 +00:00
c585b3edee
anothert stray room_
2016-03-02 14:31:01 +00:00
de2eaa3078
Document inviterName
2016-03-02 14:04:51 +00:00
5827a883bf
This should be just oob_data too
2016-03-02 14:02:36 +00:00
4184158a9a
Make comment match reality, attempt 2.
2016-03-02 14:01:21 +00:00
6319c85272
Make comment match reality
2016-03-02 13:59:55 +00:00
5bd2316e7f
Oops, it's just oob_data here
2016-03-02 13:58:52 +00:00
2dbed2aa02
Clarify when room / oobData can/can't be set
2016-03-02 11:59:17 +00:00
d61f383748
Oops, actually assign variable
2016-03-02 11:57:05 +00:00
acb5f5d69b
This should be props, not state
2016-03-02 11:56:18 +00:00
7ae2c5b11b
Document fields of oob_data
2016-03-02 11:51:47 +00:00
10b1b6443d
Fix rooms we don't have any info about
2016-03-02 10:59:54 +00:00
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
3718377355
Merge pull request #182 from matrix-org/rav/pagination_race
...
Fix a race condition handling gappy syncs
2016-03-01 11:50:09 +00:00
1e3040d19a
Fix a race condition handling gappy syncs
...
We had a problem handling gappy syncs: resetting the timeline would trigger a
pagination request (which would return no results, because there are no events
at this point); this would make the pagination requests which are spawned when
we process the events in the sync get ignored - with the result that we get a
blank window.
The fix is to avoid the ScrollPanel when we are processing new live events and
tell the TimelineWindow to paginate itself directly.
2016-03-01 10:52:56 +00:00
dc9a7e5e28
Merge pull request #181 from matrix-org/rav/issue_1049
...
Fix CallView in left panel
2016-02-29 17:51:39 +00:00
559f60d43e
unmounted check in TimelinePanel
2016-02-29 17:06:38 +00:00
30abf81ed4
Fix CallView in left panel
...
Make CallView cope with not being passed a room. Fixes
https://github.com/vector-im/vector-web/issues/1049 , introduced in
7a20fda7
2016-02-29 13:43:22 +00:00
db1e1c7df0
Fix NPE when re-joining a room
...
Fix the length check on state.events
2016-02-26 23:05:41 +00:00
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
543f444174
Merge commit 'd9e58d9' into develop
...
Undo an over-zealous force-push :(
2016-02-26 16:31:02 +00:00
a4402073fb
Merge branch 'rav/roomview_works' into develop
2016-02-26 14:04:15 +00:00
d5c83347a6
Merge pull request #173 from matrix-org/rav/configurable_sync_limit
...
Make the initialSyncLimit configurable
2016-02-26 13:57:30 +00:00
a9d363c668
Merge pull request #180 from matrix-org/rav/optimise_timeline_load
...
Make room-switching quicker
2016-02-26 13:29:35 +00:00
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
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
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
e634f98a13
Show spinners when forward/back paginating.
2016-02-25 18:44:07 +00:00
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
2bd6529ca0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-25 18:38:14 +00:00
030b8fe113
Merge remote-tracking branch 'origin/0_1_0_fixes' into develop
2016-02-25 17:32:22 +00:00
757f1b228c
chmod +x jenkins.sh
2016-02-25 17:25:36 +00:00
8a346dd0ec
Remove old tarball before building new one
2016-02-25 17:24:13 +00:00
c1bb527539
s/version.txt/git-revision.txt/
2016-02-25 16:50:27 +00:00
d9e58d9626
Merge pull request #177 from Half-Shot/develop
...
Fixed default avatars not working with unicode.
2016-02-25 16:28:21 +00:00
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
78e5adeb2c
Merge branch 'master' into 0_1_0_fixes
2016-02-25 16:18:23 +00:00
e3b7330e3f
Add CONTRIBUTING.rst file
2016-02-25 16:17:55 +00:00
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
2e5df1a96f
Merge pull request #173 from matrix-org/rav/configurable_sync_limit
...
Make the initialSyncLimit configurable
2016-02-25 14:19:31 +00:00
46a2d4079d
jenkins.sh for react-sdk
2016-02-25 14:18:26 +00:00
246025a45f
Add barebones changelog
2016-02-25 11:56:50 +00:00
2d977c54ad
Add barebones changelog
2016-02-25 11:56:13 +00:00
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
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
10b55036f9
Merge branch 'rav/roomview_works' into develop
...
Implementation of new read-marker semantics (PR #160 ).
2016-02-24 17:26:46 +00:00
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
David Baker