OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,938 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

2938 Commits (ae145ff32e04cd760f107d459921a36b5d2767c0)

Author SHA1 Message Date
Matthew Hodgson ae145ff32e oops, fix #3270 properly 2017-02-27 22:25:22 +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
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
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