f628ee2ef0
Merge branch 'develop' into kegan/indexeddb
2017-02-10 16:16:17 +00:00
407bcf1bb9
Delete database on logout. DI a SyncAccumulator. Log uncaught errors
2017-02-10 14:22:54 +00:00
ec730056d8
Alter comment
2017-02-10 11:39:22 +00:00
bab6a0b84a
Persist query parameter team token across refreshes
2017-02-10 11:31:04 +00:00
45f5b8b3a9
Thread teamToken through to LeftPanel for "Home" button
...
This means the riot-web will use the same teamToken used by sdk components. This includes cases where only the fragment query parameter has been provided.
Fixes matrix-org/riot-web#3185
2017-02-10 09:57:28 +00:00
7ba9e27893
Merge pull request #682 from matrix-org/luke/fix-typing-notif
...
Fix typing notif and status bar
2017-02-09 10:46:37 +00:00
103710728f
Do not show "+1 other"
...
Instead show a user name or avatar.
2017-02-09 10:30:06 +00:00
553054409f
Use (props,state) ordering of arguments
...
There was a bug here that meant that sometimes arguments were given in the wrong order; presumably leading to the status bar not appearing for calls etc.
2017-02-09 10:01:59 +00:00
cc69e982a7
Use single state to set both avatars and typing notif
2017-02-09 10:01:51 +00:00
40658494b4
Consider emails ending in matrix.org as a uni email
...
For the purposes of testing (and having a team page)
2017-02-09 09:29:55 +00:00
ad2710ec5d
fix CSS for import/export buttons
2017-02-09 02:00:58 +00:00
ea50acfc87
fix dark theme for uploadbar
2017-02-09 01:26:53 +00:00
231997dd63
unbreak /markdown off
2017-02-09 01:18:09 +00:00
449519dc32
Merge pull request #679 from matrix-org/luke/rts-email-verif-referrer
...
Set referrer qp in nextLink
2017-02-08 22:05:49 +00:00
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
260cb62438
Do not set team_token if not returned by RTS on login
2017-02-08 16:49:33 +00:00
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
8fea4c27cb
fix NPE
2017-02-07 22:00:56 +00:00
3d30db81e0
Only init RTS if configured correctly
2017-02-07 15:24:57 +00:00
3f9f59bb73
Import RtsClient at top
2017-02-07 15:23:23 +00:00
96539a4054
Merge pull request #666 from matrix-org/luke/rts-welcome-pages
...
RTS Welcome Pages
2017-02-07 13:42:47 +00:00
d5f6ecdc49
Use teamToken, not config when doing screen fallback
2017-02-07 13:23:58 +00:00
c93b6c3c34
Style, fixes
2017-02-07 13:15:40 +00:00
af19ea8bb7
Document login API
2017-02-07 12:01:44 +00:00
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
77f76db68b
UserSettings: s/vector-web/riot-web/
...
vector is dead, long live riot
2017-02-06 09:50:14 +00:00
4f3549cc37
Fix: actually get the team token
2017-02-03 14:42:22 +00:00
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
827b5a6811
Fix deviceverifybuttons
...
Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice
2017-02-03 14:34:19 +00:00
efae5f6bf1
Use localStorage team token with fall-back on query parameter
2017-02-03 11:48:24 +00:00
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
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
3ea746db1d
Fix RoomSettings
...
Don't enable encryption unless the box is checked!
2017-02-03 11:20:36 +00:00
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
e018eef9fa
UnknownDeviceDialog.js: tweak warning
2017-02-03 10:50:03 +00:00
28d28b55d1
correctly reflect verify/blacklist state in UI
2017-02-03 01:49:22 +00:00
5de84f845a
tweak verbiage
2017-02-03 01:49:05 +00:00
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
be41462f3a
merge
2017-02-02 22:05:44 +00:00
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
e7a32faf64
Wrap multiline JSX in parens
2017-02-02 18:47:24 +00:00
8799891e0e
hopefully fix key array warning
2017-02-02 18:47:15 +00:00
2bb275c071
missing (c)
2017-02-02 18:45:49 +00:00
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
10edab06a6
Don't c+p the complex markup
2017-02-02 18:41:50 +00:00
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
2cf24c17e2
double scrollback window on roomview
2017-02-02 18:27:21 +00:00
d567b3bb6a
fix 'show rightpanel' button alt text & icon
2017-02-02 18:27:21 +00:00
42f75e1740
Fix one read receipt randomly not appearing
...
The velociraptor was only actioning hidden -> visible transitions
if the position had changed, so the one RR that stayed in position
but became visible... didn't become visible.
2017-02-02 18:21:53 +00:00
e45ac36a3b
Merge pull request #635 from matrix-org/matthew/warn-unknown-devices
...
very barebones support for warning users when rooms contain unknown devices
2017-02-02 18:08:18 +00:00
Kegan Dougal