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

3467 Commits (2db53c228493311ad2fd044936af6f930f570270)

Author SHA1 Message Date
Matthew Hodgson 2db53c2284 whitelist data & mxc URIs on img tags: readds PR #333 now that punkave/sanitize-html#137 has landed 2017-02-19 03:04:42 +02:00
Matthew Hodgson 5ac76acc05 limit avatar uploads to images 2017-02-19 02:07:08 +02:00
David Baker e79d38467b Oops, un-hardcode correctly 2017-02-17 19:27:50 +00:00
David Baker 1819ff0939 Un-hardcode home in jenkins.sh 2017-02-17 19:26:21 +00:00
David Baker 3fcea0f586 Merge pull request #710 from matrix-org/dbkr/support_kick_ban_reasons 
Support reasons for kick / ban
 2017-02-17 17:39:45 +00:00
David Baker db4b9691cc Support reasons for kick / ban 
Don't ban me for fun, girl
Let me be the one, girl
Ban me for a reason
Let the reason be love.
 2017-02-17 17:27:46 +00:00
David Baker 10534e7df4 Merge pull request #709 from matrix-org/dbkr/show_when_banned 
Show when you've been kicked or banned
 2017-02-17 16:48:59 +00:00
David Baker b18473ccb2 Handle there being no member event when banned 
Here, and also in MemberEventListSummary where this also broke.
 2017-02-17 16:35:18 +00:00
David Baker 1f5fdf7945 Get a member object, not the user object 2017-02-17 16:14:51 +00:00
David Baker a3aea6ba2d Swap rejoin / forget 2017-02-17 16:11:20 +00:00
David Baker 9f9de46b10 Add onForgetClick proptype 2017-02-17 16:09:25 +00:00
Kegsay 5abcb91e0d Merge pull request #708 from matrix-org/kegan/clear-cache 
Add a 'Clear Cache' button
 2017-02-17 15:51:08 +00:00
David Baker de4773ba93 Show when you've been kicked or banned 
Update the room state when you've been kicked or banned, and show
a message in the preview bar, including the reason.
 2017-02-17 15:50:30 +00:00
Kegan Dougal 8d6c3cd3f4 Review comments 2017-02-17 15:37:49 +00:00
Kegan Dougal 0a31efa0b7 Add a 'Clear Cache' button 
This deletes the IndexedDB database and reloads the page.

This solely exists as a get-out clause for users in case the indexedDB instance
gets corrupted. Hopefully we won't ever need to point users to it.
 2017-02-17 15:16:28 +00:00
David Baker 775834b707 Merge pull request #707 from matrix-org/dbkr/update_on_room_name 
Update the room view on room name change
 2017-02-17 15:10:36 +00:00
David Baker a3746ea1b6 Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name 2017-02-17 14:41:54 +00:00
Richard van der Hoff 97722af3d6 Merge pull request #698 from matrix-org/dbkr/add_unban_button 
Add a button to un-ban users in RoomSettings
 2017-02-17 12:46:00 +00:00
Kegsay cc11b3eadc Merge pull request #687 from matrix-org/kegan/indexeddb 
Use IndexedDBStore from the JS-SDK
 2017-02-17 11:59:44 +00:00
David Baker b2344ceb74 Update the room view on room name change 2017-02-17 11:44:56 +00:00
Kegan Dougal cca266c62c Review comments 2017-02-17 10:43:55 +00:00
David Baker 4753552ddc Merge pull request #706 from matrix-org/luke/fix-team-token-referral-link 
Make UserSettings use the right teamToken
 2017-02-16 18:12:46 +00:00
David Baker b13e6ca022 Merge pull request #705 from matrix-org/luke/rts-default-goto-directory 
If the home page is somehow accessed, goto directory
 2017-02-16 18:10:56 +00:00
Luke Barnard 406c34b715 Make UserSettings use the right teamToken 
This threads the correct teamToken through to UserSettings for generating the referral section.
 2017-02-16 18:00:52 +00:00
Luke Barnard 9d2bb70823 If the home page is somehow accessed, goto directory 
For example, if someone ends up on /home somehow, just redirect to the directory instead of displaying a very awkward "File not found" plain text in the home page iFrame.
 2017-02-16 17:03:22 +00:00
Kegan Dougal 53f3b5780e Merge branch 'develop' into kegan/indexeddb 2017-02-16 16:10:23 +00:00
Luke Barnard 6945e7c154 Merge pull request #699 from matrix-org/luke/fix-avatar-initials 
Display avatar initials in typing notifications
 2017-02-16 14:06:05 +00:00
David Baker fe4a28b59a Merge pull request #703 from aviraldg/fix-no-invalid-this 
fix eslint's no-invalid-this rule for class properties
 2017-02-16 13:26:31 +00:00
Kegan Dougal f07da44aa5 Don't handle logs db: It needs to close its connections first 2017-02-16 12:42:45 +00:00
Aviral Dasgupta 0e66b370d4
fix eslint's no-invalid-this rule for class properties 2017-02-16 16:49:00 +05:30
David Baker 1f77534b32 Merge pull request #701 from matrix-org/luke/rts-allow-non-referrals 
If a referrer hasn't been specified, use empty string
 2017-02-16 10:42:27 +00:00
Luke Barnard 74487c655d If a referrer hasn't been specified, use empty string 
This is interpretted by the RTS as a non-referred team member who still needs the team token to access their welcome page etc.
 2017-02-16 09:22:44 +00:00
Aviral Dasgupta ebe7ec4000
Rename RTE labs option to "New Composer & Autocomplete" 
As per confusion around https://riot.im/develop/#/room/!DdJkzRliezrwpNebLk:matrix.org/$1487091505948TmtGn:t2l.io
 2017-02-16 02:20:34 +05:30
Richard van der Hoff 5769213647 Merge pull request #700 from matrix-org/rav/no_logout_on_localstorage_fail 
Don't force-logout the user if reading localstorage fails
 2017-02-15 19:59:30 +00:00
Richard van der Hoff bdb8f9d052 Don't force-logout the user if reading localstorage fails 
Give them a modal dialog to give them a chance to abort.
 2017-02-15 19:33:39 +00:00
David Baker 8698d40d3c Fix docs & add MatrixClient check 
Addresses PR feedback without breaking RoomSettings
 2017-02-15 19:01:00 +00:00
David Baker a5a056292d Revert c082827fc7 
Revert the WithMatrixClient change: RoomView calls methods on
the RoomSettings component and this breaks when RoomSettings is
wrapped in a WithMatrixClient.
 2017-02-15 18:58:59 +00:00
David Baker c082827fc7 Fix docs & use WithMatrixClient 2017-02-15 17:58:50 +00:00
Luke Barnard 8067bb627f Display avatar initials in typing notifications 
It seems they don't overlap hawkwawdly anymore, so this displays them always.

Fixes https://github.com/vector-im/riot-web/issues/3084
 2017-02-15 16:29:08 +00:00
Richard van der Hoff 42bb26925d Merge branch 'develop' into dbkr/add_unban_button 2017-02-15 13:19:22 +00:00
Richard van der Hoff a5325ee14a Merge pull request #697 from matrix-org/dbkr/missed_accessiblebuttons 
Convert some missed buttons to AccessibleButton
 2017-02-15 13:10:14 +00:00
David Baker 431e7a875d Copyright 2017-02-14 18:10:40 +00:00
David Baker 1e1ae5c950 Merge pull request #696 from matrix-org/dbkr/ban_becomes_unban 
Make ban either ban or unban
 2017-02-14 18:00:15 +00:00
David Baker 87516fb950 Add a button to un-ban users in RoomSettings 
https://github.com/vector-im/riot-web/issues/3091
 2017-02-14 17:54:57 +00:00
David Baker e1cb34e255 Merge remote-tracking branch 'origin/develop' into dbkr/missed_accessiblebuttons 2017-02-14 17:45:30 +00:00
David Baker 973b92b8f6 Merge pull request #694 from matrix-org/dbkr/confirm_ban 
Add confirmation dialog to kick/ban buttons
 2017-02-14 17:31:51 +00:00
David Baker 6fc70415cb s/onBan/onBanOrUnban/ 2017-02-14 17:29:40 +00:00
Luke Barnard 3d4a831624 Merge pull request #695 from matrix-org/luke/fix-scalar-popup 
Fix typo with Scalar popup
 2017-02-14 17:13:55 +00:00
David Baker f38b2dee78 Convert some missed buttons to AccessibleButton 
In RoomSettings
 2017-02-14 17:06:16 +00:00
David Baker 6663f5bff0 Remove commented stuff 
That I've now broken such that it wouldnt work if it were
uncommented
 2017-02-14 16:12:04 +00:00