OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,040 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

1040 Commits (38a2a61b38b804bdb59758bf256b53c533001dc7)

Author SHA1 Message Date
Matthew Hodgson 38a2a61b38 back out hacky previous commit as #946 only happens when gemini is disabled 2016-02-16 19:39:22 +00:00
Matthew Hodgson 34d0fc890a disable scroll-to-token entirely temporarily - https://github.com/vector-im/vector-web/issues/946 2016-02-16 17:39:32 +00:00
Matthew Hodgson 687eae7f43 stop floods of notifs when doing a logout+login 2016-02-15 22:07:08 +00:00
Matthew Hodgson 4b8b2ade8b fix login-on-guest-bar-NPE crash https://github.com/vector-im/vector-web/issues/930 2016-02-15 21:50:39 +00:00
Matthew Hodgson ca56b7ec2d match partial names in memberlist 2016-02-15 20:43:43 +00:00
Matthew Hodgson 61018f4f38 whitespace 2016-02-15 20:42:44 +00:00
Matthew Hodgson 6b48b626e6 fix spinner of doom 2016-02-15 20:39:02 +00:00
Matthew Hodgson 576de32ce4 show vaguely accurate default avatar 2016-02-15 22:01:22 +02:00
Matthew Hodgson dfbc88d421 fix keyboard shortcuts on logout prompt 2016-02-15 22:01:05 +02:00
Matthew Hodgson 0d153df417 improve registration fail error msg slightly 2016-02-15 21:58:37 +02:00
Matthew Hodgson af5a866596 clear upload bar correctly after upload completes by fixing a race and moving the upload_finished dispatch after clearing up the inprogress uploads data structure. I have zero idea how this ever worked... :/ 2016-02-15 21:29:56 +02:00
Matthew Hodgson 014acbab1f restore drag & drop file upload, broken by @richvdh's new timeline stuff 2016-02-15 21:16:04 +02:00
Matthew Hodgson b1a6575b1d remove ugly join & reject error msgs in favour of modal dialogs 2016-02-15 20:59:44 +02:00
Matthew Hodgson 30e9c76089 login as guest button on the login page 2016-02-15 20:44:13 +02:00
Matthew Hodgson e17d77778f sanitize setting displayname prompt 2016-02-15 19:37:03 +02:00
Matthew Hodgson 0c7573629a spell out that you can invite email addresses 2016-02-15 11:13:37 +02:00
Matthew Hodgson 0a37f1c478 improve the fix for https://github.com/vector-im/vector-web/issues/917 2016-02-15 09:52:57 +02:00
Matthew Hodgson 9d3b0f6075 fix https://github.com/vector-im/vector-web/issues/913 2016-02-15 00:37:59 +02:00
Matthew Hodgson 5e407b44b7 add markdown to tab complete list 2016-02-14 13:45:52 +02:00
Matthew Hodgson 5e5fdb9b96 fix vector-im/vector-web#921 2016-02-14 13:38:12 +02:00
Richard van der Hoff 3785cb3f15 Merge pull request #157 from matrix-org/rav/clicks_are_activity_too 
Consider mouse-clicking as user activity
 2016-02-12 10:41:27 +00:00
Richard van der Hoff 3e8cb47abe Consider mouse-clicking as user activity 
It's a bit non-sensical that moving the mouse constitutes user activity, but
clicking it does not. Fix it.
 2016-02-12 10:19:45 +00:00
Matthew Hodgson 605c567fde Merge pull request #156 from matrix-org/matthew/html-highlight-fix 
use sanitize-html's textFilter callback to only apply highlights to textNodes
 2016-02-11 16:48:17 +00:00
Matthew Hodgson 1c30640a92 remove unused 'body' var; use a `finally` to clean up the temporary textfilter 2016-02-11 14:03:54 +00:00
Matthew Hodgson 92435c0865 ooops, don't forget to actually sanitize the highlights after all that 2016-02-10 23:45:07 +00:00
Matthew Hodgson d055dbe522 use sanitize-html's textFilter callback to only apply highlights to textNodes when highlighting HTML. fixes https://github.com/vector-im/vector-web/issues/294 2016-02-10 20:25:49 +00:00
David Baker f016a327b1 Merge pull request #152 from matrix-org/dbkr/fix_room_settings_guest_exception 
Don't try to fetch push rules if we're a guest: it throws.
 2016-02-10 12:34:08 +00:00
David Baker 124155df00 Merge pull request #153 from matrix-org/dbkr/no_notif_settings_guests 
Don't show the Notifications widget for guests…
 2016-02-10 12:02:07 +00:00
David Baker 1e945cd13b Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it). 2016-02-10 11:48:35 +00:00
David Baker 038f613079 Don;t try to fetch push rules if we're a guest: it throws. 2016-02-10 11:16:36 +00:00
Richard van der Hoff 0d2b042c0f Merge pull request #148 from matrix-org/rav/keep_scrolling 
Don't stop scrolling at the read-up-to mark.
 2016-02-10 10:20:03 +00:00
David Baker bd73c4e0cc Merge pull request #151 from matrix-org/dbkr/spinner_while_joining 
Joining a room can take a while. Show a spinner…
 2016-02-09 17:45:09 +00:00
David Baker f72e534ac0 Merge pull request #150 from matrix-org/dbkr/null_check_invite_member_list 
Add a null check here since room can be null and this was throwing
 2016-02-09 17:23:38 +00:00
David Baker af0597e0c8 Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city. 2016-02-09 16:55:03 +00:00
David Baker b4a7124686 Add a null check here since room can be null and this was throwing 2016-02-09 16:48:12 +00:00
Richard van der Hoff b5f7bd6cfb Merge pull request #149 from matrix-org/rav/kill_autopeek 
Kill off the remains of auto_peek
 2016-02-09 15:59:46 +00:00
Richard van der Hoff f48f28eefe Kill another scrollToToken 
Missed a place where we were scrolling the messagepanel manually
 2016-02-09 15:50:09 +00:00
Richard van der Hoff 576b59be66 Kill off the remains of auto_peek 
Remove some dead code.
 2016-02-09 15:45:41 +00:00
Matthew Hodgson 3fd7dff264 unbreak safari 2016-02-09 15:08:04 +00:00
Matthew Hodgson baa6826409 better commenting 2016-02-09 15:08:04 +00:00
Richard van der Hoff 178e99385a Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling 2016-02-09 14:52:38 +00:00
Richard van der Hoff 7fd56351a9 Fix 'unread messages' in status 
This got broken in the previous commit
 2016-02-09 12:40:11 +00:00
Richard van der Hoff 194110dd71 Merge pull request #147 from matrix-org/rav/factor_out_statusbar 
Factor the statusbar implementation out of RoomView.
 2016-02-09 11:38:40 +00:00
Richard van der Hoff 81e95ca8c1 Wire up jump-to-bottom knob 
... which I embarassingly forgot
 2016-02-09 11:36:57 +00:00
Richard van der Hoff 8641dab756 Don't stop scrolling at the read-up-to mark. 
We want to keep things scrolling up after the read-up-to mark hits the middle
of the screen. Do this by giving the ScrollPanel a stickyBottom (provided we're
not in old history) instead of updating the scroll position when RRs arrive.

Also, when we switch back to a room, if there was no special scroll state, jump
to the end of the timeline instead of the RR mark.
 2016-02-09 11:08:26 +00:00
Kegsay da81d240e2 Merge pull request #146 from matrix-org/kegan/warning-bars-dom 
Use constant div nesting when warning bars appear
 2016-02-09 11:03:31 +00:00
Richard van der Hoff 1d9c88698f Factor the statusbar implementation out of RoomView 
... because RoomView must die
 2016-02-08 18:08:19 +00:00
Richard van der Hoff 4996164b46 Merge pull request #145 from matrix-org/rav/outdent_roomview_render 
Drop a redundant 'else' from RoomView.render, and outdent a load of code
 2016-02-08 18:07:12 +00:00
Kegan Dougal ecaa2c1e11 Fix the mess of warning bars so it doesn't trigger remounts of alllll the components 2016-02-08 17:20:52 +00:00
Richard van der Hoff 3ca2bbe31e Drop a redundant 'else' from RoomView.render, and outdent a load of code 
... in the hope of aiding readability slightly
 2016-02-08 16:43:08 +00:00