4068 commits

Author	SHA1	Message	Date
David Baker	c45ffb6733	Merge pull request #2422 from matrix-org/dbkr/eslint_async_space ... Add spaces back to async arrow functions	2019-01-10 09:35:58 +00:00
David Baker	b9719abbc2	Oops, missed some asyncs	2019-01-09 19:36:34 +00:00
David Baker	f269b5fbbc	Fix spaceless async in ignored files too	2019-01-09 19:14:30 +00:00
David Baker	8e4d8ccca7	Add spaces back to async arrow functions ... As per https://github.com/matrix-org/matrix-js-sdk/pull/821 Requires https://github.com/matrix-org/matrix-js-sdk/pull/821	2019-01-09 18:10:35 +00:00
J. Ryan Stinnett	365a7273d8	Move initial key backup to background ... Since the initial key backup can take several minutes for some users, this moves the upload step to the background. The create key backup flow now only marks all sessions for backup synchronously, with the actual backup happening later. The key backup panel in Settings gains a new row to show a summary of upload status. Users are directed there if they wish to know if the backup is done. The text in various related dialogs has also been tweaked to fit the new flow.	2019-01-09 12:04:17 -06:00
J. Ryan Stinnett	731f9ee7df	Display key backup upload progress in Settings ... This adds a summary of the keys currently waiting for backup, which may be useful for following a large upload as it progresses.	2019-01-09 12:04:17 -06:00
J. Ryan Stinnett	7dbc970347	Mark KeyBackupPanel as a pure component ... KeyBackupPanel depends only on its own state and its children are pure, so it can be pure as well. This avoids some unnecessary re-renders.	2019-01-09 12:04:17 -06:00
Bruno Windels	ece5cb1fcc	Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental ... Tiled room UI	2019-01-09 17:25:08 +00:00
Bruno Windels	254427461d	fix PR feedback	2019-01-09 12:48:13 +01:00
J. Ryan Stinnett	02a83a7c2b	Use per-message string substitutions in key backup panel ... Including unused substitutions triggers console logs, so change the key backup panel to only substitute what's actually used in each message. Fixes https://github.com/vector-im/riot-web/issues/8047.	2019-01-08 09:31:33 -06:00
Bruno Windels	9e67dbf008	change icon	2019-01-08 14:35:26 +01:00
Bruno Windels	52c5610660	update copy	2019-01-08 14:35:06 +01:00
Bruno Windels	56726ba8e5	fix lint	2019-01-08 12:10:42 +01:00
Bruno Windels	7227049c2a	add right panel toggle button to room header when in grid	2019-01-08 12:05:39 +01:00
J. Ryan Stinnett	bf87547f88	Remove unexpected underline from pills ... Fixes vector-im/riot-web#8031.	2019-01-07 09:56:40 -06:00
Bruno Windels	c6952ba5b6	fix some more lint warnings, as limit is 16 now	2019-01-07 16:56:35 +01:00
Bruno Windels	c2f6fc381c	add feature flag for grid view	2019-01-07 16:13:35 +01:00
Bruno Windels	290dc9d8fb	Merge branch 'experimental' into bwindels/roomgridview-experimental	2019-01-07 14:17:57 +01:00
David Baker	8fbb0607ff	Re-write as full class component ... So we can re-use the functions we pass to props	2019-01-07 12:09:19 +00:00
David Baker	522dddbd13	Lint	2019-01-07 10:13:02 +00:00
David Baker	47f303dc9d	Make logout warning nag about key backups ... https://github.com/vector-im/riot-web/issues/7805	2019-01-07 10:08:57 +00:00
Travis Ralston	5a2113e1a9	Fix a comparison bug in ordering the MemberList	2019-01-03 21:56:19 -07:00
Travis Ralston	77dfba8a22	Add unit tests for MemberList ... Particularly the ordering of the tiles.	2019-01-03 21:55:52 -07:00
Travis Ralston	cc8fa7911b	Merge remote-tracking branch 'origin/experimental' into travis/fix-memberlist-order	2019-01-03 20:01:28 -07:00
J. Ryan Stinnett	920911c0a1	Room list fixes for custom status	2019-01-03 18:49:15 -06:00
Travis Ralston	1481dcf9d7	Don't re-sort the room list if the user is hovering over it ... Fixes vector-im/riot-web#5624	2019-01-03 16:27:59 -07:00
Travis Ralston	8017f0a4a1	Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real	2019-01-03 16:00:23 -07:00
Travis Ralston	6447a60e1f	Revert "Merge pull request #2336 from matrix-org/travis/notif-button" ... This reverts commit 96300b45b7.	2019-01-03 15:44:07 -07:00
David Baker	f928be6f59	Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" ... This reverts commit ad47144355.	2019-01-03 15:37:03 -07:00
Travis Ralston	d111fe27bb	Revert "Merge pull request #2396 from matrix-org/travis/room-list-hover" ... This reverts commit 5098b28672.	2019-01-03 15:36:56 -07:00
Travis Ralston	223a49d81f	Don't re-sort the room list if the user is hovering over it ... Fixes vector-im/riot-web#5624	2019-01-03 13:57:20 -07:00
Travis Ralston	95844ebf9d	Comment out debugging statements ... They are useful to have around, but not to have enabled all the time.	2019-01-03 12:15:27 -07:00
Travis Ralston	63a7b86eac	Flatten and simplify the memberlist sorting algorithm ... The previous algorithm had a bug where it was getting stuck on the power level comparison, leaving the memberlist incorrectly ordered. The new algorithm uses less branching to try and walk through the different cases instead. Additionally, the steps used to determine the order have changed slightly to better represent an active member list. This commit also includes changes to try and re-sort the member list more often during presence changes. Events are not always emitted, however. This may be a js-sdk bug but appears to happen prior to these changes as well. Fixes https://github.com/vector-im/riot-web/issues/6953	2019-01-03 12:15:19 -07:00
David Baker	982e037822	Fix merge	2019-01-03 18:05:38 +00:00
David Baker	7d161de35b	Partial merge of develop to experimental ... Does not include #2336 as the file has been moved out from underneath it: will do this separately	2019-01-03 15:02:58 +00:00
David Baker	c11d0bdf0c	Merge pull request #2394 from jryans/key-backup-unverified-creator ... Show in-room reminder when key backup creating device unverified	2019-01-03 10:27:35 +00:00
J. Ryan Stinnett	758e867208	Merge pull request #2389 from christopherjmedlin/consistent-flair-ordering ... Consistent flair ordering.	2019-01-02 16:35:50 -06:00
J. Ryan Stinnett	402f58225f	Show in-room reminder when key backup creating device unverified ... If the current device hasn't verified the device that created the account's current key backup version, then the current device is won't use the key backup. This change adjusts an existing in-room reminder to do the right thing for this case by allowing the user to verify the device that created the key backup. Fixes vector-im/riot-web#7902.	2019-01-02 15:36:40 -06:00
Christopher Medlin	384320e29f	Consistently order flairs based on room configuration.	2018-12-24 14:46:36 -08:00
Travis Ralston	f5ff580e35	Add some logging for riot-web#7838 ... See https://github.com/vector-im/riot-web/issues/7838	2018-12-21 14:51:05 -07:00
Travis Ralston	2e1e536d5c	Merge pull request #2347 from matrix-org/travis/custom-status ... Custom status messages	2018-12-19 11:11:15 -07:00
J. Ryan Stinnett	fd94dc686f	Handle errors when fetching commits for changelog ... It's possible to get errors when fetching commits (for example, if the rate limit is exceeded), so this will handle the error case and display it instead of an infinite spinner. Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>	2018-12-19 18:10:21 +00:00
Travis Ralston	a1347add95	Merge branch 'develop' into travis/custom-status	2018-12-19 10:33:34 -07:00
Travis Ralston	45f05092ed	Add a comment to describe why we're not using the property we should be	2018-12-19 10:21:43 -07:00
Bruno Windels	b3a12867a6	remove extra blank lines	2018-12-19 12:56:08 +01:00
Bruno Windels	b826b0d998	Add redesign feedback dialog + button in tag panel	2018-12-19 12:27:05 +01:00
David Baker	1ca91370f3	Merge pull request #2372 from matrix-org/dbkr/electron_sandbox ... React-sdk changes to support sandboxed electron	2018-12-19 09:48:05 +00:00
Travis Ralston	04c9fff6ce	Add a feature flag for custom status messages	2018-12-18 15:11:08 -07:00
Travis Ralston	d20a934642	Appease the linter	2018-12-18 11:04:16 -07:00
David Baker	3a8b9ab850	unused import	2018-12-18 17:57:23 +00:00