OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,470 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

3470 Commits (9eef3c53a340c9af3a1582283a4f35daeb8a3034)

Author SHA1 Message Date
David Baker f1288d85ba Merge pull request #678 from matrix-org/luke/rts-fix-undefined-team-token 
Do not set team_token if not returned by RTS on login
 2017-02-08 18:08:12 +00:00
Luke Barnard c2d5b72d68 Set referrer qp in nextLink 
This is so that when the verification link is clicked from an email, the referrer is set on the new instance of riot when /rts/register is hit
 2017-02-08 17:58:40 +00:00
Luke Barnard 260cb62438 Do not set team_token if not returned by RTS on login 2017-02-08 16:49:33 +00:00
David Baker fe17e2452b Merge pull request #676 from matrix-org/luke/rts-team-token-login 
Get team_token from the RTS on login
 2017-02-08 10:54:24 +00:00
Matthew Hodgson 8fea4c27cb fix NPE 2017-02-07 22:00:56 +00:00
Luke Barnard 3d30db81e0 Only init RTS if configured correctly 2017-02-07 15:24:57 +00:00
Luke Barnard 3f9f59bb73 Import RtsClient at top 2017-02-07 15:23:23 +00:00
David Baker 96539a4054 Merge pull request #666 from matrix-org/luke/rts-welcome-pages 
RTS Welcome Pages
 2017-02-07 13:42:47 +00:00
Luke Barnard d5f6ecdc49 Use teamToken, not config when doing screen fallback 2017-02-07 13:23:58 +00:00
Luke Barnard c93b6c3c34 Style, fixes 2017-02-07 13:15:40 +00:00
Luke Barnard af19ea8bb7 Document login API 2017-02-07 12:01:44 +00:00
David Baker c0d2fe19ef Merge pull request #677 from matrix-org/rav/logging_for_send_fail 
Logging to try to track down riot-web#3148
 2017-02-06 16:46:54 +00:00
Richard van der Hoff 484d9d708e Logging to try to track down riot-web#3148 
Since I can't figure out how this is happening, add a shedload of logging to
try to pin it down.
 2017-02-06 16:01:25 +00:00
Richard van der Hoff 77f76db68b UserSettings: s/vector-web/riot-web/ 
vector is dead, long live riot
 2017-02-06 09:50:14 +00:00
Richard van der Hoff 6d8dcd97af Merge branch 'master' into develop 
(Keep js-sdk on develop)
 2017-02-04 10:42:31 +00:00
Richard van der Hoff a9cd1bfd4b v0.8.6 2017-02-04 10:30:16 +00:00
Richard van der Hoff 04bbf0a26b Prepare changelog for v0.8.6 2017-02-04 10:30:15 +00:00
Richard van der Hoff 39488f294b bump to js-sdk 0.7.5 2017-02-04 10:23:56 +00:00
Richard van der Hoff 19b0f956d2 v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff aa164bf54c Prepare changelog for v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff c52ae8ff01 Bump to js-sdk 0.7.5-rc.3 2017-02-03 15:28:03 +00:00
Richard van der Hoff 1334e0ae0d Prep changelog 2017-02-03 15:27:51 +00:00
Luke Barnard 4f3549cc37 Fix: actually get the team token 2017-02-03 14:42:22 +00:00
Richard van der Hoff fd0a66ab99 Unpin js-sdk 2017-02-03 14:37:58 +00:00
Luke Barnard 173e80a5de Get team_token from the RTS on login 
Use the /login endpoint of the RTS to get the team token when the user has successfully logged in.
 2017-02-03 14:34:24 +00:00
Richard van der Hoff 827b5a6811 Fix deviceverifybuttons 
Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice
 2017-02-03 14:34:19 +00:00
David Baker 41936a957f v0.8.6-rc.2 2017-02-03 13:07:11 +00:00
David Baker 08276aefa7 Prepare changelog for v0.8.6-rc.2 2017-02-03 13:07:10 +00:00
David Baker 66e22d1d26 Bump js-sdk 2017-02-03 13:04:42 +00:00
David Baker bded0a7e8e v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker aa1a3db7fe Prepare changelog for v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker 25876837f5 released js-sdk 2017-02-03 12:11:24 +00:00
Luke Barnard efae5f6bf1 Use localStorage team token with fall-back on query parameter 2017-02-03 11:48:24 +00:00
Richard van der Hoff 5df5fed6f5 Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty 
Fix timeline & notifs panel spuriously being empty
 2017-02-03 11:35:28 +00:00
Richard van der Hoff 2b67c1245f Merge pull request #636 from matrix-org/matthew/blacklist-unverified 
UI for blacklisting unverified devices per-room & globally
 2017-02-03 11:32:24 +00:00
Richard van der Hoff 3ea746db1d Fix RoomSettings 
Don't enable encryption unless the box is checked!
 2017-02-03 11:20:36 +00:00
David Baker 470e760e42 Fix timeline & notifs panel spuriously being empty 
Only claim there's nothing to display once we've failed to back
paginate, otherwise we'll show the empty message instead of the
MessagePanel and therefore never try to back-paginate.
 2017-02-03 11:11:37 +00:00
Richard van der Hoff e018eef9fa UnknownDeviceDialog.js: tweak warning 2017-02-03 10:50:03 +00:00
David Baker 917be72965 Merge pull request #674 from matrix-org/matthew/better-unk-error 
Show better error message in statusbar after UnkDevDialog
 2017-02-03 09:38:19 +00:00
Matthew Hodgson 28d28b55d1 correctly reflect verify/blacklist state in UI 2017-02-03 01:49:22 +00:00
Matthew Hodgson 5de84f845a tweak verbiage 2017-02-03 01:49:05 +00:00
Matthew Hodgson e825a4af3c show better error msg after UnkDevDialog 
should fix https://github.com/vector-im/riot-web/issues/3122
 2017-02-03 00:45:33 +00:00
Matthew Hodgson be41462f3a merge 2017-02-02 22:05:44 +00:00
Richard van der Hoff cd5a1abfac Merge pull request #673 from matrix-org/dbkr/make_default_avatars_clickable 
Make default avatars clickable
 2017-02-02 18:49:08 +00:00
David Baker e7a32faf64 Wrap multiline JSX in parens 2017-02-02 18:47:24 +00:00
Matthew Hodgson 8799891e0e hopefully fix key array warning 2017-02-02 18:47:15 +00:00
Matthew Hodgson 2bb275c071 missing (c) 2017-02-02 18:45:49 +00:00
David Baker 1fc5c9ddcc Merge pull request #672 from matrix-org/dbkr/velociraptor_always_change_visibility 
Fix one read receipt randomly not appearing
 2017-02-02 18:45:29 +00:00
David Baker 10edab06a6 Don't c+p the complex markup 2017-02-02 18:41:50 +00:00
David Baker 7484cc3f70 Make default avatars clickable 
BaseAvatar can be passed an onClick which is called when it's, er,
clicked, except when it was the default avatar in which case it
merrily ignored it. Make it not ignore it.
 2017-02-02 18:29:33 +00:00