OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,020 Commits
207 Branches
550 Tags
419 MiB
Commit Graph

3020 Commits (bced608c48f4c60f95a22d165bd543b474581929)

Author SHA1 Message Date
Kegan Dougal 6f3b70dbb0 Use Q promises and isPending to make logic simpler 2017-01-24 12:43:18 +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
Kegan Dougal f3df86872b Fix tightlooping when flush()ing without any logs 
The promise would resolve immediately, nulling out `flushPromise`. This would
then immediately be set from `new Promise((resolve, reject) => {...})` turning
it back into non-null `flushPromise`. The resolve handler was called so the
next `flush()` would see "oh yes, there is a non-null `flushPromise`" then
promptly try to set `flushAgainPromise` which chains off the resolved
`flushPromise` which relied on `flushPromise` being `null`ed out after
`resolve()`, causing the chained `flush()` to see "oh yes, there is a non-null
`flushPromise`" which... ad infinitum.

This PR fixes it by making the nulling out asynchronous but the fact it took
me this long to debug this issue indicates to me that this is a terrible piece
of code. Will re-write.
 2017-01-23 17:37:57 +00: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
Kegan Dougal 2ecf65f057 Keep the logs if no store exists 2017-01-23 09:28:48 +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
Kegan Dougal ea063ab8b0 Address race conditions when flushing logs 2017-01-20 14:46:19 +00:00
Kegan Dougal 378126e746 Add another store to keep last modified times 
This makes it easier to get a list of all the log IDs. It also makes it possible
to order the logs by the *LAST* log line and not the first as was the case
previously, which is important in the case of long-running tabs.
 2017-01-20 14:00:30 +00:00
Kegan Dougal 41c6294be2 Remove clearAll from consume(): we want duplicate logs on multiple reports 2017-01-20 13:02:57 +00:00
Kegan Dougal ba1e166ac8 Line length 80 like we're still in the 80s 2017-01-20 12:02:48 +00:00
Kegan Dougal ea860807c4 Add a monkeyPatch function rather than monkey-patching in the constructor 2017-01-20 11:56:11 +00: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
Kegan Dougal 53a16158c7 Remove logs when submitting bug reports 2017-01-19 17:41:08 +00:00
Kegan Dougal beba4d2ae3 Add version and user agent to bug report 2017-01-19 17:40:21 +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
Kegan Dougal 3996d23b19 Inject bug report endpoint URL from config.json 2017-01-19 16:49:25 +00:00
Kegan Dougal bf887e82fe Swap to async/await rather than promise chains 
Since we do in fact support coroutines!
 2017-01-19 16:40:54 +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
Kegan Dougal 81d437ac1e POST reports to localhost for now. Also send live console logs 2017-01-19 15:47:55 +00: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
Kegan Dougal 608c1b0208 Finish implementing consume() 
- Fetches all logs in order and concatenates correctly.
- Purges old logs correctly.
 2017-01-19 15:03:47 +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