Luke Barnard
cc69e982a7
Use single state to set both avatars and typing notif
2017-02-09 10:01:51 +00:00
Luke Barnard
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
Luke Barnard
747c0c44a6
Use new method of getting team icon
...
This was necessary because the team token may not be known when registering, but domain is. Storing the icon under the "common" directory is the chosen solution to this.
2017-02-09 09:24:46 +00:00
Matthew Hodgson
ad2710ec5d
fix CSS for import/export buttons
2017-02-09 02:00:58 +00:00
Matthew Hodgson
ea50acfc87
fix dark theme for uploadbar
2017-02-09 01:26:53 +00:00
Matthew Hodgson
231997dd63
unbreak /markdown off
2017-02-09 01:18:09 +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
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
5b239adfb8
Fix bug with home icon not appearing when logged in as team member
2017-02-07 14:58:25 +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
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
2017-02-07 12:41:52 +01:00
Luke Barnard
35bc384c51
Set team token in state on mount
2017-02-07 11:39:31 +00:00
Luke Barnard
d490bd8638
Use home.html rather than welcome.html
2017-02-07 11:35:17 +00:00
Luke Barnard
8d4f81ff67
Remove redundant inline style
2017-02-07 11:34:49 +00:00
Luke Barnard
648204b6f9
Use import
2017-02-07 11:34:34 +00:00
Luke Barnard
3f49f020cf
Copyright
2017-02-07 11:19:01 +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
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
Richard van der Hoff
7ceaabb166
RightPanel: remove superfluous divs
2017-02-03 12:00:33 +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
67e14ff363
Merge branch 'develop' into rav/hotkey-ux
2017-02-03 11:43:32 +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
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
a64e1cb936
Merge pull request #3118 from vector-im/dbkr/network_dropdown_mxc
...
Allow mxc: URLs for icons in the NetworkDropdown
2017-02-02 19:53:46 +00:00
David Baker
3903954bf2
Allow mxc: URLs for icons in the NetworkDropdown
...
For https://github.com/vector-im/riot-web/issues/3086
2017-02-02 19:35:36 +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
4c3a723aa8
make TopRightMenu more intuitive
...
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +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
Matthew Hodgson
2cf24c17e2
double scrollback window on roomview
2017-02-02 18:27:21 +00:00
Matthew Hodgson
d567b3bb6a
fix 'show rightpanel' button alt text & icon
2017-02-02 18:27:21 +00:00
Matthew Hodgson
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
Matthew Hodgson
5d5125df15
fix copyright & always show gemini
2017-02-02 18:02:07 +00:00
Matthew Hodgson
4ab479594b
temporarily stop hiding the statusbar
...
as per https://github.com/vector-im/riot-web/issues/1991#issuecomment-276953915
2017-02-02 17:48:54 +00:00
Richard van der Hoff
e9a53a8957
Merge pull request #671 from matrix-org/dbkr/fix_read_receipt_unhide
...
Fix expanding/unexapnding read receipts
2017-02-02 17:45:04 +00:00
