David Baker
33fc4f7d8d
Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon
...
Use new method of getting team icon
2017-02-10 16:39:11 +00:00
Kegan Dougal
c46f282139
Comments
2017-02-10 16:19:39 +00:00
Kegan Dougal
f628ee2ef0
Merge branch 'develop' into kegan/indexeddb
2017-02-10 16:16:17 +00:00
Luke Barnard
bdd031eac2
Enable branded URLs again by parsing the path client-side
...
Use the first path segment to key off config.teamTokenMap, which contains a mapping to teamTokens. The client then behaves as before, keeping the path in the address bar constant with no redirects required.
2017-02-10 15:09:45 +00:00
Kegan Dougal
407bcf1bb9
Delete database on logout. DI a SyncAccumulator. Log uncaught errors
2017-02-10 14:22:54 +00:00
Luke Barnard
a5a43bcd93
Merge pull request #685 from matrix-org/luke/rts-session-team-token
...
Persist query parameter team token across refreshes
2017-02-10 13:58:03 +00:00
Luke Barnard
ec730056d8
Alter comment
2017-02-10 11:39:22 +00:00
Luke Barnard
bab6a0b84a
Persist query parameter team token across refreshes
2017-02-10 11:31:04 +00:00
David Baker
b6741d9b10
Merge pull request #3196 from vector-im/luke/rts-thread-team-token
...
Use the teamToken threaded through from react sdk
2017-02-10 10:43:24 +00:00
David Baker
8bd7d90ca2
Merge pull request #684 from matrix-org/luke/rts-thread-teamToken
...
Thread teamToken through to LeftPanel for "Home" button
2017-02-10 10:42:59 +00:00
Luke Barnard
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
Luke Barnard
78aaf6b47e
Use the teamToken threaded through from react sdk
...
The bottom left menu now uses the same teamToken that the rest of the components use. This will require changes to react-sdk: https://github.com/matrix-org/matrix-react-sdk/pull/684
2017-02-10 09:56:15 +00:00
Luke Barnard
36b08fece7
Float the toggle in the top right of MELS
...
This is so that it stays put when the MELS is toggled.
Added style for a line that appears below "collapse" to indicate start of events.
Not possible to put "collapse" next to the expanded events because of read receipts.
2017-02-09 15:17:03 +00:00
Luke Barnard
8d3876c7d0
MELS: either expanded or summary, not both
...
Fixes vector-im/riot-web#3097
2017-02-09 15:14:16 +00:00
Luke Barnard
69add8fd64
Actually use the RTS URL
2017-02-09 13:16:46 +00:00
Luke Barnard
ae03244e6e
Merge branch 'develop' into luke/feature-css-msg-colors
2017-02-09 13:14:15 +00:00
Matthew Hodgson
f2a6d2cc5a
fix selector color
2017-02-09 12:01:00 +00:00
Matthew Hodgson
22b7b8efea
tweak sending color some more
2017-02-09 11:02:42 +00:00
David Baker
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
Luke Barnard
dd22e57a38
Merge pull request #681 from matrix-org/luke/rts-matrix-org
...
Consider emails ending in matrix.org as a uni email
2017-02-09 10:34:02 +00:00
Luke Barnard
103710728f
Do not show "+1 other"
...
Instead show a user name or avatar.
2017-02-09 10:30:06 +00:00
Luke Barnard
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
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
e392d6c16b
fix CSS for import/export buttons
2017-02-09 02:00:23 +00:00
Matthew Hodgson
2eec9b10ef
fix dark skin event sending color
2017-02-09 01:42:36 +00:00
Matthew Hodgson
64f0beb1eb
fix https://github.com/vector-im/riot-web/issues/3136
2017-02-09 01:33:26 +00:00
Matthew Hodgson
ea50acfc87
fix dark theme for uploadbar
2017-02-09 01:26:53 +00:00
Matthew Hodgson
f6b6673a41
fix selection text colour in dark theme
2017-02-09 01:20:30 +00:00
Matthew Hodgson
231997dd63
unbreak /markdown off
2017-02-09 01:18:09 +00:00
Matthew Hodgson
d8042b193b
be more specific on flex
2017-02-09 00:10:57 +00:00
Matthew Hodgson
5f745ff733
hopefully fix TopRight layout bug
2017-02-09 00:10:45 +00:00
Matthew Hodgson
bac142ad26
fix tintability of home button
2017-02-08 23:28:30 +00:00
Matthew Hodgson
caa30a742b
fix table visuals in dark skin
2017-02-08 23:19:05 +00:00
Luke Barnard
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
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
Richard van der Hoff
d7bc47c357
Merge pull request #3169 from vector-im/kegan/bugs-file-server
...
rageshake: Add file server with basic auth
2017-02-08 10:37:35 +00:00
Kegan Dougal
5f678eb838
Review comments: change realm name
2017-02-08 10:36:39 +00:00
Kegan Dougal
64eb1f08a9
rageshake: Add file server with basic auth
...
Set via environment variables on startup.
2017-02-08 09:59:41 +00:00
David Baker
85e6057598
Merge pull request #3162 from vector-im/luke/rts-fix-blm-team-token
...
Fix bug with home icon not appearing when logged in as team member
2017-02-08 09:54:33 +00:00
Matthew Hodgson
8fea4c27cb
fix NPE
2017-02-07 22:00:56 +00:00
Richard van der Hoff
b080e5797b
Merge remote-tracking branch 'origin/master' into develop
2017-02-07 21:46:08 +00:00
Richard van der Hoff
f629b2f631
CONTRIBUTING: s/vector/riot/
2017-02-07 21:45:34 +00:00
Richard van der Hoff
c4ee47aa15
Merge branch 'master' into develop
2017-02-07 21:40:18 +00:00
Richard van der Hoff
0c7c31e3bb
Merge branch 'master' into rav/issue_template
2017-02-07 21:29:35 +00:00
