Luke Barnard
307c4f3dd1
Increase the max-height of the expanded status bar
...
This will ensure that errors, unsent messages, etc. will be allowed enough height to display their contents from within the status bar without being chopped.
Fixes #3041
2017-01-24 14:02:44 +00:00
David Baker
536167a6c8
Merge pull request #3040 from vector-im/rav/fix_test_fail
...
Hopefully, fix intermittent test failure
2017-01-24 13:48:01 +00:00
Richard van der Hoff
fe64b04339
More test resilience
...
Give the tests more than one chance for the roomview to load.
2017-01-24 13:35:41 +00:00
David Baker
31878d8a44
Also need eslint-config-google
2017-01-24 13:07:34 +00:00
Richard van der Hoff
597705716b
Hopefully, fix intermittent test failure
...
This seeks to fix the intermittent failure of the "MatrixClient rehydrated from
stored credentials" tests.
The problem appears to be that the 'load_completed' is sometimes taking a while
to come through from the dispatcher - or rather, it is taking a long time to
get *sent* to the dispatcher: the chain of `q().then().catch().done()` in
componentDidMount can take a while to happen.
As a workaround, give the test a few goes when waiting for us to start
syncing. It's not ideal to be poking into the internal state of MatrixChat like
this, but it'll do for now.
2017-01-24 11:26:09 +00:00
David Baker
6db5329d9c
Merge pull request #2971 from vector-im/dbkr/add_searching_known_users
...
CSS for 'searching known users'
2017-01-24 10:51:13 +00:00
Luke Barnard
ea82b90d35
Merge pull request #2981 from vector-im/luke/feature-animated-status-bar
...
Animate status bar max-height and margin-top
2017-01-23 23:08:23 +00:00
Matthew Hodgson
706ffbec3c
add riot logos
2017-01-23 19:01:35 +01:00
David Baker
4c3ea13413
Make jenkins run the linter
2017-01-23 15:42:50 +00:00
Richard van der Hoff
c31b65d093
Merge pull request #3032 from vector-im/dbkr/add_eslint_config
...
Add eslint config
2017-01-23 14:57:39 +00:00
David Baker
bc714ba3a0
Add eslint config
...
An early start that gets some linting in place.
2017-01-23 14:22:54 +00:00
Luke Barnard
b7204bf868
Use primary bg color on statusArea
2017-01-23 13:33:39 +00:00
Luke Barnard
c4d246cd72
Merge branch 'develop' into luke/feature-animated-status-bar
2017-01-23 13:31:48 +00:00
Luke Barnard
b582cf0a5f
Remove CSS for StatusBar mid-timeline
2017-01-23 13:30:39 +00:00
David Baker
f025afc297
Merge pull request #3030 from vector-im/luke/fix-typing-avatars-alignment
...
Re-position typing avatars relative to "is typing"
2017-01-23 12:44:47 +00:00
Luke Barnard
57126efe86
Reposition typing avatars relative to "is typing"
2017-01-23 10:24:23 +00:00
Matthew Hodgson
d907421ad4
crappy CSS for UnknownDeviceDialog
2017-01-22 01:25:32 +01:00
Matthew Hodgson
ef519231d6
fix mute button colors
2017-01-20 21:16:58 +00:00
Matthew Hodgson
83272f5cc5
fix badge color again
2017-01-20 21:11:28 +00:00
Matthew Hodgson
5b1fea46cb
fix badge color
2017-01-20 21:09:49 +00:00
Matthew Hodgson
a9c575b4d0
fix a bunch of dark-theme buttons
2017-01-20 21:00:33 +00:00
Luke Barnard
a24b568b73
Merge pull request #2998 from vector-im/luke/css-typing-avatars
...
CSS for avatars that appear when users are typing
2017-01-20 17:43:36 +01:00
lukebarnard
afcf9de8d4
Handle avatars with initials
2017-01-20 17:35:01 +01:00
lukebarnard
9ffedf5e7d
space after colons
2017-01-20 17:00:59 +01:00
lukebarnard
956deca844
Add bg-color border to typing avatars
2017-01-20 16:59:41 +01:00
Richard van der Hoff
01d4846526
Merge pull request #3001 from vector-im/dbkr/carlos22_desktop_wmclass
...
Add StartupWMClass
2017-01-20 10:38:52 +00:00
Matthew Hodgson
9b70e2e25f
fix RTE bg color
2017-01-20 02:34:45 +00:00
Matthew Hodgson
4d8f5d4df1
change selection color & fix MD bg
2017-01-20 02:29:56 +00:00
Matthew Hodgson
fa535996ae
fix textarea bg
2017-01-20 02:22:11 +00:00
Matthew Hodgson
17e215036d
Merge pull request #3002 from vector-im/rav/fix_eventmenu_icon
...
Fix link to image for event options menu
2017-01-19 18:48:52 +00:00
Richard van der Hoff
8ad0ff24f8
Fix link to image for event options menu
...
This has to be relative, because we don't know if riot is going to be mounted
at the top-level of the domain or not (it's not, on riot.im).
Links are relative to the final location of the CSS, which is under
bundles/<hash>, so need ../..
2017-01-19 18:35:43 +00:00
Richard van der Hoff
693285ac0e
Merge pull request #2999 from vector-im/dbkr/carlos22_single_instance
...
Make riot desktop single instance
2017-01-19 18:04:09 +00:00
Richard van der Hoff
36450764f3
rethemendex fixes
...
- set cwd before doing cwd-specific operations
- don't include 'themes' directory, otherwise it's a bit circular.
2017-01-19 17:02:57 +00:00
David Baker
f5d7f3ca9f
Add StartupWMClass
...
so GNOME doesn't get confused by the hidden windows
2017-01-19 16:21:43 +00:00
Richard van der Hoff
16bb75be66
Merge pull request #2997 from vector-im/dbkr/carlos22_electron_tray
...
Add electron tray icon
2017-01-19 16:04:12 +00:00
David Baker
537194608e
Make riot desktop single instance
...
So launching a new instance will focus the old one, meaning that
if you have Riot minimised to the tray and launch it via the
desktop shortcut / start menu, you don't end up with more & more
copies of the app.
This doesn't really prevent you from running multiple copies of
the app to fake multi account support since they share a data
directory anyway.
2017-01-19 16:01:37 +00:00
lukebarnard
789c7b60cc
CSS for avatars that appear when users are typing
2017-01-19 16:51:41 +01:00
Richard van der Hoff
61c5253dbf
Give the 'Light' theme link a title too
...
... mostly to make it appear on the Firefox style menu.
2017-01-19 15:41:58 +00:00
David Baker
d11bcdad5f
Add electron tray icon
...
From https://github.com/vector-im/riot-web/pull/2960
Makes riot minimise to the tray on windows / linux.
2017-01-19 14:29:07 +00:00
Richard van der Hoff
686a3c693a
Merge pull request #2994 from vector-im/dbkr/carlos22_notif_fixes
...
Fixes to electron desktop notifs
2017-01-19 14:03:02 +00:00
David Baker
bee4ca2b28
Fixes to electron desktop notifs
...
Merge the notification part of https://github.com/vector-im/riot-web/pull/2960
* Show and focus the window when the notification is clicked,
rather than just restoring it.
* Implement requestNotificationPermission and return a resolved
promise (although in practice it should never be called)
2017-01-19 13:25:56 +00:00
David Baker
231adbcd31
Add copyright header
2017-01-19 13:02:08 +00:00
lukebarnard
6b1d138918
Make scrolling to bottom whilst expanded seem less weird inertially
2017-01-19 12:45:26 +01:00
Richard van der Hoff
5978aff632
Merge pull request #2975 from vector-im/dbkr/auto_hide_menu_bar
...
Auto-hide the electron menu bar
2017-01-19 11:44:36 +00:00
David Baker
92096c40ac
Merge pull request #2987 from vector-im/rav/karma_tweaks
...
A couple of tweaks to the karma config
2017-01-19 11:40:02 +00:00
David Baker
6c4bf58ba5
Merge pull request #2974 from vector-im/rav/deploy_script
...
Deploy script
2017-01-19 11:32:46 +00:00
David Baker
5f8170f4cd
Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users
2017-01-19 11:12:49 +00:00
lukebarnard
e08f97a549
Reduce animation time to 200ms
2017-01-19 11:52:15 +01:00
Richard van der Hoff
971314d75a
Merge pull request #2990 from vector-im/rav/postcss-webpack-loader
...
Use the postcss-webpack-loader
2017-01-19 03:01:53 +00:00
Richard van der Hoff
c3fa6ff805
Use the postcss-webpack-loader
...
Use postcss-webpack-loader instead of webpack-cli to process the scss. Doing so
mostly means that we avoid the problem that webpack-dev-server fails to start
if we haven't already built the CSS. (It also simplifies package.json somewhat,
which is no bad thing)
2017-01-19 02:48:17 +00:00
