Commit Graph

2960 Commits

Author SHA1 Message Date
Richard van der Hoff
75097471b6 Merge pull request #3227 from vector-im/dbkr/add_unban_button
CSS for un-ban button in RoomSettings
2017-02-17 12:46:13 +00:00
David Baker
8224d7fc60 Oops - remove empty CSS selector 2017-02-16 15:14:53 +00:00
Luke Barnard
f2654616eb Merge pull request #3239 from vector-im/luke/css-remove-avatar-initial-z-index
Remove z-index property on avatar initials
2017-02-16 13:45:45 +00:00
Luke Barnard
fc0e460222 Remove z-index property on avatar initials
This seemingly doesn't do anything and upsets things when avatars overlap (i.e. for the new typing avatars).

See https://github.com/matrix-org/matrix-react-sdk/pull/699
2017-02-16 11:42:32 +00:00
Luke Barnard
827692b9b0 Merge pull request #3233 from vector-im/luke/css-status-bar-icon-positioning
Reposition certain icons in the status bar
2017-02-15 15:56:41 +00:00
Luke Barnard
bfad7612c6 Re-position certain icons in the status bar
Also, make sure the typing avatars line up with the arrow to jump to the bottom of the timeline.
Also, get rid of any height jumps when a call starts. border 1px hidden does not add any height to an element, it is effectively the same as none.
2017-02-15 15:45:24 +00:00
David Baker
f1f54c95ab Copyright 2017-02-14 18:11:36 +00:00
David Baker
5ecf560675 CSS for un-ban button in RoomSettings 2017-02-14 17:56:42 +00:00
David Baker
b9dd419d04 Merge pull request #3224 from vector-im/dbkr/confirm_ban
CSS for kick/ban confirmation dialog
2017-02-14 17:31:44 +00:00
David Baker
324e596e28 CSS for kick/ban confirmation dialog 2017-02-14 13:42:06 +00:00
David Baker
1bc9ba46c7 Merge pull request #3217 from vector-im/dbkr/interactive_auth_nondialog
Style for split-out interactive auth
2017-02-14 10:55:01 +00:00
David Baker
c6ccfa0616 Copyright 2017-02-13 16:15:27 +00:00
David Baker
9e2793dfed Style for split-out interactive auth
For https://github.com/matrix-org/matrix-react-sdk/pull/691
2017-02-13 16:10:43 +00:00
Matthew Hodgson
6a7daaf6c4 remove GA, given it's increasingly useless given Riot/Desktop doesn't use it, plus it obviously has privacy implications. It may get re-added as opt-in in future, so we're not sailing entirely blind on how folks use the app, or we may switch to Piwik etc instead. 2017-02-10 17:21:02 +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
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
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
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
f6b6673a41 fix selection text colour in dark theme 2017-02-09 01:20:30 +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
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
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
5b239adfb8 Fix bug with home icon not appearing when logged in as team member 2017-02-07 14:58:25 +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
Kegan Dougal
678eccf33d Store bug reports in separate directories 2017-02-06 16:18:08 +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