12880 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	28b8ccfdb1	Merge pull request #2445 from matrix-org/develop ... Develop->Experimental	2019-01-15 14:35:53 -07:00
Travis Ralston	66a6f9d322	Merge pull request #2438 from Half-Shot/hs/trim-back-lines ... Limit line length in the room directory	2019-01-15 12:01:58 -07:00
Travis Ralston	731e05cc5d	Merge pull request #2444 from matrix-org/develop ... Develop->Experimental	2019-01-15 10:39:34 -07:00
Travis Ralston	ee65332eb3	Merge pull request #2443 from matrix-org/travis/fix-settings ... Fix setting label for unknown invites	2019-01-15 10:24:56 -07:00
J. Ryan Stinnett	4b13774585	Revert to avatar only when custom status disabled ... This returns to the previous behavior of avatar only without a button when the custom status feature is disabled so that you don't get pointer cursor for something that does nothing when clicked. The avatar ring spacing is kept consistent with and without the feature enabled by using a different class in CSS.	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	632bbde598	Remove usused setting value from CustomStatusController	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	d8de607edc	Update RoomTile on status change	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	77cee8e67e	Update MemberTile on status change	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	443198c180	Fix lints in MemberTile.js	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	233288475e	Use status events for avatar ring ... Similar to changes in `StatusMessageContextMenu`, this changes to using the new status message event emitted in js-sdk to simplify state handling for the avatar ring when a status is present.	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	5b88b64950	Rework custom status context menu ... This updates the custom status context menu to match the latest comps. A single button is used for setting / clearing, depending on what is appropriate. The state logic is also changed to depend on events and storage from js-sdk for the committed status message. This makes it easy to distinguish the value being edited from what's currently committed.	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	fc3055f541	Tweak custom status menu size and placement	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	6597e977c8	Update context menu styling to match custom status comps	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	eae1e4c9aa	Tweak custom status avatar ring ... Adjusts the appearance of the avatar ring to match the latest comps. In addition, we now always render the surrounding button element, which simplifies styling since the same size is now occupied both with and without the feature. This improves alignment between text in the composer and text in the message history (https://github.com/vector-im/riot-web/issues/8111).	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	7d6b996952	Tweak composer button padding so it won't affect status	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	c76b273fae	Update RoomTiles on custom status change	2019-01-15 10:54:29 -06:00
J. Ryan Stinnett	e08c70b820	Prune unsupported setting RoomSubList.showEmpty ... The code reading this setting was previously removed in #2229.	2019-01-15 10:54:29 -06:00
Travis Ralston	6f62158f94	Fix setting label for unknown invites ... Fixes https://github.com/vector-im/riot-web/issues/8126	2019-01-15 09:52:06 -07:00
Matthew Hodgson	ef78036a72	fix vector-im/riot-web#8105	2019-01-15 14:40:58 +00:00
Travis Ralston	177d9f245a	Merge pull request #2441 from matrix-org/develop ... Merge develop -> experimental	2019-01-14 14:45:20 -07:00
Travis Ralston	a3240358f1	Merge pull request #2434 from matrix-org/travis/invite-better ... Give a route for retrying invites for users which may not exist	2019-01-14 07:52:08 -07:00
Will Hunt	cb5ad8d6f9	Limit the length of topics and names in the RoomDirectory	2019-01-13 14:47:08 +00:00
Travis Ralston	a05c0f9214	Rephrase everything to be "invite anyways" rather than "retry" ... Also handle profile errors better	2019-01-11 15:46:03 -07:00
David Baker	2a20d9d67e	Merge pull request #2435 from matrix-org/dbkr/dialog_trusted_new_backup ... Different dialog for new trusted backup	2019-01-11 18:55:17 +00:00
David Baker	c650ace0c0	This shouldn't be required	2019-01-11 18:39:16 +00:00
David Baker	702c881008	Merge pull request #2436 from matrix-org/dbkr/lint_autocompleter ... De-lint a few more files	2019-01-11 14:18:41 +00:00
David Baker	77efa0881e	Gah, onjects	2019-01-11 14:09:29 +00:00
David Baker	fe4778b28b	De-lint a few more files ... & remove them from the ignored list	2019-01-11 13:54:11 +00:00
David Baker	5c9d41d96b	Lint	2019-01-11 13:42:40 +00:00
David Baker	d87d00e4ae	Different dialog for new trusted backup ... Split the 'new recovery method' into two cases: one where the new recovery method isn't trusted and you need to verify the device, and another where it is and the client is using it (where it's more of an FYI). https://github.com/vector-im/riot-web/issues/8069	2019-01-11 13:15:09 +00:00
David Baker	e0bc0494fa	Merge pull request #2433 from matrix-org/travis/rver/7992 ... Recalculate the visible rooms when rooms are upgraded	2019-01-11 10:37:32 +00:00
David Baker	93cf281ff9	Merge pull request #2432 from matrix-org/travis/rver/7998 ... Navigate to the upgraded room's create event where possible	2019-01-11 10:35:30 +00:00
David Baker	531822394d	Merge pull request #2429 from matrix-org/travis/rver/8076 ... Don't show rooms with tombstones in the address picker	2019-01-11 10:33:53 +00:00
David Baker	14fe43f74c	Merge pull request #2427 from jryans/recovery-method-removed ... Add separate dialog for recovery method removed	2019-01-11 10:27:17 +00:00
Travis Ralston	c351ee3d30	Appease the linter	2019-01-10 21:54:07 -07:00
Travis Ralston	5333114d7b	Give a route for retrying invites for users which may not exist ... Fixes https://github.com/vector-im/riot-web/issues/7922 This supports the current style of errors (M_NOT_FOUND) as well as the errors presented by MSC1797: https://github.com/matrix-org/matrix-doc/pull/1797	2019-01-10 21:43:21 -07:00
Travis Ralston	33eef6f5ac	Merge pull request #2428 from matrix-org/travis/rver/7991 ... Set which servers to try and join upgraded rooms through	2019-01-10 16:28:11 -07:00
Travis Ralston	a9aede9be7	Merge pull request #2430 from matrix-org/travis/rver/7997 ... Render a tile for tombstone events	2019-01-10 15:44:51 -07:00
Travis Ralston	7d4b6add2c	Recalculate the visible rooms when rooms are upgraded ... We also do this when they are created just in case we missed the tombstone event. Fixes https://github.com/vector-im/riot-web/issues/7992	2019-01-10 15:43:22 -07:00
Travis Ralston	a15ff8c0dd	Merge pull request #2431 from matrix-org/travis/regen-en ... Regenerate en_EN.json to sort entries	2019-01-10 15:36:28 -07:00
Travis Ralston	b09219fe33	Navigate to the upgraded room's create event where possible ... Fixes https://github.com/vector-im/riot-web/issues/7998	2019-01-10 15:29:12 -07:00
Travis Ralston	a5fceefc63	Regenerate en_EN.json to sort entries	2019-01-10 15:17:20 -07:00
Travis Ralston	e24d3cd671	Render a tile for tombstone events ... Fixes https://github.com/vector-im/riot-web/issues/7997 This isn't super elegant, but it also provides some amount of utility for people. As users might leave the old room, it might be useful to see when exactly a room was upgraded. We should fix the underlying cause for infinite back pagination though.	2019-01-10 15:15:45 -07:00
Travis Ralston	18ba5f6f19	Don't show rooms with tombstones in the address picker ... Fixes https://github.com/vector-im/riot-web/issues/8076	2019-01-10 14:44:19 -07:00
Travis Ralston	cec9c908fc	Set which servers to try and join upgraded rooms through ... Fixes https://github.com/vector-im/riot-web/issues/7991	2019-01-10 14:33:46 -07:00
J. Ryan Stinnett	35af3fc6f7	Add separate dialog for recovery method removed ... The "New Recovery Method" dialog would show if either the recovery method had been changed or removed, but the dialog text didn't make much sense for the removed case. This adds a separate dialog customized for the removed case. Fixes https://github.com/vector-im/riot-web/issues/8046.	2019-01-10 15:18:57 -06:00
David Baker	e9226cdff8	Merge pull request #2426 from matrix-org/dbkr/backup_passphrase_debounce ... Key backup: Debounce passphrase feedback	2019-01-10 18:34:08 +00:00
David Baker	a691c0492a	Merge pull request #2425 from matrix-org/dbkr/createbackup_niggles_2 ... Set backup niggles: 2	2019-01-10 18:34:01 +00:00
David Baker	fc346b2766	Merge pull request #2423 from matrix-org/dbkr/lint_messagecomposerinput ... Fix lint errors in MessageComposerInput	2019-01-10 18:33:52 +00:00
David Baker	b7252a0db9	Rephrase comment to make more sense	2019-01-10 18:13:04 +00:00