Commit Graph

2958 Commits (23422fdb862e3c8eefd59bec30a23e35e9edcf88)

Author SHA1 Message Date
David Baker 23422fdb86 Merge pull request #3379 from vector-im/luke/css-visible-redactions
CSS for redacted EventTiles
2017-03-09 10:09:31 +00:00
Luke Barnard 6a1118218b Merge pull request #3340 from vector-im/luke/css-rts-fix-welcome-pages-safari
Height:100% for welcome pages on Safari
2017-03-08 17:07:53 +00:00
Luke Barnard 08852c6174 Merge pull request #3376 from vector-im/luke/refactor-room-tile
`view_room` dispatch from `onClick` RoomTile
2017-03-07 16:20:31 +00:00
Luke Barnard 2bf96d4887 Merge pull request #3350 from vector-im/luke/css-statusbar-v-balance
Hide statusAreaBox_line entirely when inCall
2017-03-07 13:29:56 +00:00
Luke Barnard 9d96baa613 Alter comments on height: auto
Having tested Riot with the middlePanel having a height of 100%, it seems to be OK.
2017-03-07 10:22:45 +00:00
Luke Barnard a7db42d184 CSS for redacted EventTiles 2017-03-07 09:21:50 +00:00
Luke Barnard 3d67234372 `view_room` dispatch from `onClick` RoomTile
So that RoomTile does less, and if other things should happen onClick, they happen in the same place as the `view_room` for clarity.
2017-03-06 17:55:12 +00:00
Luke Barnard b1f14ba979 Merge pull request #3351 from vector-im/luke/css-spinner-height
Set padding-bottom: 0px for .mx_Dialog spinner
2017-03-03 18:01:08 +00:00
Luke Barnard a1462946cd `padding: 0px` 2017-03-03 13:54:26 +00:00
David Baker ae27667f48 Merge pull request #3333 from vector-im/dbkr/register_ui_auth
Support InteractiveAuth based registration
2017-03-03 13:37:46 +00:00
David Baker c6da4d93f1 Merge pull request #3334 from turt2live/travis/notifs
Expose notification option for username/MXID
2017-03-02 18:26:53 +00:00
Luke Barnard 024fea0687 Set padding-bottom: 0px for .mx_Dialog spinner
This was causing https://github.com/vector-im/riot-web/issues/3226
2017-03-02 17:39:02 +00:00
Luke Barnard cfbcffac5a Hide statusAreaBox_line entirely when inCall
This is to keep things vertically balanced.

Fixes https://github.com/vector-im/riot-web/issues/3269
2017-03-02 16:57:52 +00:00
Luke Barnard 640c486bde Merge pull request #3190 from vector-im/luke/mels-toggle-scss
Float the toggle in the top right of MELS
2017-03-02 15:19:57 +00:00
Luke Barnard 66e93c8a8c Fix for vector-im/riot-web#3298 - height:100% for welcome pages on Safari 2017-03-01 10:04:48 +00:00
Matthew Hodgson 8a7ec27dc7 fix whitespace in urlpreview title 2017-02-28 00:16:43 +00:00
turt2live 9afbe8e3fc Change wording in notification description 2017-02-27 15:47:21 -07:00
turt2live 9b42fbe42f Expose notification option for username/MXID
For those unfortunate people that get pinged constantly.
2017-02-27 15:32:58 -07:00
Matthew Hodgson ae145ff32e oops, fix #3270 properly 2017-02-27 22:25:22 +00:00
David Baker a8e99109b1 Support InteractiveAuth based registration
Passes in a function to make a register URL rather than just
passing in the URL base
2017-02-24 11:45:28 +00:00
Richard van der Hoff bb4d8ee3e8 Merge pull request #3311 from vector-im/rav/rageshake_culling
More aggressive rageshake log culling
2017-02-23 14:38:36 +00:00
Richard van der Hoff 038f5767f2 Add a comment 2017-02-23 14:37:46 +00:00
Richard van der Hoff e2cec7b69c More aggressive rageshake log culling
Also bump the client-side timeout on the upload from 3 mins to 5 mins, to see
if it helps people on slower connections.
2017-02-23 14:22:03 +00:00
Matthew Hodgson 6690df1203 Merge pull request #3282 from Half-Shot/develop
Don't overflow directory network options
2017-02-22 01:13:14 +00:00
Aviral Dasgupta c21cdf5b02
add .editorconfig
Signed-off-by: Aviral Dasgupta <me@aviraldg.com>
2017-02-21 23:38:03 +05:30
Will Hunt 37f320c4a4 Don't overflow directory network options 2017-02-21 12:25:29 +00:00
David Baker feb8115d24 Desktop instructions: `npm run build`, not dist
Clarify that you only need to run build rather than dist to run
the electron app.

Hopefully satisfies: https://github.com/vector-im/riot-web/pull/3237
2017-02-20 10:32:14 +00:00
Richard van der Hoff 5c87b8045a Merge remote-tracking branch 'origin/master' into develop 2017-02-20 09:14:22 +00:00
Richard van der Hoff d8c877fe6e Update ISSUE_TEMPLATE.md 2017-02-20 09:14:01 +00:00
Matthew Hodgson 67a7ed1e34 fix spacing of permalinks to info events 2017-02-20 01:49:11 +02:00
Matthew Hodgson eabe4f5c29 hopefully fix https://github.com/vector-im/riot-web/issues/3270 2017-02-20 01:48:10 +02:00
Matthew Hodgson f91f5cb65e fix RTE dark theme 2017-02-20 01:27:05 +02:00
Matthew Hodgson 5951e8fb27 don't try to darktheme scalar for now 2017-02-20 01:18:48 +02:00
Matthew Hodgson be79ccccf6 fix dark theme room join bar 2017-02-20 01:15:54 +02:00
Matthew Hodgson aba121aab0 fix cursor 2017-02-19 04:13:29 +02:00
Matthew Hodgson c146ddf29b turn on rageshake for desktop 2017-02-18 23:59:45 +02:00
Matthew Hodgson 5469270e41 spell out where the PGP key lives for releases 2017-02-18 23:48:58 +02:00
Matthew Hodgson 457b64037d renormalise ringtone to 66% amplitude 2017-02-18 23:04:38 +02:00
David Baker a0f572c26e Don't hardcode home dir in jenkins script 2017-02-17 19:18:58 +00:00
David Baker f51669664c Merge pull request #3250 from vector-im/dbkr/support_kick_ban_reasons
CSS for ban / kick reason prompt
2017-02-17 17:39:38 +00:00
David Baker 75f2ba6b19 CSS for ban / kick reason prompt
For https://github.com/matrix-org/matrix-react-sdk/pull/710
2017-02-17 17:29:57 +00:00
David Baker e8d5e8c8ab Merge pull request #3246 from vector-im/dbkr/allow_forget_ban
Allow forgetting rooms you're banned from
2017-02-17 16:36:19 +00:00
David Baker 6aa5266029 Merge remote-tracking branch 'origin/develop' into dbkr/allow_forget_ban 2017-02-17 16:19:15 +00:00
David Baker 03dd25624f Allow forgetting rooms you're banned from
From the room tag context menu.

Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
2017-02-17 15:52:07 +00:00
David Baker 0d1c53285b Merge pull request #3245 from vector-im/dbkr/fix_manifest_icon_paths
Fix icon paths in manifest
2017-02-17 15:41:49 +00:00
David Baker aad880b3b5 Fix icon paths in manifest
They are not at the root of the web server, they are at the same
path as the manifest
2017-02-17 15:31:28 +00:00
Kegsay 5c2049935a Merge pull request #3242 from vector-im/kegan/fix-tests-for-indexeddb
Fix broken tests caused by adding IndexedDB support
2017-02-17 14:54:56 +00:00
Kegan Dougal d876e4482b Fix broken tests caused by adding IndexedDB support
This test assumed that `/sync` would be called immediately after rendering
`<MatrixChat />` but this isn't true in an IndexedDB world: it bounces via
`store.startup()` first.

It looks like the tests resolve this by adding `q.delay(1)` so that's what
I've done: in the future it would be better to extend `HttpBackend` to have
a `waitFor(req) Promise` function so we can removing timing from the tests.
2017-02-17 14:32:08 +00:00
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