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 |
|
Richard van der Hoff
|
0442258865
|
More issue_template tweaks
Encourage rageshaking
don't insist on version for the web app
|
2017-02-07 21:25:58 +00:00 |
|
Richard van der Hoff
|
95f529f9a4
|
Tweak ISSUE_TEMPLATE
|
2017-02-07 20:35:14 +00:00 |
|
David Baker
|
be71da5657
|
Merge pull request #3150 from vector-im/kegan/dir-per-bug
Store bug reports in separate directories
|
2017-02-07 16:18:00 +00:00 |
|
Kegan Dougal
|
f16bb85f9b
|
Review comments
|
2017-02-07 16:04:06 +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 |
|
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
|
af19ea8bb7
|
Document login API
|
2017-02-07 12:01:44 +00:00 |
|
David Baker
|
2f54034afe
|
Merge pull request #3103 from vector-im/luke/rts-welcome-pages
RTS Welcome Pages
|
2017-02-07 11:52:59 +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 |
|
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 |
|
Kegan Dougal
|
678eccf33d
|
Store bug reports in separate directories
|
2017-02-06 16:18:08 +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 |
|
Kegsay
|
1f0b4853be
|
Merge pull request #3149 from vector-im/kegan/go-stds
rageshake: Abide by Go standards
|
2017-02-06 15:40:58 +00:00 |
|
Kegan Dougal
|
db31f0a087
|
Host API under /api. Use filepath.Join rather than string concatenation
|
2017-02-06 15:31:53 +00:00 |
|
Kegan Dougal
|
d4247e0179
|
Dump to bugs subdirectory
|
2017-02-06 14:56:06 +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
|
af765c7522
|
Merge branch 'master' into develop
(Keep react-sdk and js-sdk on develop)
|
2017-02-04 11:04:25 +00:00 |
|