element-web

mirror of https://github.com/element-hq/element-web.git synced 2024-12-18 02:41:45 +03:00

Author	SHA1	Message	Date
Richard Lewis	185379b037	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-09 14:07:45 +01:00
Richard Lewis	4bc25f12cb	Move manage integrations button in to stand-alone component	2017-08-09 11:44:24 +01:00
Luke Barnard	610b2a3a42	For mentions, always use rawDisplayName and remove (IRC)	2017-08-09 10:40:06 +01:00
David Baker	8426ada24c	Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted Show unencrypted messages as unencrypted	2017-08-08 18:11:56 +01:00
Richard van der Hoff	da85cb9f45	Show unencrypted messages as unencrypted Previously, we were special-casing outgoing messages such that they were shown as encrypted even when encryption had failed for some reason. There's no need for this: outgoing messages have a working isEncrypted() method which we can use to show whether the event has been encrypted yet. Arguably we could do better than an open padlock for events in the 'encrypting' send state, but I'm not really sure what.	2017-08-08 17:49:41 +01:00
David Baker	b76b6791b2	Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions Always use message `body` when quoting	2017-08-08 17:47:25 +01:00
Luke Barnard	cb8a66b5a1	When `hide`ing autocomplete, also remove completion state	2017-08-08 17:25:11 +01:00
Luke Barnard	503fa6a7b3	Always use message `body` when quoting (not formatted_body) This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756	2017-08-08 14:59:56 +01:00
David Baker	ca2273519d	Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting Add optional setting for hiding avatars in <Pill>s	2017-08-08 14:01:34 +01:00
Luke Barnard	91a1cc4431	Mandate ctrl/meta ONLY for a subset of key bindings Because by default dratf-js doesn't check that other modifiers are _not_ pressed.	2017-08-08 13:36:43 +01:00
Luke Barnard	b08d32371d	Add optional setting for hiding avatars in <Pill>s As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445	2017-08-08 11:13:29 +01:00
Luke Barnard	7018deee44	Fix ctrl+a, backspace toggling block format Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753	2017-08-07 17:16:42 +01:00
Luke Barnard	641fda0162	Adjust comment	2017-08-07 16:29:22 +01:00
Luke Barnard	d9d8f2055f	Allow default for ctrl+shift+b, ctrl+shift+u in RTE fixes vector-im/riot-web#4750	2017-08-07 16:23:37 +01:00
Richard Lewis	18ae5fd129	Send messages on widget addition and deletion	2017-08-06 11:01:14 +01:00
Richard Lewis	308d932b2f	CancelClick prop.	2017-08-06 10:29:43 +01:00
Richard Lewis	a22e768343	Move room settings button to RoomHeader	2017-08-06 10:01:48 +01:00
Michael Telatynski	c4803c6d89	suppressOnHover for member entity tiles which have no onClick Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-05 13:01:19 +01:00
Richard Lewis	1973b2bbe7	Switch app drawer icons	2017-08-05 00:00:19 +01:00
Luke Barnard	a27eefd893	Fix a couple of more errors due to API changes	2017-08-03 15:20:44 +01:00
Luke Barnard	901cbf495d	Update decorator strategy API in accordance with recent changes to 0.11.0 See `590cdc6c54`, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html	2017-08-03 12:02:29 +01:00
Luke Barnard	1d1cd5f691	Reflect API change for decorator strategy	2017-08-03 11:36:07 +01:00
Luke Barnard	fb5dc295aa	Reflect API change for getting an Entity	2017-08-03 11:29:26 +01:00
Luke Barnard	124795006c	Reflect API change for creating an Entity	2017-08-03 11:18:56 +01:00
Michael Telatynski	e9afcec5b2	fix m.federate=false warning in room settings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 13:42:24 +01:00
Luke Barnard	7fcb8c5ff0	Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace Only auto-replace emoji following ^ or \s	2017-08-01 15:56:42 +01:00
Luke Barnard	438b63bee2	Only auto-replace emoji following ^ or \s So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)	2017-08-01 14:26:30 +01:00
Richard Lewis	abae43b65e	Merge pull request #1257 from matrix-org/rxl881/widgetPermissions Widget permissions	2017-08-01 12:13:09 +01:00
Michael Telatynski	4bdaa15c47	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics	2017-07-28 21:01:59 +01:00
Luke Barnard	8a5f2bf2ca	Interpret a `split-block` as format toggle for an empty block (`split-block` is emitted when "return" is pressed) part of fixing https://github.com/vector-im/riot-web/issues/4580	2017-07-28 14:46:57 +01:00
Richard Lewis	20a1693c71	Only display add app link if user has permission to add widgets in the room.	2017-07-27 23:38:02 +01:00
Luke Barnard	6cb8b12cda	Instead of inserting MD for completion, convert the Entity later This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets. Fixes https://github.com/vector-im/riot-web/issues/4666	2017-07-27 18:17:41 +01:00
Richard Lewis	27923e300c	Add JSX wrapper.	2017-07-27 17:47:04 +01:00
Michael Telatynski	bf98c0da7c	un-i18n Modal Analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:19:18 +01:00
Luke Barnard	5c7891a25b	Remove logs	2017-07-27 15:26:36 +01:00
Luke Barnard	e71df44fc9	Fix /join #alias command in markdown mode Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery). There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.	2017-07-27 15:18:06 +01:00
David Baker	9cb28ff33c	Merge pull request #1248 from matrix-org/luke/fix-rte-auto-scroll Scroll to the bottom of editor if on last line	2017-07-26 16:58:36 +01:00
Luke Barnard	fc00eaf546	Merge branch 'develop' into luke/store-history-as-raw-content	2017-07-25 17:19:35 +01:00
Luke Barnard	1ef2a2bcf9	Merge pull request #1250 from matrix-org/dbkr/fix_truncatedlist_i18n Fix i18n on truncatedlist & friends to be sane	2017-07-25 16:17:44 +01:00
David Baker	fa7a9818c6	Fix i19n on truncatedlist & friends to be sane Use the proper counterpart tool for plurals rather than if > 1. Fix up all the translation files respectively.	2017-07-25 15:59:06 +01:00
Luke Barnard	7e0fecbc8c	Scroll to the bottom of editor if on last line Make the MessageComposerInput scroll to the bottom if we are on the last line of the contents. fixes https://github.com/vector-im/riot-web/issues/4652	2017-07-25 15:22:10 +01:00
Luke Barnard	eccdceae33	Rename `props` to `entityProps` for clarity	2017-07-25 11:43:12 +01:00
Luke Barnard	143994e44f	Use `data-offset-key` in RTE decorators This makes sure the selection state is correct when moving the cursor through an entity in the composer but only in rich text mode. https://github.com/vector-im/riot-web/issues/4666 still persists despite this, probably because the text content inserted during a completion in markdown mode has a different length to the text node within the entity. fixes vector-im/riot-web#4654	2017-07-25 11:25:33 +01:00
Luke Barnard	6945fa54ea	Reimplement so that only tab-completed mentions are stripped Instead of blindly stripping all MD mentions, only strip those that were tab-completed. We do this by adding the `isCompleted` flag to the Entity data.	2017-07-24 14:41:13 +01:00
Luke Barnard	397201a74d	Remove subjective comment	2017-07-24 09:41:46 +01:00
Luke Barnard	e315b30f6a	Merge branch 'develop' into luke/fix-rte-pt-md-mentions	2017-07-21 18:06:31 +01:00
Luke Barnard	e8495f637f	Strip MD mentions from the `body` of sent messages Because previously we just sent the display name and MD links are not very readable.	2017-07-21 16:38:31 +01:00
Luke Barnard	7db7192701	Factor out shared logic in two code-paths for pill rendering This isn't an entirely side-effect-free refactoring: - the text of the timeline pills is now either the room ID/alias or user ID/ display name of the linked resource (which means that until we do a roundtrip to get user displaynames, mentions for users not in the current room will have their user IDs shown instead of what was in the link body). - timeline links to rooms without avatars are now rendered as links - fixed issue that would throw an error whilst rendering (i.e. unusable client) a room link to a room that the client doesn't know about	2017-07-21 14:07:48 +01:00
Luke Barnard	bac22cfb7c	Re-add removal of (IRC) suffix	2017-07-20 18:04:12 +01:00
Luke Barnard	08cc0c421d	insert_displayname -> insert_mention	2017-07-20 18:02:54 +01:00
Luke Barnard	0cc890c020	WIP store history as raw content state Not sure this solves any problems because we still have to convert from md and back	2017-07-20 18:01:39 +01:00
Luke Barnard	0600c5b049	Pretend that insert_displayname is a completion on that user This has the advantage of us not reimplementing things and fixing the same bugs twice.	2017-07-20 16:46:53 +01:00
Luke Barnard	4bee9bd8c7	Merge branch 'develop' into luke/feature-rte-insert-pills-on-click-tl-profile	2017-07-20 15:48:38 +01:00
Luke Barnard	0419eff230	Insert pill onClick of timeline profile When clicking someone in the timeline, insert a user pill instead of the plaintext "displayname:"	2017-07-20 15:46:36 +01:00
Luke Barnard	e893f994e1	Default to first room alias and then roomID	2017-07-20 15:17:07 +01:00
Luke Barnard	84fe51a162	Insert MD links when autocompleting in MD mode These will appear decorated because they are inserted as entities. It was necessary to modify pills to have an explicit linkText that is derived from the `href` being pillified (and is thus no longer the inserted completion but rather the display name (or user ID) or room alias.	2017-07-20 15:09:59 +01:00
Luke Barnard	352f70f9ce	Implement old composer feature that inserts ': ' or ' ' after a user completion	2017-07-20 11:52:18 +01:00
Richard van der Hoff	0e8ad75248	Merge pull request #1233 from matrix-org/rav/async_crypto Prepare for asynchronous e2e APIs	2017-07-19 21:11:36 +01:00
Luke Barnard	61d5d078dd	Merge pull request #1235 from matrix-org/luke/fix-rte-inline-code-format Mimic ctrl+j of RT mode in MD mode	2017-07-19 17:44:56 +01:00
Luke Barnard	3a53fabb87	Merge pull request #1228 from matrix-org/luke/feature-auto-complete-matrixto-pills Implement composer completion user/room pill insertion	2017-07-19 17:19:47 +01:00
Luke Barnard	29b6d70aff	Merge branch 'develop' into luke/fix-rte-inline-code-format	2017-07-19 17:19:25 +01:00
Luke Barnard	28c98d93d1	Mimic ctrl+j of RT mode in MD mode by inspecting whether multiple lines are selected or the selection is empty. If either of these are true, insert a code block surrounding the selection, otherwise insert single backticks around the selection for inline code formatting.	2017-07-19 16:13:47 +01:00
Richard van der Hoff	4998d1b359	Prepare for asynchronous e2e APIs the js-sdk is making some of its APIs asynchronous, and adding an `initCrypto` method which you have to call. Particular methods we need to worry about are: * `getStoredDevice` * `getStoredDevicesForUser` * `getEventSenderDeviceInfo` * `isEventSenderVerified`	2017-07-18 23:47:36 +01:00
Luke Barnard	98ca937fef	Interpret backspace at start of style block as block style toggle Part of fixing https://github.com/vector-im/riot-web/issues/4580	2017-07-18 17:52:04 +01:00
Luke Barnard	897ff05d87	Implement composer completion user/room pill insertion This modifies the composer completion such that completing a room or user will insert an IMMUTABLE matrix.to LINK Entity for the range that was replaced. Display names will not have a colon after their name anymore as it seemed strange that we would insert one after a pill.	2017-07-17 15:53:29 +01:00
Luke Barnard	ee5117525c	Merge pull request #1225 from matrix-org/luke/feature-rte-pills Decorate http://matrix.to links in the composer as pills	2017-07-14 17:47:16 +01:00
Luke Barnard	434660166c	Decorate http://matrix.to links in the composer as pills Any links in the composer that are recognised as matrix.to links will be decorated as `<span>`s with CSS classes (one of mx_UserPill or mx_RoomPill). This implementation has the nice bonus that switching to markdown (and back) will Just Work. This will have some CSS changes coming to better match the design.	2017-07-14 17:04:28 +01:00
Richard van der Hoff	2a52c902e2	Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage Fix RoomSettings save	2017-07-14 14:47:14 +01:00
Richard van der Hoff	9df1fb91ff	Fix RoomSettings save Looks like saving RoomSettings had been broken since `0d7cc59`. `isFulfilled` cannot be used as a static function.	2017-07-14 14:24:42 +01:00
Kegsay	5274cf59a0	Hook up the edit widget button (#1218 ) * Hook up the edit widget button * Review comments	2017-07-14 11:17:59 +01:00
Luke Barnard	219c00bbc3	Add code-block to the list of blocks where hitting return will split-block Hitting return in a code-block will now split the block into two code blocks. (Holding shift will still insert a soft newline into the current block). We still need to make it a bit more obvious that consecutive code-blocks are not contiguous - https://github.com/vector-im/riot-web/issues/4535	2017-07-13 18:42:37 +01:00
Luke Barnard	d97de4d576	Implement disabled-by-default setting for auto-replacement of plaintext emojis FTR a list of plaintexts and their unicode equivalents can be found here - https://github.com/vector-im/riot-web/issues/4554#issuecomment-314374303 Pressing space after a matching emoji will replace the plaintext emoji with the equivalent unicode emoji.	2017-07-13 17:37:43 +01:00
Luke Barnard	7fc10789fc	Merge pull request #1217 from matrix-org/luke/fix-rte-html-links Improve RTE HTML link handling	2017-07-13 13:57:58 +01:00
Luke Barnard	f1a4209d6b	Fix indentation	2017-07-13 13:47:08 +01:00
Luke Barnard	5826b6f22a	Instead of sending HTML for any Entity, only send HTML for Links Otherwise emoji messages are sent as HTML, needlessly	2017-07-13 13:41:17 +01:00
Luke Barnard	be045a6dc0	Interpret whitespace after entity as the end of the entity The easiest way to stop the user from inserting whitespace onto the end of an entity is to toggle the entity state of the whitespace that was just entered. This allows the user to continue drafting a message without editing the link content. This is for pasted `<a>` tags that have been copied from a website. We probably also want to be storing entities for substrings of content that are determined to be URLs.	2017-07-13 13:28:51 +01:00
Luke Barnard	4b96963408	Send HTML if there are any entities present in the composer This is so that pasted HTML links that are represented as entities are sent as HTML.	2017-07-13 13:27:49 +01:00
Luke Barnard	55e1202c09	Decorate pasted links so that they look like links By default, draftjs will represent pasted `<a>` tags as `LINK` entities, but it doesn't do any default decoration of these links. Add a decorator to do so. Most of this was taken from https://github.com/facebook/draft-js/blob/v0.8.1/examples/link/link.html (note the version, v0.8.1).	2017-07-13 13:26:13 +01:00
David Baker	2a68cce3d5	Merge pull request #1216 from matrix-org/dbkr/history_save_unload_nullcheck Prevent exception on page unload	2017-07-13 12:38:28 +01:00
Richard van der Hoff	086304532e	Merge pull request #1213 from matrix-org/rav/bluebird Switch matrix-react-sdk to bluebird	2017-07-13 12:06:11 +01:00
David Baker	917133219f	Remove sentHistory save altogether	2017-07-13 11:53:22 +01:00
David Baker	1e80edb43c	Prevent exception on page unload Null check when saving sent history	2017-07-13 11:30:25 +01:00
Luke Barnard	04dd98e6e9	Remove references to tabComplete, which are now redundant (since the old composer has been removed)	2017-07-13 10:16:59 +01:00
Luke Barnard	0e12e384cb	Remove TabComplete-related files	2017-07-13 10:16:42 +01:00
Richard van der Hoff	33f330d434	Manual fixup for remaining q incantaions * don't try to use `finally` as a static method * work around absence of `allSettled`	2017-07-12 18:05:40 +01:00
Richard van der Hoff	0d7cc59d99	replace q method calls with bluebird ones ``` find src test -name '*.js' \| xargs perl -i -pe 's/q\.(all\|defer\|reject\|delay\|try\|isFulfilled)\(/Promise.$1(/' ```	2017-07-12 18:05:40 +01:00
Richard van der Hoff	0254d2b3a2	q(...) -> Promise.resolve ``` find src test -name '*.js' \| xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/' ```	2017-07-12 18:05:08 +01:00
Richard van der Hoff	a06bd84213	replace imports of `q` with bluebird update `package.json` ``` find src test -name '.js' \| xargs perl -i -pe 'if (/require$.[qQ].$/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' find src test -name '.js' \| xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' ```	2017-07-12 18:05:08 +01:00
Luke Barnard	6ff924fc0d	Remove MessageComposerInputOld	2017-07-12 18:03:13 +01:00
Kegsay	cf158530f5	Implement new widget API (#1201 ) * Implement new widget API This allows clients to see who provisioned which widgets. * Update to make state_key the wid * Update to latest API * Only show widgets which have required fields * Don't constantly show apps dialog * Fix example to include data key	2017-07-11 12:15:27 +01:00
Luke Barnard	b104228a7b	Remove redundant functions, bindings, props	2017-07-10 14:27:41 +01:00
Luke Barnard	c9df079464	Merge pull request #1176 from matrix-org/luke/feature-enable-RTE Take RTE out of labs! 🎉	2017-07-10 13:56:00 +01:00
Luke Barnard	9643f0c00b	Merge pull request #1167 from matrix-org/dbkr/my_groups Implement 'Groups' page	2017-07-10 09:37:06 +01:00
Luke Barnard	7a8f524f4a	Remove two possible sources for the "AutoComplete stays visible bug which is now https://github.com/vector-im/riot-web/issues/4537 <- there. This does two things: - Track which query was the most recent one requesting completion and only process completions for that one. (In this case the empty string "" doesn't have any completions but we still track it so that previous calls with non-empty queries would not race and cause completions to be shown when we actuall don't want any.) - Make the "do we want to show the AutoComplete box?" logic a bit more sane	2017-07-07 15:30:31 +01:00
David Baker	bc8c2d442b	WithMatrixClient -> withMatrixClient because we're using it as a function rather than a React component	2017-07-07 11:34:20 +01:00
Richard Lewis	d091550ccb	Use app ID for element key and pass screen parameter to scalar.	2017-07-06 15:59:59 +01:00
Luke Barnard	6404f7603c	Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u Allow underline through MD and in RTE (MD) using <u> which works with CM	2017-07-06 14:08:01 +01:00
Luke Barnard	d9a67355d2	Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on Only insert HTML into the composer in RTE mode	2017-07-06 13:59:52 +01:00
Michael Telatynski	ff7ae5b995	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u	2017-07-06 13:56:20 +01:00
Michael Telatynski	fcd8321a63	Allow underline through MD and in RTE (MD) using <u> which works with CM Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 13:49:13 +01:00
Michael Telatynski	6149b37245	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl	2017-07-06 13:30:40 +01:00
Michael Telatynski	c6d9ec42a2	only show unban button in RoomSettings if user has sufficient PL to do so Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 12:51:55 +01:00
Luke Barnard	bdefb35c64	Only insert HTML into the composer in RTE mode If MD mode is enabled, paste the plaintext equivalent.	2017-07-06 11:52:02 +01:00
Luke Barnard	0bf1124f1b	Merge pull request #1181 from matrix-org/luke/fix-rte-draft-persist Implement MessageComposerStore to persist composer state when room switching	2017-07-05 18:24:27 +01:00
Luke Barnard	7f1d8e3c90	Merge pull request #1188 from matrix-org/luke/feature-rte-visual-bell Add visual feedback for when there are no completions available	2017-07-05 18:23:10 +01:00
Luke Barnard	29e793f591	Merge pull request #1180 from matrix-org/luke/fix-rte-force-immediately When hitting "tab" use an autocompleteDelay of 0	2017-07-05 18:20:48 +01:00
Luke Barnard	d78168d407	Add visual feedback for when there are no completions available Attempts to kep parity with old composer by using the same #faa colour but uses an animation instead of a js timeout. Fixes https://github.com/vector-im/riot-web/issues/4490	2017-07-05 18:14:22 +01:00
Luke Barnard	5c9d3edec4	Revert #1170 , `fde7d5eaf4` There were a few issues with this, namely that links were no longer linkified and an error was logged to the console: `Warning: Stateless function components cannot be given refs (See ref "topic" in EmojiText created by RoomHeader). Attempts to access this ref will fail.`	2017-07-05 14:46:00 +01:00
Luke Barnard	3d5b3ed7ad	Use ContentState instead and persist over localStorage	2017-07-05 11:49:34 +01:00
Luke Barnard	084a933dbd	Implement MessageComposerStore to persist composer state across room switching This behaviour was present in the old composer but implemented using local storage. This is unecessary as we don't really care about our drafts across clients, the important thing is that our draft is kept when switching rooms. As a bonus, ifnore vertical arrow key presses when a modifier key is pressed so that the room switching keys (alt + up/down arrow) don't also cause history browsing (or autocomplete browsing).	2017-07-05 10:24:55 +01:00
Luke Barnard	5f6c3e5afc	When hitting "tab" use an autocompleteDelay of 0 So that there's no delay when tab completing. Fixes https://github.com/vector-im/riot-web/issues/4497	2017-07-04 17:49:50 +01:00
Luke Barnard	77348e6201	Remove spurious, unused code	2017-07-04 15:20:00 +01:00
Luke Barnard	e3f2eb5232	Take RTE out of labs! 🎉 This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently. This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.	2017-07-04 14:44:55 +01:00
Richard van der Hoff	fb86534ba3	Merge pull request #1171 from matrix-org/t3chguy/delintify De-Lint 23 files	2017-07-04 10:40:49 +01:00
Luke Barnard	664f3acc3c	Only move through history if caret at start or end of line As suggested by @dbkr (because this is what we do for the old composer), only move through history when the caret is that the beginning of the first line (block) or end of the last. This has the nice property of being able to move the caret up to a really long message: fixes https://github.com/vector-im/riot-web/issues/4471	2017-07-04 10:12:06 +01:00
Michael Telatynski	34c9bbfd86	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/rooms/RoomHeader.js	2017-07-03 19:15:38 +01:00
Michael Telatynski	827c38d4a5	fix variable clash Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-03 19:13:07 +01:00
David Baker	72eed70a84	Merge pull request #1173 from matrix-org/luke/fix-rte-forgets-me Strip out "/me" after committing to RTE history	2017-07-03 15:59:07 +01:00
David Baker	a7bb546b1f	Merge pull request #1172 from matrix-org/luke/fix-rte-md-format-without-selection When formatting with MD enabled, move selection inside ** or equivalent	2017-07-03 15:58:02 +01:00
Luke Barnard	775f5a0e5b	Strip out "/me" after committing to RTE history So that history can include emotes Fixes https://github.com/vector-im/riot-web/issues/4472	2017-07-03 15:47:03 +01:00
Luke Barnard	86889b8e8c	When formatting with MD enabled, move selection inside ** or equivalent Fixes https://github.com/vector-im/riot-web/issues/3225 Also insert `\n` after code-block and blockquote to fix https://github.com/vector-im/riot-web/issues/2746	2017-07-03 15:23:24 +01:00
David Baker	a89ea39dba	Merge pull request #1170 from matrix-org/t3chguy/emojione-room-topic make RoomHeader Topic use EmojiText to be emojione-friendly	2017-07-03 10:27:47 +01:00
Michael Telatynski	e56203f2a1	de-lint RoomHeader, Avatar, SdkConfig, SlashCommands Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:13:32 +01:00
Michael Telatynski	fde7d5eaf4	make RoomHeader Topic use EmojiText to be emojione-friendly Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 13:36:28 +01:00
Luke Barnard	0b46184a21	Merge pull request #1166 from matrix-org/luke/fix-rte-wrong-history-format Always store sent MD messages as MD in history	2017-06-30 16:05:45 +01:00
Luke Barnard	6bc40a112c	Always store sent MD messages as MD in history Because converting them to HTML when they got sent as HTML seems a bit pointless when they're just going to get transformed back again when retrieved from history. Fixes regression https://github.com/vector-im/riot-web/issues/4465	2017-06-30 15:47:48 +01:00
Kegan Dougal	b8941f76d3	Fix bug which breaks the close button on scalar	2017-06-30 15:42:36 +01:00
Luke Barnard	15cfe5b8e4	Only allow history selection when on the first or last line (of a multi-line or otherwise message in the editor)	2017-06-30 14:27:26 +01:00
Luke Barnard	e7a2c3b975	Only send HTML when using RTE when necessary When there are no styled blocks or inline styles applied within blocks, just send text instead of HTML. Also, don't add <br /> for the last <p> (the last block). Fixes https://github.com/vector-im/riot-web/issues/3147	2017-06-30 11:27:00 +01:00
Luke Barnard	8b8260c509	Move cursor to end of editor when quoting When quoting a message, move the selection to the end of the input box. Fixes https://github.com/vector-im/riot-web/issues/2336	2017-06-29 17:22:34 +01:00
Luke Barnard	e5e7dec131	Fix #4422 by persisting the "currently composed" message This allows for browsing through history without losing the message currently being composed.	2017-06-29 17:02:19 +01:00
Luke Barnard	6bd7284161	Be sensible about handling up/down vs tab/tab-shift Fixes https://github.com/vector-im/riot-web/issues/4445	2017-06-29 15:07:06 +01:00
Luke Barnard	8912400675	Add XXX for https://github.com/vector-im/riot-web/issues/4445	2017-06-28 18:05:39 +01:00
Luke Barnard	a3e02f470f	Merge pull request #1156 from matrix-org/luke/fix-rte-debounce Do debouncing for autocomplete in a sane way	2017-06-28 18:03:36 +01:00
Luke Barnard	de81188b13	Do debouncing for autocomplete in a sane way - Fixes https://github.com/vector-im/riot-web/issues/4419 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285901871 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285910503 - Fixes bug where the setting being used was the `autocompleteDelay` "syncedSetting" when it should have been the "localSetting" (so the setting being used was always the default)	2017-06-28 17:27:21 +01:00
Luke Barnard	d5585e29b1	Merge pull request #1155 from matrix-org/luke/fix-rte-cursor-at-start-of-history Fix issue where the cursor is put at the start of selected history item	2017-06-28 17:17:56 +01:00
Richard Lewis	d61525e420	Merge pull request #1152 from matrix-org/rxl881/apps Add support for apps	2017-06-28 16:06:20 +01:00
Richard Lewis	ea83d7eee2	Add missing import and fix apps reference.	2017-06-28 15:53:18 +01:00
Luke Barnard	d696373bc2	Fix issue where the cursor is put at the start of selected history item Leading to strange behaviour when selecting all and deleting it. Fixes https://github.com/vector-im/riot-web/issues/4450	2017-06-28 15:29:07 +01:00
Luke Barnard	bcb67bb273	Refactor shared code between `onUpArrow` and `onDownArrow`	2017-06-28 15:20:16 +01:00
Richard Lewis	3a10cda2ca	Add translations.	2017-06-28 13:55:18 +01:00
Richard Lewis	f8c064ec25	REmove redundant call to _getApps	2017-06-28 13:45:29 +01:00
Richard Lewis	e70eca0b0c	Comment unused code and add TODO to handle scalar errors.	2017-06-28 12:58:09 +01:00
Richard Lewis	d06d066050	Move getInitialState to top of file.	2017-06-28 12:54:47 +01:00
Richard Lewis	e752cc8557	Use 'this' in preference to local reference.	2017-06-28 12:32:38 +01:00
Richard Lewis	481a66ef3c	Fix header.	2017-06-28 12:26:05 +01:00
Luke Barnard	f73fa4b49b	Move processing into renamed function processHtmlforSending And explain why this fix is necessary	2017-06-28 11:49:50 +01:00
Luke Barnard	1523d304f2	WIP to prevent RTE from deleting current message input when up arrow pressed	2017-06-28 10:30:59 +01:00
Luke Barnard	69589c19e7	Work around draft-js-export-html#62 by post-processing <br>\n Fixes https://github.com/vector-im/riot-web/issues/4446 by post-processing the output HTML from draft-js-export-html by replacing `<br>\n` with `<br>`. This works for content within or outside of `<pre>`. If we replace with `\n` instead, the newlines only apply in `<pre>` tags so we use `<br>`.	2017-06-27 18:33:45 +01:00
Richard Lewis	3872f0750c	Only show apps button if labs feature enabled.	2017-06-27 17:40:28 +01:00
Richard Lewis	338a4db87f	Only show apps drawer if matrix apps labs setting ids enabled	2017-06-27 17:40:09 +01:00
Luke Barnard	5307731dfd	Overide default draft-js handling of pasting text/html This is surprisingly needed to avoid an issue with draft-js that causes multi-line madness when pasting code and then applying format-as-code to it - https://github.com/vector-im/riot-web/issues/2120#issuecomment-271735729. The issue sounds like it is https://github.com/facebook/draft-js/issues/170#issuecomment-195026203 and the suggstion is to override the text pasting handler https://github.com/facebook/draft-js/issues/170#issuecomment-215983216. Meanwhile they haven't modified the default pasting behaviour afaics. I've discovered a separate issue that is apparent even after this suggested fix. (https://github.com/vector-im/riot-web/issues/4446)	2017-06-27 17:10:28 +01:00
Luke Barnard	ba31a32440	Allow toggling of dev tools when RTE focussed	2017-06-27 15:17:57 +01:00
Richard Lewis	aab4c097e6	Make query parameters generic.	2017-06-27 12:26:13 +01:00
Richard Lewis	ddc0da396d	Merge in changes from develop	2017-06-27 11:44:36 +01:00
Richard Lewis	63b1250385	Add comment	2017-06-27 11:39:20 +01:00
Richard Lewis	1f1352786f	Temporarily disable Jitsi default	2017-06-27 11:38:14 +01:00
Richard Lewis	18ea76b864	Removed commented code	2017-06-27 11:31:00 +01:00
Richard Lewis	e343e99355	Cleaned up unused files and removed commented code	2017-06-27 11:28:38 +01:00
Luke Barnard	9404dd30c5	Use <del> for strikeout We've swapped to commonmark, which uses <del> instead of ~~ for strikeout, so make the RTE insert <del> when we apply strikeout. Also, when ~~ is inserted, transform them into <del> for simplicity. This means giving an input of ~~test~~ is effectively the same as giving an input of <del>test</del>.	2017-06-23 18:19:06 +01:00
Luke Barnard	89afcfd897	Linting	2017-06-23 17:35:07 +01:00
Luke Barnard	87609582c6	Merge branch 'develop' into rte-fixes2 Conflicts: package.json src/autocomplete/CommandProvider.js src/autocomplete/UserProvider.js src/components/structures/RoomView.js src/components/structures/UserSettings.js src/components/views/rooms/MessageComposerInput.js	2017-06-23 15:30:06 +01:00
turt2live	a22f14e910	Use 12h timestamps when enabled in RR Fixes vector-im/riot-web#4393 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-06-22 08:54:34 -06:00
Richard Lewis	2cb2c44bd8	Remove unused logging	2017-06-20 17:57:48 +01:00
Richard Lewis	68473e118f	Ensure that Scalar Messaging is started and stopped on component mount / unmount	2017-06-20 17:56:45 +01:00
Richard Lewis	a449588c1c	Replace add app dialog with scalar interface	2017-06-20 10:54:41 +01:00
David Baker	b1ca83bb9d	Internationalise the drop targets Unsure how these had got missed (and yet still had the translation strings in the json)	2017-06-19 17:49:22 +01:00
daniel tygel	13c12811e7	typo	2017-06-19 13:22:23 -03:00
daniel tygel	aebe4fb88f	add two strings to translation	2017-06-19 13:21:23 -03:00
daniel tygel	c418076c32	add two strings to translation	2017-06-19 13:20:16 -03:00
Matthew Hodgson	032650e095	Merge branch 'develop' into t3chguy/fix_forwarding	2017-06-19 01:53:35 +01:00
Michael Telatynski	7b4cd31124	make forward_message be friendly with the RVS stuffs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-16 16:12:52 +01:00
David Baker	aa7ddfe86e	Remove unused collapse_rhs Remove all the places we pass collapse_rhs through to places it's never used. Remove the commented RHS collapse button from SimpleRoomHeader.	2017-06-16 15:47:40 +01:00
Robert Swain	edb11d805e	AppsDrawer: Open add app widget if opening empty drawer This felt much better than having to also click the add app widget button.	2017-06-14 15:05:29 +02:00
Robert Swain	2d3c886646	AppsDrawer: Generate room alias for vrdemo	2017-06-14 13:27:15 +02:00
Robert Swain	9c8ab2691b	AppsDrawer: Only append queryParams once	2017-06-14 13:26:43 +02:00
Robert Swain	880e7149f3	ModularWidgets: Add a quick VR demo widget	2017-06-14 13:05:43 +02:00
Matthew Hodgson	9dad5d0132	Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings remove mx_filterFlipColor from verified e2e icon so its not purple :/	2017-06-13 17:45:56 +01:00
Michael Telatynski	f4aadafed9	remove mx_filterFlipColor from verified e2e icon so its not purple :/ Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-13 17:42:30 +01:00
Robert Swain	d67e7289e8	Merge branch 'develop' into rob/apps	2017-06-13 15:50:43 +02:00
Robert Swain	03ba3bd431	Merge branch 'rxl881/apps' into rob/apps	2017-06-13 15:41:52 +02:00
Robert Swain	91eabbba60	MessageComposer: Trigger Jitsi app from call buttons	2017-06-13 15:35:13 +02:00
Robert Swain	5d898dd098	AuxPanel: Add type checking for userId and showApps properties	2017-06-13 15:34:05 +02:00
Robert Swain	b63edcb390	AppTile: Support deletion of apps from room state	2017-06-13 15:33:17 +02:00
Robert Swain	bcb2f8408b	AppTile: Fix typo in property name	2017-06-13 15:32:40 +02:00
Robert Swain	2aa0aa61e3	AddAppDialog: Support adding apps to room state	2017-06-13 15:31:37 +02:00
Robert Swain	a72cb794f2	AppsDrawer: Populate apps from room state	2017-06-13 15:28:37 +02:00
Richard Lewis	876899948f	Merge in upstream changes	2017-06-13 11:44:23 +01:00
Richard Lewis	2da30137ec	Fix import path and add LG widget	2017-06-13 10:31:16 +01:00
David Baker	7b0565e9d1	Merge branch 'master' into develop	2017-06-12 15:53:04 +01:00
Richard Lewis	b893887707	Fix merge conflict	2017-06-12 14:52:41 +01:00
Richard Lewis	f9f924bbd6	Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps	2017-06-12 14:50:25 +01:00
Will Hunt	3ddbf83c62	Add userid back	2017-06-11 07:13:50 +01:00
Will Hunt	f940d2c100	Add reason for ban in room settings	2017-06-10 16:57:09 +01:00
Michael Telatynski	34caf5586f	adds mx_filterFlipColor so that the dark theme will invert this image making it more suitable for the said theme Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-10 00:08:40 +01:00
David Baker	d6b85c9d4d	Fix translations on conf call banner * You can't substitute react elements into a text string * Substituting in undefined gives the string 'undefined', so initialise it to the empty string.	2017-06-09 22:06:43 +01:00
Robert Swain	9e0b476b72	Merge branch 'develop' into rob/apps	2017-06-09 12:06:44 +02:00
Luke Barnard	ce0977373e	Merge pull request #1058 from matrix-org/luke/fix-event-id-state Control currently viewed event via RoomViewStore	2017-06-08 18:10:29 +01:00
Matthew Hodgson	df625b0d31	hit MemberInfo with Gemini to fix vector-im/riot-web#4223	2017-06-08 17:26:40 +01:00
Matthew Hodgson	f26aeef2bf	Merge pull request #1056 from matrix-org/kegan/translation-tamarin Add remaining translations	2017-06-08 15:06:26 +01:00
Kegan Dougal	f2efdf8a4f	Review comments	2017-06-08 14:45:59 +01:00
Matthew Hodgson	c173861b27	Merge pull request #1021 from Bitim/feature/rtl-languages-support Better RTL support	2017-06-08 14:43:18 +01:00
Kegan Dougal	c57823a31d	Merge branch 'develop' into kegan/translation-tamarin	2017-06-08 14:19:56 +01:00
Luke Barnard	d3cf78ff5a	Control currently viewied event via RoomViewStore Fix for https://github.com/vector-im/riot-web/issues/4224 Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously). This required a few changes: - The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`. - The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.	2017-06-08 14:17:49 +01:00
Kegan Dougal	00df956ca2	Add remaining translations! Every file has now been manually vetted by me. Due to the extent of the changes, I've been unable to test all scenarios to make sure this all works. :(	2017-06-08 14:08:51 +01:00
Luke Barnard	49b22fb6c6	Use an arrow function to allow `this` This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.	2017-06-07 16:13:40 +01:00
Luke Barnard	53ea41e8a5	Merge branch 'develop' into new-guest-access	2017-06-07 12:08:37 +01:00
Richard Lewis	f6f660fa9a	Initial app icon tiles	2017-06-06 23:45:17 +01:00
Matthew Hodgson	184c2d5e58	Merge pull request #1015 from matrix-org/t3chguy/random_fix_1 fix copy and paste derp and rip out unused imports	2017-06-06 18:02:35 +01:00
Richard Lewis	e8353edb06	Disable test postmessag	2017-06-06 15:57:40 +01:00
Richard Lewis	e9f110a4c5	Don't show add widget if there are more than one existing widgets	2017-06-06 14:50:43 +01:00
David Baker	22df03944c	Merge branch 'develop' into new-guest-access	2017-06-06 10:35:28 +01:00
David Baker	f8198ba9c9	Merge branch 'develop' into new-guest-access	2017-06-06 10:33:01 +01:00
David Baker	e7af9bde23	Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again Remove DM-guessing code (again)	2017-06-06 10:20:44 +01:00
Matthew Hodgson	d77a09adba	quick and dirty override to disable MD globally	2017-06-05 21:33:01 +01:00
Richard Lewis	dc4f321707	Pass room and user id to apps draw	2017-06-05 18:21:31 +01:00
Luke Barnard	cc8078837d	Remove DM-guessing code (again) Seems this got reverted somehow: >the revert of https://github.com/matrix-org/matrix-react-sdk/pull/807 (`ebfafb3639`) also included the revert of https://github.com/matrix-org/matrix-react-sdk/pull/829	2017-06-05 16:57:30 +01:00
Luke Barnard	619830617a	Merge branch 'develop' into luke/ilag-i18n In order to get ILAG internationalised Conflicts: src/components/structures/LoggedInView.js src/components/structures/MatrixChat.js src/components/views/dialogs/ChatCreateOrReuseDialog.js src/components/views/dialogs/SetDisplayNameDialog.js src/createRoom.js src/i18n/strings/en_EN.json	2017-06-05 16:08:03 +01:00
saul.kredi@krutt.org	159a920dc8	Better RTL support	2017-06-03 18:52:45 +03:00
Michael Telatynski	4032a820f0	move KEY_M to KeyCode Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:46:08 +01:00
Michael Telatynski	464863acd6	remove unused imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:35:55 +01:00
Luke Barnard	be7c2612e8	Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips Show People/Rooms emptySubListTip even when total rooms !== 0	2017-06-02 11:10:48 +01:00
Kegan Dougal	d2e766e4f0	First round	2017-06-02 10:18:31 +01:00
Matthew Hodgson	6c56fa3381	Merge pull request #990 from matrix-org/kegan/translation-marmoset Translation fixes for everything but src/components	2017-06-01 21:22:00 +01:00
Kegan Dougal	547f10bcbb	Add translations for slash command failures	2017-06-01 15:44:56 +01:00
Matthew Hodgson	00750b4686	quick and dirty RoomAvatarEvent	2017-06-01 13:31:24 +01:00
Luke Barnard	dd48b3f055	Add comment	2017-06-01 10:08:02 +01:00
Matthew Hodgson	3d91b31637	i18n invited, and delete stale warning	2017-06-01 01:29:07 +01:00
turt2live	165dfeccb9	Fix rare case where presence duration is undefined & i18n	2017-05-31 11:56:04 -06:00
Richard Lewis	dac154f828	Add full width widgets	2017-05-31 10:08:39 +01:00
daniel tygel	f4e5039e70	add string to translate	2017-05-30 19:01:23 -03:00
daniel tygel	12f923bc81	add new string to translate	2017-05-30 18:56:52 -03:00
Matthew Hodgson	e30e45a82c	Merge branch 'develop' into new-guest-access	2017-05-30 21:05:07 +01:00
Richard Lewis	ae1753bce6	Add tipping widgets	2017-05-30 18:39:51 +01:00
Luke Barnard	40154df930	Show People/Rooms emptySubListTip even when total rooms !== 0	2017-05-30 16:14:27 +01:00
Luke Barnard	6f8d5b1db3	Remove spurious reference to `otherTagNames`	2017-05-30 16:10:19 +01:00
Richard Lewis	0d7e3a15f7	Add room config	2017-05-30 15:32:53 +01:00
Marcel	70e7d81093	More i18n strings (#963 ) * Add i18n for E2E import and Export Dialogs Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add various previous missing i18n strings Signed-off-by: MTRNord <mtrnord1@gmail.com> * Translate CreateRoomButton Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ChatInviteDialog and fix missing to. Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ConfitmRedactDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeactivateAccountDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeviceVerifyDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add SessionRestoreErrorDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add SetDisplayNameDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UnknownDeviceDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add AddressTile translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeviceVerifyButtons translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add Dropdown translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UserSelector translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CaptchaForm translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CasLogin translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CustomServerDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add InteractiveAuthEntryComponents translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add LoginFooter translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add RegistrationForm translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ServerConfig translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MAudioBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MImageBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MVideoBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add TextualBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UnknownBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UrlPreviewSettings translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add AuxPanel translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add PresenceLabel translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * fix syntax error * weird space :P * missing ',' * fix missing value * fix json fail * remove acidential added file * fix another json fail	2017-05-30 15:09:57 +01:00
Richard Lewis	0e7bb6791f	Static widget config per room	2017-05-30 13:47:17 +01:00
Richard Lewis	143f68ec56	Add locally hosted recepie widget	2017-05-30 11:40:29 +01:00
Richard Lewis	ec03cf4de3	disable iframe sandboxing. Remove BBC news iframe	2017-05-30 10:46:51 +01:00
Matthew Hodgson	5c885922d9	Merge branch 'develop' into new-guest-access	2017-05-28 22:58:18 +01:00
Travis Ralston	1b6685c5da	Merge branch 'develop' into travis/redact-to-remove	2017-05-28 17:45:32 -04:00
Michael Telatynski	b55503e67f	i18n the forwarding aux panel Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-28 13:27:57 +01:00
Matthew Hodgson	accc17a39a	Merge pull request #812 from t3chguy/forward_message Message Forwarding	2017-05-28 02:37:31 +01:00
Matthew Hodgson	3302fc690f	fix all missing translations picked up by check-i18n.pl	2017-05-27 18:20:44 +01:00
Matthew Hodgson	957aa0403d	fix https://github.com/vector-im/riot-web/issues/4052	2017-05-27 16:03:07 +01:00
David Baker	c22978d033	Merge remote-tracking branch 'origin/develop' into dbkr/translations	2017-05-26 17:30:02 +01:00
David Baker	2d6bf5fa91	Remove messages with HTML formatting The translations strings are not HTML and it gets escaped.	2017-05-25 20:04:28 +01:00
David Baker	443ab1add7	Put back default strings on dialogs But make them work by calling _t in render rather than getDefaultProps(). Also sort out some 'Warning!' strings	2017-05-25 18:20:48 +01:00
Luke Barnard	ce17df0883	Unbreak the roomlist	2017-05-25 15:20:02 +01:00
Luke Barnard	7900bf1c7d	Don't show "Drop to ..." if total rooms = 0	2017-05-25 13:55:37 +01:00
Luke Barnard	3185d3ed41	Re-add bouncing/callout animation to action buttons	2017-05-25 13:54:59 +01:00
David Baker	548f319816	Remove redundant role elements	2017-05-25 12:09:08 +01:00
David Baker	9337158a47	Separate classes for the different buttons Also rename RoleButton to ActionButton because it's not being given a Role any more. Conflicts: src/component-index.js cherry-picking commit `4a5821e`.	2017-05-25 12:08:42 +01:00
David Baker	dc2274df54	Hide empty tips if collapsed	2017-05-25 12:05:06 +01:00
David Baker	3d3d89202e	Year	2017-05-25 12:04:36 +01:00
David Baker	bff0577cb6	Add buttons to room sub list headers Conflicts: src/component-index.js src/components/views/rooms/RoomList.js cherry-picking commit `ce119a6`.	2017-05-25 11:49:45 +01:00
David Baker	d6d9a89453	Other empty sections no longer need to be greyed	2017-05-25 11:47:21 +01:00
David Baker	5c359e63ab	Bulk change counterpart imports to use languageHandler wrapper func	2017-05-25 11:39:08 +01:00
David Baker	5531f27435	Make the left panel more friendly to new users https://github.com/vector-im/riot-web/issues/3609 Conflicts: src/components/views/rooms/RoomList.js cherry-picking commit `f5f35e3`.	2017-05-25 11:24:45 +01:00
David Baker	d419c42a4f	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
Richard Lewis	b111579aed	App tile events	2017-05-22 18:00:17 +01:00
Luke Barnard	05aaa599cc	Merge branch 'develop' into new-guest-access Conflicts: src/components/structures/MatrixChat.js	2017-05-22 16:19:10 +01:00
Richard Lewis	e8837d28ef	App tile and app dialog styling	2017-05-22 12:34:27 +01:00
Kieran Gould	47e5e8d678	Moved isTwelveHour alllll the way up to TimelinePanel.	2017-05-19 23:04:37 +01:00
Kieran Gould	6b32975e0c	Add 12 hour class to mx_EventTile	2017-05-19 22:36:13 +01:00
Maxwell Kepler	008cc95e9c	Add 12 hour support	2017-05-19 22:29:49 +01:00
Michael Telatynski	cc7edbf86d	allow for sending arbitrary events, also override highlight with event currently being forwarded while forwardingEvent is set Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 01:29:11 +01:00
Michael Telatynski	475646a2a7	Change wording Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 00:34:35 +01:00
Michael Telatynski	a2ab36f598	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 00:33:36 +01:00
Michael Telatynski	bf0fe63759	don't know why I'm even tracking mounted state. Never refd Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 00:20:51 +01:00
Michael Telatynski	0e7e4d8595	replace weird sidebar snapping with better ui_opacity Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 00:20:32 +01:00
David Baker	3e7a31ac75	Revert "fix scroll behaviour on macs with no gemini" This reverts commit `1347d9fa65`.	2017-05-18 19:03:51 +01:00
David Baker	8fe3fa9178	Remove debug logging	2017-05-18 17:35:22 +01:00
David Baker	01955146e9	Prevent an exception getting scroll node Don't try to findDOMNode before we're mounted as it makes react angry.	2017-05-18 17:33:32 +01:00
Richard Lewis	0e5657333f	Add app drawer and app dialog	2017-05-17 23:21:02 +01:00
Richard Lewis	7e1de2ac35	Show/hide apps panel and misc formatting and lint fixes	2017-05-17 21:15:57 +01:00
Richard Lewis	95988bd5ec	Dispatch show hide app drawer events	2017-05-17 12:35:25 +01:00
Richard Lewis	9dd0b9bdd1	Fix lint errrors / warnings	2017-05-17 11:31:01 +01:00
Richard Lewis	e22712514e	Add show / hide apps button	2017-05-17 10:58:59 +01:00
David Baker	8ce6da1b16	Merge branch 'new_release_process_stable' into develop This reverts all PRs currently marked notready, changing develop into a branch that should be more stable.	2017-05-17 10:38:09 +01:00
Richard van der Hoff	8695397abb	Support for pasting files into normal composer We don't seem to be in any danger of getting a working RTE any time soon, so implement file pasting in the normal composer too.	2017-05-17 01:43:13 +01:00
David Baker	ebfafb3639	Revert "Merge pull request #807 from matrix-org/matthew/quick-search" This reverts commit `0ad1d8caf3`, reversing changes made to `1189368aab`.	2017-05-16 16:11:01 +01:00
David Baker	67c6a8b81d	Revert "unbreak stack overflow which fires on tests due to mocked timers" This reverts commit `e69ea68133`.	2017-05-16 16:02:13 +01:00
David Baker	eddc2af92d	Revert "HOW DID THIS EVER WORK?" This reverts commit `0d8d3c6710`.	2017-05-16 16:01:54 +01:00
David Baker	7a949b6a45	Revert "oops, actually refresh roomlist when its state changes!" This reverts commit `35a16edccc`.	2017-05-16 16:01:32 +01:00
David Baker	b063c605a8	Revert "fix stupid typos in RoomList's shouldComponentUpdate" This reverts commit `b0288ebd89`.	2017-05-16 16:01:14 +01:00
David Baker	714cd6a10f	Revert "recalculate roomlist when your invites change" This reverts commit `ec6a1c4c75`.	2017-05-16 16:00:34 +01:00
David Baker	387529d130	Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" This reverts commit `3366d3bbae`, reversing changes made to `ceb71a4ef6`.	2017-05-16 14:49:55 +01:00
Luke Barnard	f199f3599e	Replace NeedToRegisterDialog /w SetMxIdDialog This uses MatrixChat's `view_set_mxid`	2017-05-15 17:31:26 +01:00
Matthew Hodgson	486301cffb	remove dodgy heuristics for hiding dates on RRs and use DateUtils instead. reverts `5d99d68a64` fixes https://github.com/vector-im/riot-web/issues/3523	2017-05-15 02:55:07 +01:00
Matthew Hodgson	6879f7ee6f	add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720	2017-05-15 02:43:23 +01:00
Matthew Hodgson	7f78e737eb	Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing various fixes to RoomHeader	2017-05-15 01:52:42 +01:00
Matthew Hodgson	24d09d8f5b	Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness remove /me whether or not it has a space after it	2017-05-15 01:50:53 +01:00
Matthew Hodgson	48864b0880	fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783	2017-05-15 01:39:57 +01:00
Matthew Hodgson	c5f2b69e48	add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786	2017-05-15 01:37:24 +01:00
Michael Telatynski	d7c88a9813	only removed `/me` , remove anyway to fix vector-im/riot-web#3733 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-13 15:20:31 +01:00
Michael Telatynski	60b13d76a5	conform to Luke's other comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-12 21:20:56 +01:00
Michael Telatynski	822f2f10f2	conform to Luke's comment https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-12 21:16:55 +01:00
Michael Telatynski	69d860e982	revert name overengineering, undefined onClick should be fine on div Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-12 21:06:36 +01:00
Michael Telatynski	5e4467adce	hide settings/search appropriately pass inRoom prop to RoomHeader (defaults to false) remove default onSettingsClick, handle if it is passed EVERYWHERE if onSettingsClick is passes, show that button show search button only if we are in the room, seems to fail otherwise this seems to handle all cases I could throw at it. Give it your best Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-11 17:35:06 +01:00
Michael Telatynski	f55b27f432	looks like it is passed and accessed like a string so unless I'm going insane, it should be a string. fixes ``` rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`. in AccessibleButton (created by RoomHeader) in RoomHeader (created by RoomView) in div (created by RoomView) in RoomView (created by LoggedInView) in main (created by LoggedInView) in div (created by LoggedInView) in div (created by LoggedInView) in LoggedInView (created by MatrixChat) in MatrixChat ``` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-11 17:32:23 +01:00
Michael Telatynski	50092a0f1f	fixes vector-im/riot-web#3881 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-10 15:16:49 +01:00
Luke Barnard	f5a23c14df	Remove redundant bind	2017-05-08 17:32:26 +01:00
Luke Barnard	fe121126f5	Merge branch 'develop' into rte-fixes Conflicts: src/UserSettingsStore.js src/autocomplete/EmojiProvider.js src/components/views/rooms/MessageComposerInput.js	2017-05-08 17:08:59 +01:00
David Baker	c01e8e85ac	Merge pull request #872 from matrix-org/dbkr/fix_left_panel Fix this/self fail in LeftPanel	2017-05-08 16:40:17 +01:00
David Baker	534f9277d4	Fix this/self fail in LeftPanel	2017-05-08 15:37:40 +01:00
Luke Barnard	39323647d1	Don't show null URL previews These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.	2017-05-08 14:01:44 +01:00
David Baker	3366d3bbae	Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2 Make left panel better for new users (mk II)	2017-05-08 10:37:55 +01:00
Matthew Hodgson	ceb71a4ef6	Merge pull request #866 from t3chguy/warn_on_unload Explicitly save composer content onUnload	2017-05-07 20:07:09 +01:00
Michael Telatynski	a141350670	Explicitly save composer content onUnload small oversight, caught by Matthew Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-07 20:01:55 +01:00
Michael Telatynski	2b2b43a7f3	Content in Composer is not lost on unload so it should be fine to scare the user thinking they have lost all of their content even though when they come back they can cry with joy :D Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-07 18:16:10 +01:00
David Baker	1a0ea29995	Remove redundant role elements	2017-05-05 17:51:14 +01:00
David Baker	4a5821e199	Separate classes for the different buttons Also rename RoleButton to ActionButton because it's not being given a Role any more.	2017-05-05 14:25:18 +01:00
David Baker	f86ca5bc97	Hide empty tips if collapsed	2017-05-04 18:08:04 +01:00
David Baker	72df43d22b	Year	2017-05-04 15:46:24 +01:00
David Baker	306ea58578	Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2	2017-05-04 15:45:05 +01:00
Luke Barnard	d5b49a11d7	Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing Remove DM-guessing code	2017-05-04 14:15:28 +01:00
David Baker	e1c99430cb	Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2	2017-05-04 14:04:22 +01:00
David Baker	ce119a6364	Add buttons to room sub list headers	2017-05-04 13:55:52 +01:00
Luke Barnard	bfa3123f9b	Combine data-scroll-token and -contained-scroll-tokens - Instead of using one attribute, use one that might just contain one token - Use the first token when tracking a child - Mandate that no commas can be in individual tokens	2017-05-04 10:00:13 +01:00
Michael Telatynski	b6fd771b9a	move implementation to MessageComposer to it applies to any future composers Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-03 16:21:35 +01:00
Michael Telatynski	6685cbcb25	make MessageComposerInput (new and old) warn on unload new needs binding due to class this ref being softer couldn't do this nicely in MessageComposer/Input as isTyping wasn't propagated. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-29 06:26:59 +01:00
David Baker	083d5bf463	Other empty sections no longer need to be greyed	2017-04-28 11:20:29 +01:00
David Baker	f5f35e3294	Make the left panel more friendly to new users https://github.com/vector-im/riot-web/issues/3609	2017-04-28 11:10:21 +01:00
Luke Barnard	88abe54ffe	Give the SRH its prop back	2017-04-27 17:58:02 +01:00
Luke Barnard	0b06e979cb	Add optional tintable SVG icon for SimpleRoomHeader	2017-04-27 17:57:13 +01:00
Luke Barnard	63224ff164	Add mx_EventTile_emote class	2017-04-26 18:00:25 +01:00
Michael Telatynski	6cbd04045d	change the now working defaults to what they effectively were when defaultValue was broken (hopefully tests now pass) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-25 22:17:25 +01:00
Michael Telatynski	9ae9aeea07	lets improve forwarding :D ditch double quotes stop caring about rhs state always call hide_right_panel, nop if already hidden use new restore_right_panel to bring it back if it was visible pre-us actually tell things that we sent a message or failed in doing so now the UDE works :D Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 22:14:45 +01:00
Michael Telatynski	ee560a969a	upon forwarding message to current room, explicitly remove clear from aux Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 20:17:29 +01:00
turt2live	e6fd380947	Change redact -> remove for clarity Addresses vector-im/riot-web#2814 Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-24 12:49:09 -06:00
Michael Telatynski	4285c395f5	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into forward_message Conflicts: src/components/structures/RoomView.js	2017-04-24 18:36:33 +01:00
Luke Barnard	74e92d6c23	Remove DM-guessing code	2017-04-24 15:44:45 +01:00
Matthew Hodgson	1347d9fa65	fix scroll behaviour on macs with no gemini	2017-04-24 12:53:53 +01:00
Matthew Hodgson	6f461f0ebb	add in scrollto button	2017-04-24 01:09:57 +01:00
Matthew Hodgson	a2be764681	display err.message to user if available in error msgs	2017-04-23 01:48:27 +01:00
Matthew Hodgson	db996f678c	show better errors when slash commands fail	2017-04-23 01:32:51 +01:00
Matthew Hodgson	0e5006b041	typo	2017-04-22 17:28:28 +01:00
Michael Telatynski	33e841a786	move user settings outward and use built in read receipts disabling Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-22 15:40:29 +01:00
Matthew Hodgson	ba0bb677c8	Merge pull request #817 from turt2live/travis/rw-3626 Change presence status labels to 'for' instead of 'ago'	2017-04-22 01:45:21 +01:00
Matthew Hodgson	304136766d	Merge pull request #816 from t3chguy/ability_to_disable_scalar Disable Scalar Integrations if urls passed to it are falsey	2017-04-22 01:39:20 +01:00
Matthew Hodgson	872d0e0f50	Merge branch 'develop' into travis/hide-read-receipts	2017-04-22 01:36:38 +01:00
Matthew Hodgson	b36eb90a10	Merge pull request #819 from turt2live/travis/no-typing-notifs Add option to not send typing notifications	2017-04-22 01:35:07 +01:00
Matthew Hodgson	1faecfd0f7	fix sticky headers on resize	2017-04-22 01:29:48 +01:00
Matthew Hodgson	ec6a1c4c75	recalculate roomlist when your invites change	2017-04-22 01:16:25 +01:00
turt2live	64e416e117	Add option to not send typing notifications Addresses vector-im/riot-web#3220 Fix applies to both the RTE and plain editor. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 14:50:26 -06:00
turt2live	e4c4adc517	Add option to hide other people's read receipts. Addresses vector-im/riot-web#2526 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 14:28:28 -06:00
turt2live	2d39b59556	Change presence status labels to be more clear. As per vector-im/riot-web#3626 the current labels are unclear. Changing the verbage should make it more clear. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 13:41:37 -06:00
Michael Telatynski	8e9f52e217	Disable Scalar Integrations if urls passed to it are falsey Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 19:46:19 +01:00
Michael Telatynski	589d41e3b9	DRY the code a little bit in anticipation of #813 which sends a `focus_composer` onCancelClick() Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 18:51:49 +01:00
Michael Telatynski	64112da25c	only re-show right panel if it was visible before we were mounted Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 14:13:01 +01:00
Michael Telatynski	b6ca16fc2f	add RoomView state for message being forwarded add RoomView action handler for message forward clear forwardingMessage onCancelClick RoomView change var into const in render RoomView load ForwardMessage from rooms.ForwardMessage if there is a messageForwarding object in state show panel in aux Create ForwardMessage class Modify RoomHeader so that it shows the cancel button more greedily reskindex Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 13:50:22 +01:00
Matthew Hodgson	b0288ebd89	fix stupid typos in RoomList's shouldComponentUpdate	2017-04-21 12:40:13 +01:00
Matthew Hodgson	35a16edccc	oops, actually refresh roomlist when its state changes!	2017-04-20 15:47:59 +01:00
Matthew Hodgson	0d8d3c6710	HOW DID THIS EVER WORK?	2017-04-20 15:15:20 +01:00
Matthew Hodgson	238f59dc87	return the event from RoomTile's onClick to distinguish clicks from keypresses	2017-04-20 14:16:45 +01:00
Matthew Hodgson	e69ea68133	unbreak stack overflow which fires on tests due to mocked timers	2017-04-20 13:53:36 +01:00
Matthew Hodgson	5a3b4b6a60	various bug fixes: don't redraw RoomList when the selectedRoom changes keep passing selectedRoom through to RoomTiles so they have correct initial state handle onAccountData at the RoomList, not RoomTile level Fix some typos	2017-04-20 01:12:57 +01:00
Matthew Hodgson	9f99224a1f	fix bugs from PR review	2017-04-19 17:59:06 +01:00
Matthew Hodgson	fb6252a16b	fix invite highlights take 3	2017-04-19 00:16:17 +01:00
Matthew Hodgson	4a9c168682	fix invite highlights	2017-04-19 00:13:01 +01:00
Matthew Hodgson	abf2300c0d	highlight invites correctly	2017-04-19 00:09:03 +01:00
Matthew Hodgson	093b9a0b52	kick the roomtile on RoomState.members	2017-04-18 23:29:28 +01:00
Matthew Hodgson	8389a67c75	we don't need RoomTile specific focus in the end	2017-04-18 22:54:30 +01:00
Matthew Hodgson	015a4480e2	oops, wire up Room.receipt again, and refresh roomtiles on Room.timeline	2017-04-18 22:36:54 +01:00
Matthew Hodgson	c1c3956df4	fix bugs, and handle shortcircuit react when updating roomtile	2017-04-18 19:28:24 +01:00
Matthew Hodgson	062963b32f	move focus-via-up/down cursors to LeftPanel	2017-04-18 17:49:28 +01:00
Matthew Hodgson	4fb9635175	nudge focus shortcut code further to working	2017-04-18 17:12:42 +01:00
Matthew Hodgson	9591ad31e6	fix bugs, experiment with focus pulling, make it vaguely work	2017-04-18 02:43:29 +01:00
Matthew Hodgson	da569c2c8d	add constantTimeDispatcher and use it for strategic refreshes. constantTimeDispatcher lets you poke a specific react component to do something without having to do any O(N) operations. This is useful if you have thousands of RoomTiles in a RoomSubList and want to just tell one of them to update, without either having to do a full comparison of this.props.list or have each and every RoomTile subscribe to a generic event from flux or node's eventemitter UNTESTED	2017-04-17 21:06:37 +01:00
Matthew Hodgson	691639d1e0	track RoomTile focus in RoomList, and stop the RoomList from updating during mouseOver	2017-04-15 13:25:32 +01:00
Luke Barnard	6010350ce5	Implement power-level changes in timeline Fixes https://github.com/vector-im/riot-web/issues/266	2017-04-06 17:02:35 +01:00
Luke Barnard	106ce90916	Change "Unread messages." to "Jump to first unread message." Also get rid of the "up" arrow so as not to indiciate direction. This is important because in future the RM will not be based on what has been paginated into the client (but instead RM will be handled server-side) and thus we cannot assert any kind of direction on it relative to the events in the viewport.	2017-04-04 16:31:28 +01:00
David Baker	91d10646b5	Merge pull request #775 from matrix-org/luke/fix-RoomList-notif-flashing Improve zeroing of RoomList notification badges	2017-03-28 11:33:38 +01:00
Luke Barnard	4a0988f83e	Do not send the room with action By not sending the room with the action, we prevent its state from being updated by registered views listening for on_room_read	2017-03-28 11:26:40 +01:00
Luke Barnard	f4dc7ae8b1	Improve zeroing of RoomList notification badges Use an action and force an update when zeroing the number of notifications in a room. This is better than waiting for a `render` to happen at some point. This will hopefully fix https://github.com/vector-im/riot-web/issues/3257	2017-03-28 10:38:57 +01:00
David Baker	a38a954fb5	Merge pull request #772 from matrix-org/dbkr/disinvite_is_not_kick Correct confirm prompt for disinvite	2017-03-27 17:42:39 +01:00
David Baker	a3efa45795	Correct confirm prompt for disinvite It should be 'disinvite' not 'kick', and probably doesn't really need a reason.	2017-03-27 16:53:00 +01:00
Luke Barnard	7eb3a776dc	Merge pull request #761 from matrix-org/luke/fix-people-section2 Fix people section DropTarget and refactor Rooms	2017-03-27 15:52:28 +02:00
Luke Barnard	a4b4c3feb8	Read Receipt offset Read receipts were always one read receipt to the left further than they should have been. This fixes that and simplifies the logic.	2017-03-27 14:34:05 +01:00
Luke Barnard	dca02d916a	Merge branch 'develop' into luke/fix-people-section2	2017-03-27 09:45:14 +01:00
Matthew Hodgson	bf8973ad33	avoid leading space in HTML /me too	2017-03-19 21:33:18 +00:00
Lieuwe Rooijakkers	c697b48f99	fix leading extraneous space in emotes	2017-03-19 21:52:24 +01:00
Luke Barnard	7ecabe49d2	Fix people section DropTarget and refactor Rooms - Set the verb for the people section to "tag as direct chat". This requires some CSS modifications to Riot because it's a long bit of text relative to, say, "demote". - Because it's quite useful to be able to set the DM status of a room with just a boolean, add a convenience function for guessing a DM member and setting the DM flag on that room with the resulting member.	2017-03-17 11:59:22 +00:00
Luke Barnard	d4ed9e816b	Display timestamps and profiles for redacted events This is part of fixing https://github.com/vector-im/riot-web/issues/3390	2017-03-16 17:00:10 +00:00
Luke Barnard	ed22a74eaf	Fix People section a bit This does two things: - Sets `editable` to true for the "People" `RoomSubList` so that people can be dragged to favourites. This has the downside that you can drag a "People" to "Rooms", but it won't set the direct chat flag. This is because im.vector.fake.direct != m.direct, sadly. - Sets `alwaysShowHeader` to `true` so that the `IncomingCallDialog` can be showneven when there are no people in `sortedList`. Fixes https://github.com/vector-im/riot-web/issues/2956.	2017-03-16 11:31:47 +00:00
Luke Barnard	5e93dde0dd	Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus Merge the two RoomTile context menus into one	2017-03-14 14:19:36 +00:00
Matthew Hodgson	3aaf37df1a	beautify a tonne more errors	2017-03-12 22:59:41 +00:00
Aviral Dasgupta	8dc7f8efe2	rte: remove logging and fix new history	2017-03-10 21:10:27 +05:30
Aviral Dasgupta	6004f6d610	rte: fix history	2017-03-10 20:34:31 +05:30
Matthew Hodgson	7fb9ce2b78	Merge pull request #744 from matrix-org/luke/add-onclick-permalinks Add onClick to permalinks to route within Riot	2017-03-09 18:29:42 +00:00
Matthew Hodgson	6c7b191577	Merge pull request #605 from SijmenSchoon/feature/pastefiles Add support for pasting files into the text box	2017-03-09 17:55:58 +00:00
Luke Barnard	1f788feacd	Merge the two RoomTile context menus into one This will require riot-web changes https://github.com/vector-im/riot-web/pull/3395	2017-03-09 17:03:57 +00:00
Luke Barnard	c98a2144e9	Merge branch 'develop' into luke/add-onclick-permalinks	2017-03-09 09:59:09 +00:00
Luke Barnard	173daddb04	Comment typo	2017-03-09 09:56:52 +00:00
David Baker	676c5c21c1	Merge pull request #739 from matrix-org/luke/visible-redactions Show message redactions as black event tiles	2017-03-09 09:41:31 +00:00
Luke Barnard	2513bfa612	Add onClick to permalinks to route within Riot	2017-03-08 16:55:44 +00:00
Luke Barnard	b7f1b1a424	Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog Allow user to choose from existing DMs on new chat	2017-03-07 16:22:52 +00:00
Aviral Dasgupta	79f481f81e	rte: special return handling for some block types	2017-03-07 04:40:25 +05:30
Aviral Dasgupta	f5b52fb488	rte: change list behaviour in markdown mode	2017-03-07 04:15:28 +05:30
Aviral Dasgupta	3a07fc1601	fix code-block for markdown mode	2017-03-07 04:09:27 +05:30
Aviral Dasgupta	32dd89774e	add support for autocomplete delay	2017-03-07 04:09:26 +05:30
Aviral Dasgupta	2d39b25334	turn off force complete when editor content changes	2017-03-07 04:09:26 +05:30
Aviral Dasgupta	5fbe06ed91	force editor rerender when we swap editorStates	2017-03-07 04:09:26 +05:30
Aviral Dasgupta	46d30c378d	fix tab focus issue in MessageComposerInput onTab was incorrectly implemented causing forceComplete instead of focusing the editor	2017-03-07 04:09:26 +05:30
Aviral Dasgupta	aaac06c6d3	run eslint --fix over MessageComposerInput	2017-03-07 04:09:25 +05:30
Aviral Dasgupta	48376a32c2	refactor: MessageComposer.setEditorState to overridden setState The old approach led to a confusing proliferation of repeated setState calls.	2017-03-07 04:09:25 +05:30
Aviral Dasgupta	f4c0baaa2f	refactor MessageComposerInput: bind -> class props	2017-03-07 04:09:25 +05:30
Luke Barnard	391886cac4	Remove dis as a dep in RoomTile	2017-03-06 17:45:25 +00:00
Luke Barnard	bf348a0f78	Instead of listening for view_room, use a callback But make sure that nothing other than the callback is done when RoomTile is clicked.	2017-03-06 17:44:29 +00:00
Luke Barnard	04510da057	Clarify "No devices" message	2017-03-06 16:01:22 +00:00
Luke Barnard	c0fc3ba3fe	Make redactions appear when the event has been redacted (on Room.redaction)	2017-03-06 14:20:24 +00:00
Luke Barnard	5ef61b7c35	Only show a redaction tile for messages	2017-03-03 16:45:29 +00:00
Luke Barnard	6c32e3720b	Remove seemingly unused "bounce"	2017-03-03 15:51:14 +00:00
Luke Barnard	2bd9885288	Start to show redacted events	2017-03-03 15:42:24 +00:00
Luke Barnard	ca5c2fb82e	Allow user to choose from existing DMs on new chat When creating a new chat with one person, show a dialog that asks the user whether they'd like to use an existing chat or actually create a new room. Fixes https://github.com/vector-im/riot-web/issues/2760	2017-03-03 13:48:37 +00:00
Luke Barnard	923ea9c6aa	Change timestamp permalinks to matrix.to	2017-03-03 10:42:44 +00:00
David Baker	95cff17698	Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog Show UDDialog on UDE during VoIP calls	2017-03-02 13:13:45 +00:00
Luke Barnard	5be2c62011	Fix a couple of issues with RRs - Shift to the left _before_ adding an avatar so that there are always `MAX_READ_AVATARS` visible, instead of there being `MAX_READ_AVATARS + 1` avatars displayed following the first "collapse". - Use `right` instead of `left` so that double-digit remainders don't get overlapped.	2017-02-27 11:16:13 +00:00
Luke Barnard	8bd42693f7	Fix message composer placeholders	2017-02-23 09:05:26 +00:00
Luke Barnard	799e5ee0e9	Less jargon	2017-02-22 14:40:07 +00:00
Luke Barnard	878e31eba2	Show UDDialog on m.call.invite failure Requires https://github.com/matrix-org/matrix-js-sdk/pull/378 Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.	2017-02-21 17:22:22 +00:00
Luke Barnard	fd146a732b	Clarify non-e2e vs. e2e /w composers placeholder For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.	2017-02-21 15:33:44 +00:00
David Baker	db4b9691cc	Support reasons for kick / ban Don't ban me for fun, girl Let me be the one, girl Ban me for a reason Let the reason be love.	2017-02-17 17:27:46 +00:00
David Baker	b18473ccb2	Handle there being no member event when banned Here, and also in MemberEventListSummary where this also broke.	2017-02-17 16:35:18 +00:00
David Baker	1f5fdf7945	Get a member object, not the user object	2017-02-17 16:14:51 +00:00
David Baker	a3aea6ba2d	Swap rejoin / forget	2017-02-17 16:11:20 +00:00
David Baker	9f9de46b10	Add onForgetClick proptype	2017-02-17 16:09:25 +00:00
David Baker	de4773ba93	Show when you've been kicked or banned Update the room state when you've been kicked or banned, and show a message in the preview bar, including the reason.	2017-02-17 15:50:30 +00:00
David Baker	8698d40d3c	Fix docs & add MatrixClient check Addresses PR feedback without breaking RoomSettings	2017-02-15 19:01:00 +00:00
David Baker	a5a056292d	Revert `c082827fc7` Revert the WithMatrixClient change: RoomView calls methods on the RoomSettings component and this breaks when RoomSettings is wrapped in a WithMatrixClient.	2017-02-15 18:58:59 +00:00
David Baker	c082827fc7	Fix docs & use WithMatrixClient	2017-02-15 17:58:50 +00:00
Richard van der Hoff	42bb26925d	Merge branch 'develop' into dbkr/add_unban_button	2017-02-15 13:19:22 +00:00
Richard van der Hoff	a5325ee14a	Merge pull request #697 from matrix-org/dbkr/missed_accessiblebuttons Convert some missed buttons to AccessibleButton	2017-02-15 13:10:14 +00:00
David Baker	431e7a875d	Copyright	2017-02-14 18:10:40 +00:00
David Baker	87516fb950	Add a button to un-ban users in RoomSettings https://github.com/vector-im/riot-web/issues/3091	2017-02-14 17:54:57 +00:00
David Baker	e1cb34e255	Merge remote-tracking branch 'origin/develop' into dbkr/missed_accessiblebuttons	2017-02-14 17:45:30 +00:00
David Baker	6fc70415cb	s/onBan/onBanOrUnban/	2017-02-14 17:29:40 +00:00
David Baker	f38b2dee78	Convert some missed buttons to AccessibleButton In RoomSettings	2017-02-14 17:06:16 +00:00
David Baker	a1c990a2ea	Make ban either ban or unban depending on whether the user is banned already Mostly gives some feedback that the ban has actually taken effect.	2017-02-14 16:03:30 +00:00
David Baker	5e232d8500	Argh, ES6 import syntax	2017-02-14 14:33:21 +00:00
David Baker	ff61b76bf7	Fix imports	2017-02-14 13:58:29 +00:00
David Baker	689972f023	Copyright	2017-02-14 13:57:22 +00:00
David Baker	8001c0b16b	Add confirmation dialog to kick/ban buttons Add a specific dialog used for confirming member actions. Also remove onFinished from MemberInfo which did absolutely nothing.	2017-02-14 13:40:19 +00:00
Matthew Hodgson	231997dd63	unbreak /markdown off	2017-02-09 01:18:09 +00:00
Richard van der Hoff	484d9d708e	Logging to try to track down riot-web#3148 Since I can't figure out how this is happening, add a shedload of logging to try to pin it down.	2017-02-06 16:01:25 +00:00
Richard van der Hoff	3ea746db1d	Fix RoomSettings Don't enable encryption unless the box is checked!	2017-02-03 11:20:36 +00:00
Matthew Hodgson	be41462f3a	merge	2017-02-02 22:05:44 +00:00
Matthew Hodgson	d567b3bb6a	fix 'show rightpanel' button alt text & icon	2017-02-02 18:27:21 +00:00
Matthew Hodgson	e45ac36a3b	Merge pull request #635 from matrix-org/matthew/warn-unknown-devices very barebones support for warning users when rooms contain unknown devices	2017-02-02 18:08:18 +00:00
David Baker	b561b711df	Fix expanding/unexapnding read receipts Make the AccessibleButton element be the img directly rather than wrapping it in a div which is unnecessary and breaks the rendering. Fixes https://github.com/vector-im/riot-web/issues/3052	2017-02-02 17:36:26 +00:00
Richard van der Hoff	68f644c824	Merge pull request #669 from matrix-org/dbkr/read_receipt_title Make read receipt's titles more explanatory	2017-02-02 15:25:45 +00:00
David Baker	c5b752cac1	Make read receipt's titles more explanatory Throwing this one in a suggestion while I'm in the area: I think this would help people understand what the read receipt avatars are.	2017-02-02 15:08:18 +00:00
Matthew Hodgson	1c4c80cc5f	boldify the preview bar click	2017-02-02 13:32:19 +00:00
Matthew Hodgson	211be5752c	try to make joining rooms more obvious	2017-02-02 13:32:07 +00:00
Matthew Hodgson	5e5b7f89f4	support scrollable content for UnknownDeviceDialog	2017-02-02 00:25:49 +00:00
Richard van der Hoff	67bd2cf9dd	Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified	2017-01-26 14:09:25 +00:00
Richard van der Hoff	70190be65c	Factor out common onSendMessageFailed	2017-01-25 22:23:21 +00:00
Richard van der Hoff	5538ce7c30	Merge branch 'develop' into matthew/warn-unknown-devices	2017-01-25 22:22:50 +00:00
Richard van der Hoff	a2dd1fa0a9	Merge branch 'develop' into matthew/warn-unknown-devices	2017-01-25 16:44:03 +00:00
Richard van der Hoff	21f3aeac8e	Revert accidental change This was an unrelated change which is being done on another branch anyway	2017-01-25 16:40:27 +00:00
Richard van der Hoff	5099f07562	Fix dark theme styling of roomheader cancel button	2017-01-25 16:33:29 +00:00
Richard van der Hoff	55dc2e0161	Factor out common CancelButton	2017-01-25 16:32:06 +00:00
Richard van der Hoff	770820e6fa	Fix a bunch of lint complaints	2017-01-24 22:41:52 +00:00
Richard van der Hoff	72492fd909	Fix broken merge I messed up the merge in `6dd46d5`.	2017-01-24 20:55:10 +00:00
Richard van der Hoff	6dd46d532a	Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux	2017-01-24 20:47:24 +00:00
Matthew Hodgson	7bc3fc8696	make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020	2017-01-22 01:28:43 +01:00
Matthew Hodgson	d9c0513ee2	make it work	2017-01-21 22:49:29 +01:00
Matthew Hodgson	071e364be2	improve the verify warning if blacklisting is unabled	2017-01-21 17:56:48 +00:00
Matthew Hodgson	c618880af9	oops	2017-01-21 17:43:46 +00:00
Matthew Hodgson	3071fc0ddc	UI for blacklisting unverified devices per-room & globally (written blind; untested as yet)	2017-01-21 17:39:39 +00:00
Matthew Hodgson	2e15e8f9b4	very barebones support for warning users when rooms contain unknown devices	2017-01-21 05:13:36 +00:00
Matthew Hodgson	937f13d578	fix a bunch of dark-theme buttons	2017-01-20 21:00:22 +00:00
David Baker	18d4d3392a	Fix a bunch of linting errors eslint --fix and a few manual ones	2017-01-20 14:22:27 +00:00
Matthew Hodgson	b76b0f755d	fix context menu bg	2017-01-20 02:47:47 +00:00
Richard van der Hoff	ba2460aef4	Merge pull request #618 from matrix-org/rav/async_dialog Allow Modal to be used with async-loaded components	2017-01-19 16:08:30 +00:00
Kegsay	89fa47dc26	Merge pull request #622 from kyrias/commonmark-fix-escaping Fix escaping markdown by rendering plaintext	2017-01-19 13:39:07 +00:00
Johannes Löthberg	9c1c657a1e	Markdown: delete remaining pre-split relics Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-19 11:55:36 +01:00
Johannes Löthberg	30bd01cdf2	Markdown: Split up render function into toHTML/toPlaintext Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-18 19:29:11 +01:00
Johannes Löthberg	c819b433a2	Make old message composer use new markdown Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-17 20:37:27 +01:00
Johannes Löthberg	893a5c971f	Fix escaping markdown by rendering plaintext We still need to parse "plaintext" messages through the markdown renderer so that escappes are rendered properly. Fixes vector-im/riot-web#2870. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-17 16:23:58 +01:00
Matthew Hodgson	a18d94099e	switch to using <span/> for edit button	2017-01-17 14:11:15 +00:00
Richard van der Hoff	ac22803ba0	Allow Modal to be used with async-loaded components Add Modal.createDialogAsync, which can be used to display asynchronously-loaded React components. Also make EncryptedEventDialog use it as a handy demonstration.	2017-01-16 17:18:38 +00:00
Jani Mustonen	959163f2ef	Proper accessible buttons	2017-01-13 19:36:41 +02:00
Jani Mustonen	041196d729	Added quick search functionality	2017-01-13 19:36:40 +02:00
Jani Mustonen	d2ff2715ce	Buttonified almost everything. Stylesheet is broken.	2017-01-13 19:36:40 +02:00
Jani Mustonen	8d79716421	Turned the links to buttons to comply with MDN's recommendations	2017-01-13 19:36:40 +02:00
Jani Mustonen	ad072cc179	Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons.	2017-01-13 19:36:40 +02:00
Kegan Dougal	dcd0acb2b5	Review comments	2017-01-13 15:17:34 +00:00
Kegan Dougal	e196cfaf91	Show the error dialog when requests to PUT power levels fail This is why I dislike Q.	2017-01-13 14:51:01 +00:00
Sijmen Schoon	ef88e02931	Add support for pasting into the text box Only supports the new rich-text-supporting text editor	2017-01-08 02:21:36 +01:00
Daniel Dent	7c841a86ef	Unbranded error messages	2016-12-21 14:28:01 -08:00
Matthew Hodgson	d0d056e308	hide read markers	2016-12-20 02:26:23 +00:00
Kegan Dougal	5d99d68a64	Show the full date and time if the receipt was sent days after the event	2016-12-09 11:43:23 +00:00
Kegan Dougal	49010c3e93	Refactor how 'readReceipts' are passed into EventTiles Instead of passing a list of RoomMembers, pass a list of records with a `roomMember` prop and a `ts` prop so we can display the timestamp on hover.	2016-12-09 11:24:10 +00:00
Kegan Dougal	bd7553d1ea	Add read receipt times to the hovertip of read markers Fixes #2709. Surprisingly, this data was never passed down to ReadReceiptMarker.	2016-12-08 16:23:20 +00:00
Johannes Löthberg	f321c6c346	Strip (IRC) when clicking on username Fixes vector-im/riot-web#2072. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2016-12-03 01:20:50 +01:00
Richard van der Hoff	c7fb83ed2d	s/block/blacklist for e2e Fixes https://github.com/vector-im/vector-web/issues/2315	2016-11-29 18:48:43 +00:00
Richard van der Hoff	06f12b91b8	Merge pull request #566 from matrix-org/rav/remove_dead_labs_settings Get rid of always-on labs settings	2016-11-21 10:38:06 +00:00
Richard van der Hoff	4476b09ce7	Get rid of always-on labs settings If the setting is on by default, it's not much use as a Labs setting. The E2e setting was only confusing everyone anyway.	2016-11-21 10:25:48 +00:00
Richard van der Hoff	03988015aa	Fix 'Quote' for e2e messages Fixes https://github.com/vector-im/vector-web/issues/2612	2016-11-21 09:19:40 +00:00
Matthew Hodgson	2e691240ae	fix e2e disclaimer	2016-11-19 02:44:36 +02:00
David Baker	218ced0276	Merge pull request #557 from matrix-org/rav/show_padlock_on_unencrypted_room Show an open padlock for unencrypted rooms	2016-11-16 13:03:52 +00:00
Richard van der Hoff	a3d4ed5aee	Show an open padlock for unencrypted rooms Also, add a tooltip, and enlarge the img to 12px wide, because the open padlock looked silly at 10px and they both look fine at 12px	2016-11-15 12:31:17 +00:00
Richard van der Hoff	b209cc551e	Update eventtiles when the events are decrypted Events are sometimes decrypted after they arrive, so add an eventlistener for it and update the tile.	2016-11-15 11:12:52 +00:00
Richard van der Hoff	0e8a49ebb7	Update EventTile to use WithMatrixClient instead of MatrixClientPeg	2016-11-14 16:00:24 +00:00
Luke Barnard	d8bc4d9a6f	Factor out avatar click leads to view_user	2016-11-10 15:18:59 +00:00
Luke Barnard	de83e578e7	Use generic error message	2016-11-08 11:18:44 +00:00
Luke Barnard	c0c662aeaf	Show the error that occured when trying to reach scalar Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.	2016-11-08 10:57:48 +00:00
Richard van der Hoff	ab7007784f	Make MemberInfo use the matrixclient from the context An arbitrary component to demonstrate how this works	2016-11-03 19:05:48 +00:00
David Baker	a2eb0a9cf0	Fix CPU spin on joining rooms Ratelimit roomheader's updates and move some other things into rate limited functions.	2016-10-26 13:09:53 +01:00
Aviral Dasgupta	022eb575d9	Upgrade to babel6 and enable some presets.	2016-10-17 16:23:25 +01:00
David Baker	5b4b81f7dc	Revert "Switch to babel 6"	2016-10-14 18:49:52 +01:00
David Baker	eadb55c6b0	Merge branch 'babelrc' of https://github.com/aviraldg/matrix-react-sdk into aviraldg-babelrc	2016-10-12 14:03:21 +01:00
Richard van der Hoff	78c3d5943a	Fix a load of warnings in the tests Stub things out to make the tests not throw warnings, so we can see the actual problems.	2016-10-11 14:20:40 +01:00
Matthew Hodgson	9d303712f2	more s/Vector/Riot/	2016-10-03 10:18:43 +01:00
Aviral Dasgupta	2d173d83b9	Upgrade to babel6 and enable some presets.	2016-10-02 17:27:45 +05:30
Richard van der Hoff	302074c71f	Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined Prevent error when clicking 'log in'	2016-09-30 11:04:18 +01:00
Matthew Hodgson	ca5204c3f8	fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381	2016-09-30 00:17:52 +01:00
David Baker	7b28dde263	Prevent error when clicking 'log in' If you joined a room before clicking 'log in', it would throw an exception here and break.	2016-09-29 16:57:10 +01:00
David Baker	60ce49910a	Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper Make RTE mode use the new Markdown wrapper class	2016-09-29 15:33:18 +01:00
Matthew Hodgson	b366973151	let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585	2016-09-27 23:39:25 +01:00
David Baker	690309adfc	Bring back the little green men without slowness Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.	2016-09-26 18:02:14 +01:00
David Baker	bbfc05b0c0	Fix name of text emote sending & fix tests	2016-09-26 10:20:56 +01:00
Matthew Hodgson	40ba1ff5aa	disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343	2016-09-24 00:43:46 +01:00
David Baker	bf037ed6c7	Add comment	2016-09-23 19:09:32 +01:00
David Baker	db3f0d298a	Make RTE mode use the new Markdown wrapper class Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode	2016-09-23 18:50:25 +01:00
David Baker	d0a15975c8	Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive Make markdown less aggressive	2016-09-23 14:31:20 +01:00
Richard van der Hoff	dd2da20031	Add the deviceId back to memberdeviceinfo It was removed by @ara4n in `5fa5489`, but it's still useful!	2016-09-22 19:28:50 +01:00
Richard van der Hoff	2f7b4f74fd	Move the device verification buttons to their own class Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog for utterly no reason and breaking everything	2016-09-22 19:24:09 +01:00
David Baker	de0c92dadf	Remove unused code	2016-09-22 18:37:14 +01:00
David Baker	6c7259eec8	Better detection of when input contains markdown	2016-09-22 17:18:12 +01:00
David Baker	898fbcee30	Merge pull request #489 from aviraldg/fix-2128 Force-hide autocomplete after sending message.	2016-09-22 10:49:23 +01:00
David Baker	b83d1db24a	Missed some Vectors	2016-09-21 14:03:35 +01:00
Aviral Dasgupta	f171985e4c	Fix click-to-complete in RTE Closes vector-im/vector-web#2179	2016-09-21 07:40:48 +05:30
Aviral Dasgupta	44217422d0	Force-hide autocomplete after sending message. Fixes vector-im/vector-web#2128	2016-09-21 07:28:07 +05:30
Matthew Hodgson	a2904ad33f	fix 'new chat' layout bug	2016-09-20 10:06:57 -04:00
Matthew Hodgson	b348cf1244	actually apply scalar CSS :(	2016-09-19 07:01:46 -04:00
Matthew Hodgson	7691559e01	more disclaimer	2016-09-17 22:07:43 +01:00
Matthew Hodgson	53bb6b96ce	don't warn when disabling crypto	2016-09-17 21:56:10 +01:00
Matthew Hodgson	5fa5489bbd	disambiguate devices by ID in memberinfo	2016-09-17 20:12:56 +01:00
Matthew Hodgson	88273e8065	move admin tools to the top	2016-09-17 15:07:41 +01:00
Matthew Hodgson	0046ae50b5	switch to 3-digit formatting for counts	2016-09-17 02:39:19 +01:00
Matthew Hodgson	cfba600961	Merge pull request #482 from aviraldg/fix-2165 Replace <p>s with <br/>s consistently	2016-09-16 22:46:41 +01:00
Aviral Dasgupta	6befb09509	Replace <p>s with <br/>s consistently Also, allow newlines in /commands. Fixes vector-im/vector-web#2114, vector-im/vector-web#2165.	2016-09-16 21:40:00 +05:30
Matthew Hodgson	e1bd97d509	don't try to set DM data for guests	2016-09-16 16:15:34 +01:00
Matthew Hodgson	b852756332	DM title	2016-09-16 14:35:43 +01:00
Matthew Hodgson	2c7c382d56	stop continuations leaking on filepanel	2016-09-16 02:40:09 +01:00
Matthew Hodgson	77595320a7	close the RoomSettings when you close Scalar	2016-09-15 22:56:12 +01:00
Matthew Hodgson	3fcea1bfc7	only apply verified css to genuinely verified tiles	2016-09-15 22:56:12 +01:00
Matthew Hodgson	b98c2ae25e	update crypto state of the room in realtime when turned on	2016-09-15 19:25:53 +01:00
Matthew Hodgson	1899d61893	textual event for m.room.encryption	2016-09-15 17:01:02 +01:00
Matthew Hodgson	db66d728c9	more e2e disclaimers	2016-09-15 16:38:37 +01:00
Matthew Hodgson	70011410cf	Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning Wmwragg/correct incoming call positioning	2016-09-15 15:59:06 +01:00
wmwragg	d3f50dc2da	Tweaking the positoning of the incomingCallBox	2016-09-15 15:33:08 +01:00
wmwragg	45f17eb973	Added incomingCallBox to header and removed from roomTile	2016-09-15 14:39:34 +01:00
wmwragg	faa39eb482	Removed the nolonger used InviteMemberList	2016-09-15 11:39:59 +01:00
wmwragg	0d4eb4d22c	Removed all the InviteMemberList from the MemberList, and added a srearch box	2016-09-15 11:31:49 +01:00
Matthew Hodgson	f95a74951e	label device IDs	2016-09-15 02:49:25 +01:00
Matthew Hodgson	ce655c7f50	improve device info	2016-09-15 02:44:55 +01:00
Matthew Hodgson	8bda0bb095	basic verification UI	2016-09-15 01:55:51 +01:00
Matthew Hodgson	d8770b2b41	oops	2016-09-15 00:49:10 +01:00
Matthew Hodgson	499783d697	hide room settings when you launch scalar if you haven't made changes	2016-09-15 00:43:38 +01:00
wmwragg	6a91948469	Removed the Email (Invite by email) section	2016-09-14 18:01:07 +01:00
Matthew Hodgson	2752d6b444	improve e2e and scalar settings UI	2016-09-14 02:07:37 +01:00
Matthew Hodgson	0473b14564	fix e2e icon transitions	2016-09-14 01:25:43 +01:00
Matthew Hodgson	fd707f6f62	s/Direct Messages/People/	2016-09-13 19:47:41 +01:00
Matthew Hodgson	17cf2fc745	Merge pull request #470 from matrix-org/matthew/right-panel-collapse Matthew/right panel collapse	2016-09-13 19:09:18 +01:00
Matthew Hodgson	eb6a4f97ba	make it work	2016-09-13 19:00:35 +01:00
Matthew Hodgson	8bb9422907	Merge pull request #466 from aviraldg/feature-autocomplete-behaviour Improve autocomplete behaviour	2016-09-13 16:17:23 +01:00
Aviral Dasgupta	79e5e6f6fe	Fix force completion and hide rooms with no alias	2016-09-13 18:02:33 +05:30
Matthew Hodgson	32b1b6f58a	WIP	2016-09-13 13:12:45 +01:00
Matthew Hodgson	c8def540c4	Merge pull request #464 from remram44/remove-mdown-breaks Remove markdown line breaks	2016-09-13 13:11:18 +01:00
Aviral Dasgupta	9a991a4dfd	Autocomplete fixes and improvements	2016-09-13 17:30:29 +05:30
Matthew Hodgson	3b52081092	wip for collapsable RHS	2016-09-13 12:18:22 +01:00
Aviral Dasgupta	fbf2d5f96c	Fix tests (wip)	2016-09-13 16:46:20 +05:30
Aviral Dasgupta	b62622a814	Improve autocomplete behaviour Fixes vector-im/vector-web#1761	2016-09-13 15:46:02 +05:30
Matthew Hodgson	9b7ab46a72	dedicated dialog box for E2E messages	2016-09-12 23:42:24 +01:00
Remi Rampin	8cab40d987	Disable markdown line breaks Stop combinations of - and _ turning into a line break.	2016-09-12 17:51:59 -04:00
Matthew Hodgson	5a548c3d12	add an onclick to the e2e icons	2016-09-12 18:50:52 +01:00
David Baker	f6478f111a	Merge pull request #458 from matrix-org/dbkr/createdoom_dm Update createRoom to support creating DM rooms	2016-09-12 18:29:43 +01:00
Matthew Hodgson	13eed6cd39	fix NPE in EventTile	2016-09-12 17:29:26 +01:00
Matthew Hodgson	9eae1c5bb7	final e2e icons	2016-09-12 16:51:19 +01:00
David Baker	937e195157	Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm	2016-09-12 16:44:44 +01:00
Matthew Hodgson	3a1159ce12	e2e look & feel	2016-09-12 01:37:51 +01:00
Matthew Hodgson	e6b4b8c1cb	bring back small avatars for info msgs otherwise the design breaks	2016-09-11 23:01:20 +01:00
Matthew Hodgson	46205ad83c	back out small avatars for emotes for now as they conflict with the E2E artwork. they will be reintroduced once we have lozenges	2016-09-11 22:49:05 +01:00
Matthew Hodgson	83209197f4	Merge branch 'develop' into matthew/notif-panel	2016-09-11 02:38:16 +01:00
Matthew Hodgson	34bb37aaba	layout for file & notif panel	2016-09-11 02:14:27 +01:00
Matthew Hodgson	bae6409edb	show badge menu on RoomTile hoverover	2016-09-11 00:30:43 +01:00
David Baker	96fabe09d2	Update createRoom to support creating DM rooms * Make ChatInviteDialog and MemberInfo createRoom use it * Fix bug in setDMRoom	2016-09-09 19:25:00 +01:00
David Baker	9cff4d59ca	Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section Don't always show DM rooms in Direct Messages	2016-09-09 17:35:02 +01:00
David Baker	78f53bd403	Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms Add DM rooms with that person to the MemberInfo panel	2016-09-09 17:30:32 +01:00
David Baker	4c5db7cc9f	Don't always show DM rooms in Direct Messages Favourites belong in favourites & parted ones belong in Historical, etc.	2016-09-09 17:23:15 +01:00
Matthew Hodgson	fed3f48297	Merge pull request #452 from aviraldg/test-rte Add some tests for the rich text editor	2016-09-09 17:16:04 +01:00
David Baker	6f2e0a4cdf	Make rooms in MemberInfo update when necessary Factor out the chunk of code that looks through a read receipt event to see if it contain a read receipt from a given user, now we use it in 2 places.	2016-09-09 16:59:59 +01:00
David Baker	590d6d3ee8	Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms	2016-09-09 16:22:48 +01:00
David Baker	aa0f15c46e	List common rooms in MemberInfo	2016-09-09 16:15:01 +01:00
Matthew Hodgson	4de0e19ef3	Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators Wmwragg/one to one indicators	2016-09-09 15:08:48 +01:00
wmwragg	a6b0a7d5dc	Should supply the roomId	2016-09-09 15:01:40 +01:00
wmwragg	17b75a589f	Added the little green men for direct message rooms	2016-09-09 14:36:51 +01:00
Aviral Dasgupta	fec1e4d4c1	Add some tests for the rich text editor	2016-09-09 18:07:42 +05:30
Richard van der Hoff	b724b0c6b6	Update MemberDeviceInfo display Show the displayname when we have it Show the deviceid in a tooltip Show the Ed25519 public key to help verify	2016-09-09 11:41:56 +01:00
Matthew Hodgson	904348e62a	Merge branch 'develop' into matthew/notif-panel	2016-09-09 11:12:52 +01:00
Matthew Hodgson	dce2dd36ec	Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat Wmwragg/one to one chat	2016-09-09 10:46:11 +01:00
wmwragg	840bfe84c1	Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters	2016-09-09 06:57:30 +01:00
Matthew Hodgson	db61d8e8ad	another null check	2016-09-09 02:28:14 +01:00
Matthew Hodgson	4aef352a5c	update to use new API based on js-sdk PR input	2016-09-08 22:48:44 +01:00
David Baker	c9475e2ae5	Merge pull request #449 from matrix-org/dbkr/toggle_dm_room API for (un)marking rooms as DM rooms	2016-09-08 14:11:22 +01:00
Matthew Hodgson	b0a4b017c3	Merge pull request #440 from aviraldg/feature-rte-formatbar Formatting toolbar for RTE message composer.	2016-09-08 13:54:26 +01:00
Aviral Dasgupta	8da7b98ad0	RTE: Remove dead code, fix <del> styling	2016-09-08 11:21:39 +05:30
Matthew Hodgson	b4c1eca1c5	fix key warning	2016-09-07 22:54:37 +01:00
Matthew Hodgson	820cd579d8	fix stupid double-spacing issue	2016-09-07 22:54:37 +01:00
Aviral Dasgupta	c11232742b	Fix focus and toggling issues in formatting bar	2016-09-08 02:46:56 +05:30
Aviral Dasgupta	8974442084	Hide empty autocomplete and remove word counter	2016-09-08 00:43:10 +05:30
Aviral Dasgupta	802ec1169f	Fix Markdown conversion to not add extra \n Fixes vector-im/vector-web#2094	2016-09-08 00:03:55 +05:30
Aviral Dasgupta	f0f20beae0	RTE format bar enhancements	2016-09-08 00:03:54 +05:30
Aviral Dasgupta	0c0c44b050	Formatting toggle, markdown indicator, quoting Fixes vector-im/vector-web#1825	2016-09-08 00:02:55 +05:30
Aviral Dasgupta	71251293e4	RTE formatbar (wip) Fixes vector-im/vector-web#2024	2016-09-08 00:02:16 +05:30
David Baker	ec4086c5fc	API for (un)marking rooms as DM rooms	2016-09-07 17:46:45 +01:00
wmwragg	7dfb8857d8	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-07 17:22:10 +01:00
David Baker	df1cc8748f	Change references to MatrixTools to Rooms or remove where they were unused	2016-09-07 11:33:58 +01:00
David Baker	094080629d	Actually commit changed path	2016-09-07 10:19:39 +01:00
David Baker	d5b23e9e0e	Save guessed DM rooms to account data Also bugfix	2016-09-06 17:43:39 +01:00
David Baker	8401323156	Hopefully read DM rooms from account data	2016-09-06 16:39:21 +01:00
David Baker	50ef695740	Fix: conference rooms were no longer hidden	2016-09-05 17:42:22 +01:00
wmwragg	9c0f51fb82	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-05 12:06:31 +01:00
Richard van der Hoff	31e09e6137	Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user Make MemberInfo to use client.getStoredDevicesForUser	2016-09-05 10:38:24 +01:00
Kegsay	6e2fd85760	Merge pull request #437 from matrix-org/kegan/starter-links Implement starter link support	2016-09-05 09:10:39 +01:00
Richard van der Hoff	fc40bdcbfc	Make MemberInfo to use client.getStoredDevicesForUser It's more powerful than listDeviceKeys, and isn't deprecated.	2016-09-05 00:08:16 +01:00
Richard van der Hoff	a316c652b7	Convert MemberDeviceInfo to ES6 class	2016-09-04 21:49:06 +01:00
wmwragg	f9ab2fa957	When zoomed in, the sticky headers should correctly position themselves	2016-09-04 08:01:04 +01:00
wmwragg	721baf8d42	Tolltip tweak to not require the passing in of the parent	2016-09-04 07:42:09 +01:00
Richard van der Hoff	bc8e7724e8	Make the 'encrypt this room' knob be megolm	2016-09-03 18:42:54 +01:00
wmwragg	03e74f48f8	Positioned Tooltip better	2016-09-03 13:44:44 +01:00
Matthew Hodgson	fdfd6ecfd9	let users join confs as voice or video	2016-09-03 13:27:46 +01:00
wmwragg	405dcf76eb	Further tweaks to the tooltip to better handle its position, and simplify it's use	2016-09-03 12:44:55 +01:00
wmwragg	bffefd9261	Tweak of the RoomTooltip to use DOM element for the parent rather than a React component	2016-09-02 18:41:44 +01:00
Kegan Dougal	45ada1887d	Implement starter link support This involves modal dialogs because browsers are terrible.	2016-09-02 16:36:43 +01:00
Kegan Dougal	6ec7e5df28	Move scalar auth stuff to ScalarAuthClient from RoomSettings	2016-09-02 16:03:24 +01:00
wmwragg	4c05edb71b	Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari	2016-09-02 15:47:40 +01:00
Matthew Hodgson	f9d8829ba2	let you join confs either as voice or video	2016-09-02 15:38:28 +01:00
Matthew Hodgson	5543c126e6	fix tests	2016-08-30 15:22:52 +01:00
wmwragg	c30ff57c62	Better comments	2016-08-30 12:29:25 +01:00
wmwragg	8061a2f279	Fixed historical scetion not scrolling up when clicked if not hidden and stuck	2016-08-30 11:55:51 +01:00
wmwragg	769e7d3b2e	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-30 11:19:54 +01:00
wmwragg	83c4fd4b2f	Code clean up, and better comments	2016-08-30 10:45:17 +01:00
wmwragg	2b1ed707c4	Better comments, and correct bottom header sticky calc to allow clicking	2016-08-28 19:18:41 +01:00
wmwragg	123d9b56c8	calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars	2016-08-28 16:25:20 +01:00
wmwragg	8f7d3394e6	Always setup stickies, even if we aren't going to use them so that the following map can fire	2016-08-28 12:02:20 +01:00
wmwragg	7631539584	Fixed incorrect init calculation of originalPosition attribute	2016-08-28 11:39:47 +01:00
Matthew Hodgson	50d09f73f5	add leave/forget button to RoomSettings	2016-08-28 00:00:22 +01:00
wmwragg	73dd05b01d	Corrected incorrect offset from top of window for the scrollArea	2016-08-26 18:31:02 +01:00
wmwragg	8ccb1d482a	Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck	2016-08-26 15:52:57 +01:00
wmwragg	5f9c794f0c	Tweaking autoscroll to only adjust if header stuck at top and not at bottom	2016-08-26 15:36:16 +01:00
wmwragg	b9e95865af	Click on stuck header scrolls to that header, collapses expands for none stuck header	2016-08-26 15:09:13 +01:00
wmwragg	71e829fd32	Getting click to not collapse expand when header is stuck	2016-08-26 14:36:39 +01:00
wmwragg	774e24a3b4	Added some logic to turn off sticky headers when the scroll area isn't large enough to support them	2016-08-26 11:01:04 +01:00
wmwragg	c8c2f733e2	Re-calculate sticky header positions when sublist header is clicked	2016-08-26 09:56:07 +01:00
wmwragg	7fcdd0f77a	Initial pass at sticky headers for the LHS panel section labels	2016-08-25 19:46:01 +01:00
Richard van der Hoff	c8b2d5106f	Merge pull request #430 from matrix-org/rav/fix_search_regression Fix NPE when we don't know the sender of an event	2016-08-25 19:31:16 +01:00
Richard van der Hoff	96567dad0d	Fix NPE when we don't know the sender of an event Fixes a bug introduced in https://github.com/matrix-org/matrix-react-sdk/pull/426. Particularly when we are showing search results, we may not recognise the sender of an event; attempting to create a MemberAvatar for it will lead to null-reference errors. Also a bit of untangling of the logic of needsSenderProfile. Since https://github.com/matrix-org/matrix-react-sdk/pull/422, EventTileType.needsSenderProfile was only being called on MessageEvents, and therefore only returned true. It's a shame to see all this logic going into EventTile rather than the individual EventTileTypes, but since it's there, let's not leave the unused logic lying around in the EventTileType implementations.	2016-08-25 16:55:09 +01:00
Matthew Hodgson	36d8fa9786	fix avatar clicking in memberinfo	2016-08-25 16:20:38 +01:00
Matthew Hodgson	2f0599aae1	Merge pull request #419 from aviraldg/feature-autocomplete-improvements Update autocomplete design and scroll it correctly	2016-08-24 14:47:22 +01:00
Matthew Hodgson	08c0d7e298	Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation Added event/info message avatars back in	2016-08-23 17:14:11 +01:00
wmwragg	ae8234ffe3	Added event/info message avatars back in	2016-08-23 15:58:27 +01:00
Kegsay	c10208a203	Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api Add postMessage API required for integration provisioning	2016-08-23 15:00:44 +01:00
wmwragg	6a4d02ffc5	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 12:49:21 +01:00
wmwragg	c362d4ff01	Added updating of count when room tile notification state changed	2016-08-23 12:40:28 +01:00
Kegan Dougal	9162a0ff01	Add postMessage API required for integration provisioning Supports querying member state and creating invites only.	2016-08-23 12:00:11 +01:00
wmwragg	6d1f9003e2	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 10:52:50 +01:00
Aviral Dasgupta	884abbd7e9	Cleanup autocomplete	2016-08-23 00:36:31 +05:30
wmwragg	edb7301b37	Moving the drirect messages above rooms	2016-08-22 14:10:51 +01:00
wmwragg	48a2567b82	Merge branch 'develop' into wmwragg/chat-message-presentation	2016-08-19 17:19:30 +01:00
wmwragg	993333490d	Removal of the mini avatars for action (info) messages	2016-08-19 16:38:05 +01:00
wmwragg	afd1ab1582	Comment to describe what info messages are	2016-08-18 22:19:23 +01:00
wmwragg	a55c4a2a52	Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message	2016-08-18 21:53:37 +01:00
Richard van der Hoff	e29be619c9	Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work Make the notification slider work	2016-08-18 15:23:45 +01:00
David Baker	fc2c62e896	We can use the new consts here	2016-08-18 15:19:24 +01:00
David Baker	af48b8920e	Various PR feedback	2016-08-18 14:00:14 +01:00
David Baker	9e45279894	Use enumalike thing	2016-08-18 13:44:58 +01:00
David Baker	73e486cc58	Hide red highlight badge in mute mode	2016-08-18 11:58:27 +01:00
David Baker	dd088794c2	Remove the mute toggle from room settings As it now incorrectly represents the mute as a binary toggle rather than a quad-state	2016-08-17 18:50:34 +01:00
David Baker	87f94bde62	Fix up notification setting listener in roomtile The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere. Also add util functions used here for getting the notif state and in vector for both getting and setting it.	2016-08-17 18:26:37 +01:00
Richard van der Hoff	69e8cb6f44	Merge branch 'rav/no_deviceload_if_disabled' into develop	2016-08-17 14:41:18 +01:00
Richard van der Hoff	0356f04b9c	MemberInfo: initialise _enableDevices in componentWillMount ... to avoid referencing it in render() before it is set	2016-08-17 14:40:10 +01:00
Aviral Dasgupta	e173900808	Update autocomplete design and scroll it correctly	2016-08-17 17:27:19 +05:30
Richard van der Hoff	30168a1b9c	Don't download E2E devices if feature disabled If the user hasn't enabled the E2E setting in the labs, there is no point in firing off the device download request when the MemberInfo is opened.	2016-08-17 09:57:06 +01:00
wmwragg	52f5061cc5	Made the menu button a clickable image rather than an input element	2016-08-16 17:34:33 +01:00
wmwragg	58d9789645	Increase main avatar size	2016-08-16 16:03:34 +01:00
wmwragg	c359358101	Initial context menu positioning and style change	2016-08-16 11:59:26 +01:00
wmwragg	6fd61f5816	Initial reposition of the timestamp	2016-08-16 10:26:27 +01:00
Matthew Hodgson	2a3b0e85ea	add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/	2016-08-15 21:37:26 +01:00
David Baker	fc0c5a5c58	Tidy up fix to multi-invite	2016-08-12 10:02:55 +01:00
Matthew Hodgson	d1eec57118	fix inviting some more	2016-08-11 17:11:51 -05:00
Matthew Hodgson	3bedad69cd	unbreak inviting :(	2016-08-11 17:08:17 -05:00
wmwragg	7713f0d587	refactoring out the direct message section	2016-08-11 17:32:39 +01:00
wmwragg	cc1cec8431	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-11 16:48:31 +01:00
wmwragg	a07833e7fc	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-11 16:47:19 +01:00
David Baker	109184aab7	Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style Only show Autocomplete if autocomplete is enabled	2016-08-11 16:47:07 +01:00
wmwragg	4aea2caefc	Initial pass at creating a direct message section	2016-08-11 16:45:19 +01:00
David Baker	7cb663d39d	Only show Autocomplete if autocomplete is enabled It was just never used, but it has 1px top border which makes the top border on chat look too big	2016-08-11 16:28:32 +01:00
Matthew Hodgson	3704e2c648	Merge pull request #402 from matrix-org/wmwragg/room-tag-menu Wmwragg/room tag menu	2016-08-11 08:59:32 -05:00
David Baker	4780f9000d	Merge pull request #403 from matrix-org/dbkr/multi_invite Better support for inviting multiple people	2016-08-11 12:34:16 +01:00
David Baker	f42d619e7d	Missing comma	2016-08-11 12:30:37 +01:00
David Baker	5b71b28dcf	Fix member info	2016-08-11 11:34:14 +01:00
David Baker	46899a0086	Merge pull request #395 from aviraldg/fix-emoji Various fixes and improvements to emojification.	2016-08-11 10:23:00 +01:00
David Baker	806477dcce	s/then/done/	2016-08-11 10:08:14 +01:00
Aviral Dasgupta	4c1dcb924b	reskindex and use sdk.getComponent for EmojiText	2016-08-11 07:55:12 +05:30
David Baker	020e4e14df	Factor out single-invite	2016-08-10 18:32:42 +01:00
David Baker	4a6a9bd95b	Remove redundant setState Duplicated in `finally`	2016-08-10 18:28:20 +01:00
David Baker	54b3638a85	Better support for inviting multiple people Pasting a list of addresses into the box will now pop up a dialog to confirm and show you the success / failure state of each address. It will also not die if it gets rate limited. Fixes https://github.com/vector-im/vector-web/issues/1713	2016-08-10 17:11:49 +01:00
wmwragg	6d1eebe6f2	Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly	2016-08-10 17:01:06 +01:00
wmwragg	e2d3631e7c	Menu colour now changeable, and leave room item hooked up	2016-08-10 16:34:49 +01:00
wmwragg	667264420c	hover state elements for the room tag menu, allong with CSS class updates	2016-08-10 14:46:05 +01:00
Richard van der Hoff	8fe470bce1	Cancel calls to rate-limited funcs on unmount The tests were throwing up warnings about state being accessed, and null MatrixClients being called, after component unmount.	2016-08-10 13:39:47 +01:00
David Baker	b7b0991ae9	Don't show integrations header if setting not on If the labs setting for integrations was disableds, we still showed the header for the integrations section but with nothing underneath it.	2016-08-10 11:51:51 +01:00
David Baker	13a4bfa8fe	Merge pull request #396 from matrix-org/rav/fix_react_warning Hack around a react warning	2016-08-10 10:09:18 +01:00
Richard van der Hoff	a1d3db76e5	Hack around a react warning when login completes, we replace the whole state, which means we unset collapse_lhs, which then leads to complaints from the RoomList. I think the 'default view' for MatrixChat ought to be factored out to another component, which could manage collapse_lhs properly; but for now, hack around it.	2016-08-09 23:57:36 +01:00
Aviral Dasgupta	09e8a45cde	Add EmojiText component for emoji replacement.	2016-08-10 00:31:51 +05:30
wmwragg	75e1277961	Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now	2016-08-08 16:55:27 +01:00
wmwragg	5b812fead9	Initial RoomTagContextMenu wired in	2016-08-05 15:48:28 +01:00
David Baker	98e89d4293	Merge pull request #392 from matrix-org/dbkr/scalar Dbkr/scalar	2016-08-05 15:43:57 +01:00
wmwragg	80e4a99477	Merge branch 'develop' into wmwragg/room-tag-menu	2016-08-05 15:27:14 +01:00
wmwragg	4a46aba0c2	Added new onClick function for the avatar, but not wired in yet, waitin go pull up from develop once previous commits have been merged	2016-08-05 15:24:53 +01:00
Matthew Hodgson	10aa201d33	Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix Wmwragg/mute mention state fix	2016-08-05 14:44:27 +01:00
Matthew Hodgson	d0158f5812	fix merge conflict	2016-08-04 23:45:28 +01:00
Matthew Hodgson	cf70f1731e	hide integration management behind labs checkbox	2016-08-04 23:26:27 +01:00
David Baker	9d958ab508	Fix long freeze when opening 'historical' section By rate limiting the list update in InviteMemberList as it seems the sync this triggers causes a load of member events. Fixes https://github.com/vector-im/vector-web/issues/1845	2016-08-04 17:54:00 +01:00
wmwragg	5305cb6785	Copy change to better describe the function	2016-08-04 16:55:52 +01:00
wmwragg	990da61a61	Fixed regression of click propogation	2016-08-04 16:25:09 +01:00
wmwragg	d204b043e5	Changed state from mute to mentions only	2016-08-04 16:17:21 +01:00
Matthew Hodgson	90e5ab2ca3	merge in develop	2016-08-04 13:39:47 +01:00
David Baker	2d936a2850	Don't leave isRoomPublished as undefined As this causes react to consider the component uncontrolled and then warn when we change it to controlled	2016-08-03 18:23:38 +01:00
David Baker	1b39f02141	Merge pull request #335 from aviraldg/feature-composer-emoji feat: code cleanup & emoji replacement in composer	2016-08-03 16:18:56 +01:00
Richard van der Hoff	42f6703112	Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys MemberDeviceInfo: Use the device name, where available	2016-08-03 15:26:37 +01:00
Matthew Hodgson	f95a11a9bf	Merge pull request #369 from matrix-org/wmwragg/mention-state-menu Wmwragg/mention state menu	2016-08-03 15:22:39 +01:00
wmwragg	c1cfbd6b59	Corrected comment typo	2016-08-03 14:47:53 +01:00
Richard van der Hoff	55f4d23625	MemberDeviceInfo: Use the device name, where available we now have device name for e2e devices: use it!	2016-08-03 14:18:09 +01:00
wmwragg	8e19532e5a	Hover state for badges, now only on the badges themselves	2016-08-03 14:09:10 +01:00
David Baker	efdcc6da98	Merge pull request #384 from aviraldg/fix-composer-up-down fix: allow up/down normally for no completions	2016-08-03 13:55:13 +01:00
Aviral Dasgupta	a2d64f5119	fix: allow up/down normally for no completions Autocomplete current eats up up/down key events by unconditionally returning true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible.	2016-08-03 18:04:52 +05:30
Aviral Dasgupta	1f9a396fa5	fix: autocomplete to use tab instead of return	2016-08-03 17:51:40 +05:30
David Baker	a0b973ffad	Syntax fail	2016-08-02 16:07:07 +01:00
David Baker	10f6ecfe5f	Include rooms with 1 person invited If we can't find one with both people joined.	2016-08-02 15:59:28 +01:00
David Baker	3000fae5d8	Oops, uncommit `61e0258`	2016-08-02 15:58:21 +01:00
David Baker	61e0258b6f	Include rooms with 1 person invited If we can't find one with both people joined.	2016-08-02 15:55:18 +01:00
David Baker	05f0d4d166	Fix 'start new direct chat'	2016-08-02 14:55:29 +01:00
wmwragg	2c2f689361	New design for long names	2016-08-02 14:46:47 +01:00
Richard van der Hoff	e63a32dc10	Fix warnings from MessageComposer Fix a couple of warnings from React about required properties not being set.	2016-08-02 11:00:00 +01:00
Matthew Hodgson	1b38398156	Merge pull request #371 from matrix-org/wmwragg/button-updates New voice and video call buttons	2016-08-01 20:36:56 +01:00
David Baker	89d2a56584	Merge pull request #373 from matrix-org/rav/more_react_warnings Silence some more react warnings	2016-08-01 17:23:08 +01:00
Richard van der Hoff	124a816751	Silence some more react warnings Remove some spurious props which were causing react warnings	2016-08-01 17:10:46 +01:00
Richard van der Hoff	94a44bfec3	Fix warnings emanating from Velociraptor elements We are no longer allowed to stick random properties on child properties, and the Velociraptor animations were causing some React warnings. Move the startStyles and enterTransitionOpts properties up to the Velociraptor node, and avoid setting arbitrary props on the created children. This is less flexible, as it assumes that all children will have the same start style; however, we weren't using the flexibility, and we can always replace the array with a map or a function or something if we need it in the future.	2016-08-01 16:56:25 +01:00
wmwragg	84583b25e6	New voice and video call buttons	2016-08-01 16:45:27 +01:00
Matthew Hodgson	5b100eeff3	Merge pull request #353 from matrix-org/wmwragg/button-updates Wmwragg/button updates	2016-08-01 15:42:46 +01:00
wmwragg	d16aa276e2	Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states	2016-07-30 12:52:39 +01:00
wmwragg	398e56c9f9	Fixed bug where the long hover tooltip for a room name show an object rather than the name	2016-07-30 12:28:10 +01:00
wmwragg	cf22a5fecc	Merge up from develop	2016-07-30 12:10:43 +01:00
wmwragg	1487c600ee	Revert so that the	2016-07-29 17:53:18 +01:00
wmwragg	229664a624	first pass on css re-write	2016-07-29 17:49:42 +01:00
wmwragg	38f504bdcb	Hide tooltip when badge clicked and collapsed	2016-07-29 11:10:16 +01:00
wmwragg	5889beacf3	Mute state now handled correctly	2016-07-28 17:24:58 +01:00
wmwragg	867b14d2ca	Reposition context menu now that the styling is final	2016-07-27 18:14:46 +01:00
wmwragg	46a643ac38	Now the text spaceing is correct need to align cheveron	2016-07-27 18:10:45 +01:00
wmwragg	8246d9148c	Initial context menu with all it's elements	2016-07-27 17:43:48 +01:00
wmwragg	6e7e091117	Refactor so that chevron and menu can be positioned independantly	2016-07-27 16:09:07 +01:00
wmwragg	0660b9feff	Fixes to properly point to the moved components	2016-07-27 14:49:10 +01:00
wmwragg	3df746ef14	Revert merge up from develop	2016-07-27 14:16:17 +01:00
wmwragg	6d141d1a7b	Only allow none guests to access the context menu	2016-07-27 11:58:40 +01:00
Richard van der Hoff	c8df9148b3	Remove relayoutOnUpdate prop on gemini-scrollbar The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it and remove the properties.	2016-07-27 11:35:48 +01:00
wmwragg	4b26ac58af	Re-modularised the context menus	2016-07-27 10:41:24 +01:00
wmwragg	dca4702b7b	Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage	2016-07-27 09:51:50 +01:00
wmwragg	477a17b49f	Removed debug statement	2016-07-26 10:39:34 +01:00
wmwragg	9c9c5ec458	Menu context dohickey now sticks when menu shown	2016-07-25 17:18:45 +01:00
wmwragg	a218b4e8a3	Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu # resolved Conflicts: # src/components/views/rooms/RoomTile.js	2016-07-25 17:04:37 +01:00
wmwragg	8b8486a8d0	Move from +99 to 99+ for more than 99 messages	2016-07-25 14:39:15 +01:00
wmwragg	a69107f4f1	Trying to get the context menu dohicky to stick when menu open	2016-07-25 10:58:43 +01:00
Aviral Dasgupta	b7555f49ea	Merge branch 'develop' into feature-composer-emoji	2016-07-23 19:15:06 +05:30
wmwragg	c89904bc25	Initial unstyled mentions state notifier context menu	2016-07-22 17:30:31 +01:00
David Baker	b07e50d418	Fix 'start chat' button on MemberInfo this/self fail & related scoping Fixes https://github.com/vector-im/vector-web/issues/1844	2016-07-22 17:30:25 +01:00
wmwragg	9b318e8f61	Getting the corrct height for the placing the context menu	2016-07-22 16:12:20 +01:00
wmwragg	e4dd6c8dbe	Browser tooltip being used instead of the HTML styled one.	2016-07-22 15:15:24 +01:00
wmwragg	6984a55b11	The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown	2016-07-22 14:58:09 +01:00
wmwragg	ca75d93434	Tweaked the offset for the tooltip so that it is next to the element it is tipping	2016-07-22 11:31:26 +01:00
wmwragg	5d4b03c1f4	Put back clicking on the name to acces the room	2016-07-22 11:28:11 +01:00
wmwragg	3dd83922f1	Tooltip positioning tweaked	2016-07-22 11:12:11 +01:00
wmwragg	922bb0f402	+99 badge when notifications are greater the 99	2016-07-21 18:50:07 +01:00
wmwragg	762873350a	Badge dohickey shown on name hover and badge hover	2016-07-21 18:20:12 +01:00
wmwragg	4013ea75d0	Testing out the context menu	2016-07-21 17:44:31 +01:00
wmwragg	775fc97102	Slight refactor to better match current code	2016-07-21 14:33:54 +01:00
Matthew Hodgson	9babf3f92f	Merge pull request #357 from matrix-org/wmwragg/mention-state-indicator-round-2 Wmwragg/mention state indicator round 2	2016-07-20 18:01:59 +01:00
wmwragg	ffa43ebb96	badge content when hovered is now kerned via the CSS	2016-07-20 17:12:41 +01:00
David Baker	fb964be072	Merge pull request #356 from matrix-org/matthew/disable-url-previews Support for disabling/enabling URL previews per-user, per-room and per-user-per-room	2016-07-20 16:43:08 +01:00
wmwragg	33edb1dea9	Made the badge always exist, but if no unread mesasges available then has a different class	2016-07-20 12:47:32 +01:00
Matthew Hodgson	1365f18829	many stupid thinkos and bugfixes; make it work	2016-07-20 12:03:13 +01:00
David Baker	514bc2cd51	Merge pull request #341 from matrix-org/dbkr/tab_complete_most_recently_spoke Order tab complete by most recently spoke	2016-07-19 18:02:09 +01:00
Matthew Hodgson	c1fd2f888f	Merge pull request #352 from matrix-org/wmwragg/mention-state-indicator Now showing three dots when hovering over the badge	2016-07-19 11:12:42 +01:00
wmwragg	9e4511b8eb	Now showing three dots when hovering over the badge	2016-07-18 16:10:07 +01:00
David Baker	ffaf7f44f3	typos	2016-07-18 15:36:19 +01:00
David Baker	743f79a9a7	Fix unpublishing room in room settings Fixes https://github.com/vector-im/vector-web/issues/1743	2016-07-18 15:22:08 +01:00
David Baker	2b7ade9ef5	Merge pull request #347 from matrix-org/matthew/fix-race-on-new-room-invitelist Fix race when creating rooms where invite list can be blank	2016-07-18 10:37:05 +01:00
Matthew Hodgson	ebdac4ee50	first cut (untested)	2016-07-18 01:35:42 +01:00
Matthew Hodgson	554a6ff035	improve wording of MemberInfo's start chat button. Fixes https://github.com/vector-im/vector-web/issues/689 and clarifies https://github.com/matrix-org/matrix-react-sdk/issues/328	2016-07-17 19:41:53 +01:00
Matthew Hodgson	999c52b650	fix comment	2016-07-17 19:00:22 +01:00
Matthew Hodgson	0553d806d7	stop re-invites	2016-07-17 18:40:54 +01:00
Matthew Hodgson	2bc9dd4307	hopefully fix vector-im/vector-web#1813	2016-07-17 18:32:48 +01:00
Matthew Hodgson	bfe50c209c	fix typo in comment	2016-07-16 22:49:42 +01:00
Matthew Hodgson	a61168d943	Revert "Amends react template and removes opening image in lightbox"	2016-07-15 16:54:56 +01:00
David Baker	d5bed78a54	Rejig tab complete to make it faster Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView.	2016-07-15 16:10:27 +01:00
Matthew Hodgson	78b7d04710	Merge pull request #343 from ribot/feature-inline-link-preview Amends react template and removes opening image in lightbox	2016-07-15 13:55:07 +01:00
Richard van der Hoff	8144b894f7	Merge pull request #344 from matrix-org/dbkr/remove_initial_memberlist_load_hack Remove the member list loading hack	2016-07-14 18:50:52 +01:00
David Baker	3abdb83d16	Remove now-unused limit param to roomMembers()	2016-07-14 18:40:43 +01:00
David Baker	743cb4b777	Remove the member list loading hack Now the memberlist os a truncated list it at-best makes no difference and may be marginally slowing us down.	2016-07-14 18:37:57 +01:00
David Baker	9fd0ea1e32	More variable case	2016-07-14 18:18:44 +01:00
David Baker	2fd690ea2b	Oops, removed the pure offline class	2016-07-14 18:13:54 +01:00
David Baker	7c1b4f4fc9	Obey my own code style	2016-07-14 18:13:15 +01:00
David Baker	a49a545161	CSS classes to colour offline users differently So we can use the same 66% opacity as idle tiles for offline-with-last-active-time to reduce the visual jarring	2016-07-14 17:41:07 +01:00
Stefan Pearson	cad057ef34	amends react template and removes opening image in lightbox	2016-07-14 17:12:17 +01:00
wmwragg	fd5d28768a	Simplification of the css	2016-07-14 12:05:00 +01:00
wmwragg	f6302fc990	Updated the search button, and simplified the leave css	2016-07-14 11:43:33 +01:00
David Baker	2d6d734571	Listen for the new lastPreseceTs event This will catch all presence events as previously we were only listening for the actual presence string changing	2016-07-14 10:05:40 +01:00
wmwragg	7f00053f84	Footer upload icon updated to new vesrion	2016-07-13 17:46:56 +01:00
wmwragg	936a38a9f4	Updated and moved the room header settings icon	2016-07-13 16:02:18 +01:00
David Baker	6b03f72474	Fix filtering user list by ID Fixes https://github.com/vector-im/vector-web/issues/1739	2016-07-13 11:56:01 +01:00
Aviral Dasgupta	b334522168	feat: code cleanup & emoji replacement in composer	2016-07-08 12:54:28 +05:30
David Baker	63ad57a8d4	Merge pull request #332 from aviraldg/feature-emojione feat: render unicode emoji as emojione images	2016-07-05 10:18:33 +01:00
Aviral Dasgupta	6a133bc034	feat: and emojify name in MemberInfo	2016-07-05 10:24:18 +05:30
Aviral Dasgupta	020f1f4320	feat: emojify ALL THE THINGS!	2016-07-05 10:16:17 +05:30
Aviral Dasgupta	22a2593bf2	fix: unbreak old MessageComposerInput/TabComplete	2016-07-05 01:32:40 +05:30
Aviral Dasgupta	73b726e5fb	feat: import only flatMap from lodash	2016-07-04 21:56:09 +05:30
Aviral Dasgupta	30b7efd585	fix: code cleanup, fix getCurrentCommand	2016-07-04 21:44:35 +05:30
Aviral Dasgupta	cccc58b47f	feat: implement autocomplete replacement	2016-07-03 22:15:13 +05:30
Aviral Dasgupta	8961c87cf9	feat: Autocomplete selection wraparound	2016-07-03 01:11:34 +05:30
Aviral Dasgupta	cd928fe6f5	Merge remote-tracking branch 'upstream/develop' into feature-autocomplete	2016-07-03 00:00:02 +05:30
Richard van der Hoff	a671e07da7	Merge pull request #326 from matrix-org/dbkr/fix_user_links Fix user links	2016-06-30 17:43:08 +01:00
Richard van der Hoff	ce39822957	Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist Fix ordering of Memberlist	2016-06-29 10:21:15 +01:00
theworldbright	7609b9eba8	Simplify logic for timestamp ordering of memberlist	2016-06-29 17:45:24 +09:00
theworldbright	b3d871aa6a	Add back comment	2016-06-29 17:33:41 +09:00
theworldbright	69cb0a8f1c	Switch ordering of Idle users	2016-06-29 17:08:17 +09:00
theworldbright	72a1d5a0de	Remove unused comments	2016-06-29 16:58:08 +09:00
theworldbright	174caceabf	Use lastActiveAgo to reorder member list	2016-06-29 16:57:59 +09:00
David Baker	ba47c5a198	Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links	2016-06-28 17:15:17 +01:00
David Baker	e8337b2119	More PR feedback	2016-06-28 17:11:47 +01:00
David Baker	548c392236	PR feedback	2016-06-28 14:59:45 +01:00
David Baker	c016eb78c8	Fix user links 'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.	2016-06-28 14:28:05 +01:00
David Baker	98c03869a7	Display an error message if room not found Fixes https://github.com/vector-im/vector-web/issues/1012	2016-06-24 15:34:07 +01:00
Richard van der Hoff	a1dd427420	Implement device blocking This is the react-sdk part of https://github.com/matrix-org/matrix-js-sdk/pull/146. It adds 'Block'/'Unblock' buttons to the device list, and updates the deviceVerified listeners to listen for deviceVerificationChanged instead. Also adds an extra <div> to the deviceinfo section to help me with the CSS.	2016-06-23 17:30:04 +01:00

... 15 16 17 18 19 ...

2097 commits