OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,173 Commits
209 Branches
549 Tags
652 MiB
Commit Graph

1173 Commits (068429f3e34c584471abda21b896d9e6ba31761f)

Author SHA1 Message Date
David Baker 068429f3e3 Tidy up starting from a room alias when not logged in. 2016-03-04 17:37:06 +00:00
David Baker 4a3053a90b Merge pull request #185 from matrix-org/dbkr/threepid_invite_wording 
Fix 3pid invite acceptance with desired wording.
 2016-03-04 11:37:55 +00:00
David Baker 82cdc15faf unneccessary '+' 2016-03-04 11:37:37 +00:00
Matthew Hodgson 05a3dab528 fix roomavatars on FF 2016-03-03 16:16:40 +00:00
Matthew Hodgson 27fea6bc95 make the newly invited warning prettier 2016-03-03 15:02:11 +00:00
Matthew Hodgson cfd6546fe9 default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files 2016-03-03 12:11:22 +00:00
David Baker 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
David Baker 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
David Baker 45857fa12c Remove unused voice & video on-clicks from RoomHeader. 2016-03-02 14:54:38 +00:00
David Baker 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
David Baker c585b3edee anothert stray room_ 2016-03-02 14:31:01 +00:00
David Baker de2eaa3078 Document inviterName 2016-03-02 14:04:51 +00:00
David Baker 5827a883bf This should be just oob_data too 2016-03-02 14:02:36 +00:00
David Baker 4184158a9a Make comment match reality, attempt 2. 2016-03-02 14:01:21 +00:00
David Baker 6319c85272 Make comment match reality 2016-03-02 13:59:55 +00:00
David Baker 5bd2316e7f Oops, it's just oob_data here 2016-03-02 13:58:52 +00:00
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 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
Richard van der Hoff 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
Richard van der Hoff dc9a7e5e28 Merge pull request #181 from matrix-org/rav/issue_1049 
Fix CallView in left panel
 2016-02-29 17:51:39 +00:00
Richard van der Hoff 559f60d43e unmounted check in TimelinePanel 2016-02-29 17:06:38 +00:00
Richard van der Hoff 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, which made vector crash when you switched to another room with an
active call.
 2016-02-29 13:43:22 +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