3269 commits

Author	SHA1	Message	Date
Aidan Gauland	35780f5ae0	Remove use of deprecated React.PropTypes ... Replace all uses of React.PropTypes with PropTypes and importing PropTypes from 'prop-types'.	2017-12-26 14:03:18 +13:00
Aidan Gauland	9531b219d2	Remove unused imports	2017-12-26 12:53:01 +13:00
Aidan Gauland	e4b86f0730	Fix use of deprecated module ... Use PropTypes from "prop-types" instead of the deprecated React.PropTypes submodule.	2017-12-26 11:55:15 +13:00
Travis Ralston	cc5eb77658	Remove presence management ... The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time. This reverts two PRs: * https://github.com/matrix-org/matrix-react-sdk/pull/1620 * https://github.com/matrix-org/matrix-react-sdk/pull/1482 The changes to the context menu positioning were not reverted as they are useful outside of presence management. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-12-25 14:25:13 -07:00
Aidan Gauland	e6dbc3b863	Use DialogButtons in UnknownDeviceDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	2674fcb6d3	Use DialogButtons in TextInputDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	a11146f39d	Use DialogButtons in SessionRestoreErrorDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	93b789438b	Use DialogButtons in ConfirmUserActionDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	7a761dbf6b	Use DialogButtons in ChatCreateOrReuseDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	aecb4650bc	Correct order of buttons in CreateGroupDialog ... We can't use DialogButtons because the primary button is an <input> element.	2017-12-23 17:02:19 +13:00
Aidan Gauland	c863dbfc76	Use DialogButtons in CreateRoomDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	0f6125e749	Use DialogButtons in AddressSelector ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	3b2c61e456	Use DialogButtons in QuestionDialog ... Use DialogButtons to eliminate duplicate button code.	2017-12-23 17:02:19 +13:00
Aidan Gauland	45d86ea7ca	Add DialogButton component ... A component to normalise the buttons in dialogs.	2017-12-23 17:02:19 +13:00
Aidan Gauland	9ebd58852c	Rebase DeactivateAccountDialog on BaseDialog	2017-12-23 17:02:19 +13:00
Aidan Gauland	c5284eb070	Allow BaseDialog to take a class for the title <div> ... Some dialogs need to set additional classes on the `mx_Dialog_title` `div` element (for example `danger`).	2017-12-23 17:02:19 +13:00
Aidan Gauland	8bb16466d6	Rebase AddressSelector on BaseDialog	2017-12-23 17:02:19 +13:00
Peter Vágner	f2ca02eaf8	SetEmailDialog: use autoFocus prop on the EditableText rather than using ... its ref inside onComponentDidMount function. This is shorter better and has been requested.	2017-12-20 10:13:37 +01:00
Peter Vágner	20c485d85e	Move aria-hidden management from the BaseDialog component to the Modal	2017-12-20 10:09:26 +01:00
Richard Lewis	baf472b4a3	Only show snapshot button when apps are maximised.	2017-12-19 17:16:38 +00:00
Richard Lewis	08bcfc5c4e	Make sure that capabilities array is initialised.	2017-12-19 17:15:06 +00:00
Michael Telatynski	05434e782a	change Composer placeholder text based on replying/rich quoting state ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-18 19:49:38 +00:00
Michael Telatynski	47d4e5f8d1	nest quotes, but only when people want to click through them ... loads pre-emptively Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-18 19:28:01 +00:00
Richard Lewis	32bdbdb2f3	Merge pull request #1669 from turt2live/travis/integ-theme ... Give the current theme to widgets and the integration manager	2017-12-18 17:35:06 +00:00
Travis Ralston	e5df0dcf1e	$riot_theme -> $theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-12-18 09:19:54 -07:00
Alexandr Korsak	d051a2e0b3	Remove extra space	2017-12-18 15:59:21 +03:00
Alexandr Korsak	fddbf3a2a2	Fix issue with preview of phone number on register and waiting for sms code confirmation code	2017-12-18 12:23:54 +03:00
Michael Telatynski	882068078d	fix missing space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-17 20:53:53 +00:00
Michael Telatynski	9603b21199	s/Quote/Reply/ and ES6 tweaks ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-17 20:20:45 +00:00
Travis Ralston	94ef80c008	Support sending the current theme to widgets ... This is a namespaced variable because some clients may not be able to support themes, or may have varying definitions of what "light" means. Widgets are recommended to opt for per-client checks, or accept that some clients may differ. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-12-16 20:11:00 -07:00
Richard Lewis	83f9a4162b	Request capabilities (e.g. ability to take snapshots) from widgets.	2017-12-16 09:16:24 +00:00
Richard Lewis	e63f5696a6	Screenshot handlers	2017-12-15 21:36:02 +00:00
Michael Telatynski	9baf71c4fc	only pass one child to EmojiText otherwise it cries ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-15 19:52:47 +00:00
Michael Telatynski	0ad0c0e9f7	finish i18n, and add a Date Sep to quote if it needs it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-15 18:39:01 +00:00
Michael Telatynski	4043ea7d57	change CSS classes and i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-15 17:57:24 +00:00
Luke Barnard	adaea9ad5b	Merge pull request #1647 from matrix-org/luke/tag-panel-improve-performance ... Attempt to improve TagPanel performance	2017-12-15 17:38:15 +00:00
Luke Barnard	71740cc176	Merge branch 'develop' into luke/fix-room-list-group-store-leak	2017-12-15 17:36:36 +00:00
Luke Barnard	d292dab9c6	More doc	2017-12-15 17:30:21 +00:00
Luke Barnard	56affd3d42	Rename for clarity	2017-12-15 17:29:06 +00:00
Luke Barnard	d2066f41d5	Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption ... Fix one variant of a scroll jump that occurs when decrypting an m.text	2017-12-15 17:25:21 +00:00
Luke Barnard	653137f6ec	Update comment	2017-12-15 17:21:20 +00:00
Luke Barnard	6f896098e3	Get Group profile from TagTile instead of TagPanel ... So that instead of getting all group profiles everytime the tags change order, get them when the TagTile mounts for a group tag.	2017-12-15 17:18:46 +00:00
Richard Lewis	f2ad7be3f3	Add event handlers and comments.	2017-12-15 16:56:02 +00:00
Luke Barnard	961d5e1868	Split updatedSelectedTagsRooms ... because we don't need to get the rooms for all groups when the filtered tags change.	2017-12-15 14:23:35 +00:00
Luke Barnard	34e455c6fc	Fix leaking of GroupStore listeners in RoomList	2017-12-15 14:12:21 +00:00
Luke Barnard	7f551f517b	Add comments to _onDecrypted	2017-12-15 14:01:07 +00:00
Luke Barnard	a516c18cc5	Indicate event tile resize after rendering	2017-12-15 13:58:58 +00:00
Richard Lewis	f410112983	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot	2017-12-15 10:18:56 +00:00
Luke Barnard	df1134f092	Use "shared" DMRoomMap	2017-12-14 16:34:49 +00:00
Luke Barnard	3732fd29d5	Comments for instance variables	2017-12-14 16:17:06 +00:00
Luke Barnard	9975941f3c	Merge pull request #1653 from matrix-org/luke/feature-ordered-tag-panel ... DnD Ordered TagPanel	2017-12-14 10:36:16 +00:00
Peter Vágner	9f5857a7cc	Merge branch 'develop' into dialog-a11y	2017-12-14 11:04:59 +01:00
Peter Vágner	642675c96d	Address review request comments	2017-12-14 10:31:28 +01:00
Richard Lewis	c739269777	Update widget title on edit.	2017-12-13 10:14:26 +00:00
Michael Telatynski	5c229b9ef8	DRY matrix.to link generation so it is all changeable in one class ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-12 23:33:40 +00:00
Michael Telatynski	4666ac7c83	hide rich quoting behind flags, retaining original quoting for now ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-12 23:29:43 +00:00
Michael Telatynski	38e8488c2a	we don't actually use state.room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-12 23:25:38 +00:00
Peter Vágner	ab0ff9b781	BaseDialog: split a very long line	2017-12-12 18:55:57 +01:00
Richard Lewis	c93266b6af	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar	2017-12-11 13:08:49 +00:00
Michael Telatynski	b6182f7e6c	Tidy Quote class, removing comments etc ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-10 12:54:19 +00:00
Michael Telatynski	0f85391587	Implement Rich Quoting/Replies ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-10 12:50:41 +00:00
Richard Lewis	24db57bfb6	Fix api prefix.	2017-12-08 18:47:00 +00:00
Matthew Hodgson	f2d68e4601	Merge pull request #1649 from matrix-org/rxl881/titleBar ... Add maximize / minimize apps drawer icons.	2017-12-08 19:18:45 +01:00
David Baker	0d38e7510d	Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show ... Don't Auto-show UnknownDeviceDialog	2017-12-08 16:33:25 +00:00
Richard Lewis	a9ae4be74c	Fix page title variable name.	2017-12-08 15:27:14 +00:00
Luke Barnard	196e1a4f66	Fix one variant of a scroll jump that occurs when decrypting an m.text	2017-12-08 15:25:14 +00:00
Richard Lewis	20917e1a07	Set page title from widget data, if available.	2017-12-08 15:12:48 +00:00
Luke Barnard	72550961e5	Move 'commit_tags' to action creator	2017-12-08 10:52:20 +00:00
Peter Vágner	321b1adb99	Elliminate lint errors and warnings	2017-12-08 07:47:08 +01:00
Richard Lewis	b20667a5a8	Merge pull request #1655 from matrix-org/rxl881/cmc ... Remove logging.	2017-12-07 15:56:10 +00:00
Richard Lewis	df438924a7	Remove logging.	2017-12-07 09:57:53 +00:00
Luke Barnard	4603d593de	Merge pull request #1588 from pvagner/develop ... Add some missing translatable strings	2017-12-07 09:41:39 +00:00
Peter Vágner	839f938c91	Argh! Reworked AccessibleButton key handling again. It turned out by ... fixing behaviour when pressing the enter key breaks behaviour when pressing space to activate the buttons. So we are now handling enter onKeyDown and space onKeyUp. Also briefly explained the situation with comments.	2017-12-07 10:20:27 +01:00
Peter Vágner	4171675221	Add some comments explaining how we are using aria-hidden property to ... hide content outside of the BaseDialog to screen reader users.	2017-12-07 09:44:00 +01:00
Richard Lewis	ed675fe791	Allow bypass of widget loading screen on hide / show.	2017-12-06 22:54:32 +00:00
David Baker	2a01985076	better proptypes	2017-12-06 19:07:12 +00:00
David Baker	0deed4bb88	null guard	2017-12-06 19:05:25 +00:00
Luke Barnard	65d88334a9	Fix linting ... React DnD specifies functions with upper-case first letters	2017-12-06 16:48:18 +00:00
Richard Lewis	e20db416f2	Add field to bypass riot widget loading screen.	2017-12-06 16:44:41 +00:00
Luke Barnard	a8a650c24a	Move TagTile to separate file, and make it dragable	2017-12-06 11:25:46 +00:00
Peter Vágner	f9b0243c8e	Merge branch 'develop' into dialog-a11y	2017-12-06 11:10:18 +01:00
Peter Vágner	802abe7091	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop	2017-12-06 11:07:01 +01:00
Peter Vágner	60ada30680	Forgot to turn div displaying error text into an aria-alert in the ... create group dialog.	2017-12-05 23:46:02 +01:00
Peter Vágner	eda453bbe5	Fixed an issue where pressing enter key to activate the AccessibleButton ... was also activating normal button that might just have received the system focus as a result of the key press and the other way round. The most obvious occurence of this issue is that dialogs were reappearing when dismissed by pressing the enter key.	2017-12-05 23:23:40 +01:00
Richard Lewis	3206527d73	Remove logging.	2017-12-05 21:59:44 +00:00
Richard Lewis	7f86ed35a3	Only show custom title if different from app name.	2017-12-05 21:49:11 +00:00
Richard Lewis	1415a83a61	Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle	2017-12-05 21:42:47 +00:00
Richard Lewis	d5d5397959	Set custom widget title.	2017-12-05 21:41:44 +00:00
Richard Lewis	9fd8deb16d	Add maximize / minimize apps drawer icons.	2017-12-05 18:18:51 +00:00
Peter Vágner	a31af39ca8	Applied aria-describedby to all other dialogs that are using BaseDialog. ... Also added initial focus where it has not been set.	2017-12-05 13:52:20 +01:00
Richard Lewis	9eb334a1d4	Merge pull request #1640 from matrix-org/rxl881/widgetTitle ... Add widget -> riot postMessage API	2017-12-05 12:02:57 +00:00
Luke Barnard	aac5bcfe80	Attempt to improve TagPanel performance ... by only recalculating rooms to show (for a given group) when a group updates.	2017-12-05 11:25:30 +00:00
Peter Vágner	4f83f6cf25	Move keyboard focus management back to the BaseDialog rather than ... leaving it in the Modal manager. We are using Modal manager to load other components not just BaseDialog and its subclasses and they might require different keyboard handling. Also depend on focus-trap-react rather than react-focus-trap for locking keyboard focus inside the dialog. The experience is much nicer and even the FocusTrap element it-self no longer gains the focus. On a side note using the FocusTrap element outside the dialog (on its parent) stops it from working properly.	2017-12-05 08:50:40 +01:00
Richard Lewis	49a2985515	Register message endpoints. ... Store endpoint origins only.	2017-12-05 00:08:17 +00:00
Peter Vágner	5ccbcf02e2	Several changes improving accessibility of the dialogs ... - Wrapped all the modals inside a react-focus-trap component disabling keyboard navigation outside the modal dialogs - Disabled our custom key handling at dialog level. Cancelling on esc key is now handled via FocusTrap component. - Removed onEnter prop from the BaseDialog component. Dialogs that submit data all now embed a form with onSubmit handler. And since keyboard focus is now managed better via FocusTrap it no longer makes sense for the other dialog types. Fixes https://github.com/vector-im/riot-web/issues/5736 - Set aria-hidden on the matrixChat outer node when showing dialogs to disable navigating outside the modals by using screen reader specific features.	2017-12-03 21:38:21 +01:00
Richard Lewis	c9b8aab0e0	Workings for future posterity - Can't access iframe content from parent. iframe needs to initiate. Postmessage data up the stack.	2017-12-03 19:44:59 +00:00
Richard Lewis	3a89b90e57	Add stub handler for image snapshot	2017-12-03 11:25:15 +00:00
Luke Barnard	641add4964	Fix one kind of scroll jump ... by calling onWidgetLoad when the <img> in MImageBody loads	2017-12-01 14:18:13 +00:00
Luke Barnard	363fe04a10	isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent	2017-12-01 10:44:00 +00:00
Luke Barnard	fe81fcb8c6	Factor out isCtrlOrCmdKeyEvent, use that in TagPanel ... as opposed to the incorrect ctrl || meta	2017-12-01 10:30:49 +00:00
Richard Lewis	5ff5ca4705	Remove logging and broken title fetching functions.	2017-11-30 14:50:30 +00:00
Richard Lewis	2cfbbb000e	Refactor messaging listerners.	2017-11-30 10:20:29 +00:00
Stefan Parviainen	437a440bdf	Add missing id ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-30 08:32:18 +01:00
Richard Lewis	4f5f44ff38	Add widget postmessage API stub.	2017-11-29 22:16:22 +00:00
Stefan Parviainen	cb5c9f2c5a	Make Dialogs more accessible ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-29 21:13:48 +01:00
Luke Barnard	45bcb6f2ed	Implement TagPanel (or LeftLeftPanel) for group filtering ... This allows for filtering of the RoomList by group. When a group is selected, the room list will show: - Rooms in the group - Direct messages with members in the group A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.	2017-11-29 16:53:43 +00:00
Luke Barnard	ff25c2f329	Merge pull request #1638 from matrix-org/luke/feature-bulk-device-deletion ... Implement UI for using bulk device deletion API	2017-11-28 16:01:39 +00:00
David Baker	a5acc2cfc2	Merge pull request #1637 from matrix-org/luke/replace-IRC-with-flair ... Replace (IRC) with flair	2017-11-28 16:00:47 +00:00
Luke Barnard	736b8045aa	Remove evil auth cache	2017-11-28 15:54:00 +00:00
Luke Barnard	204bbebfca	Only calculate displayed groups if flair enabled	2017-11-28 15:49:11 +00:00
Luke Barnard	b32e4a57bc	Factor out _getDisplayeDGroups	2017-11-28 15:46:23 +00:00
Luke Barnard	b748c62880	Renames for clarification	2017-11-28 15:40:36 +00:00
Luke Barnard	1c71983610	Implement UI for using bulk device deletion API	2017-11-28 15:32:40 +00:00
Luke Barnard	3addb924b1	Replace (IRC) with flair ... If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.	2017-11-28 13:50:05 +00:00
Luke Barnard	7ec4010881	Make GroupStore use MatrixClientPeg ... To avoid weirdness with using a cached matrix client	2017-11-28 11:54:05 +00:00
David Baker	bbaa46f773	Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings ... Move group publication toggles to UserSettings	2017-11-28 11:02:45 +00:00
Luke Barnard	d4f5e7e6d7	Deal with errors, lack of groups, loading	2017-11-28 10:46:20 +00:00
Luke Barnard	0d5f7ef246	Avoid NPE	2017-11-28 10:12:46 +00:00
Luke Barnard	3342754a72	Catch and log errors from getting group profile	2017-11-28 10:11:25 +00:00
lukebarnard	9ed9422af8	Move group publication toggles to UserSettings	2017-11-27 17:24:42 +00:00
David Baker	7826d0c61a	Merge pull request #1630 from aidalgol/redact-dialog-fix ... Rebase ConfirmRedactDialog on QuestionDialog	2017-11-27 14:55:04 +00:00
David Baker	e07c7e404e	Merge pull request #1632 from matrix-org/luke/rename-related-communities ... Rename Related Groups to improve readability	2017-11-27 14:34:02 +00:00
lukebarnard	3635997090	Rename Related Groups to improve readability	2017-11-27 14:13:44 +00:00
Aidan Gauland	3358fdc906	Address eslint errors ... * Remove space before curly brace. * Remove unused import.	2017-11-26 16:04:24 +13:00
Aidan Gauland	aaf8106e9e	Rebase ConfirmRedactDialog on QuestionDialog ... Rewrite the ConfirmRedactDialog component to derive from the QuestionDialog component.	2017-11-26 15:46:24 +13:00
David Baker	c002d3ff99	Merge pull request #1616 from pafcu/fix-presence-i18n ... Make PresenceLabel more easily translatable	2017-11-22 17:17:52 +00:00
David Baker	a784abd57f	Comment typo	2017-11-22 17:13:18 +00:00
Matthew Hodgson	d4feca5dfb	Merge pull request #1628 from pafcu/label-actionbuttons ... Add aria-labels to ActionButtons	2017-11-21 18:46:07 +00:00
Richard van der Hoff	b2e80a8ee2	Merge pull request #1620 from matrix-org/rav/fix_memberpresence_avatar ... MemberPresenceAvatar: fix null references	2017-11-21 17:42:13 +00:00
Travis Ralston	5f3fda2950	Update MemberPresenceAvatar.js ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-21 09:01:56 -07:00
krombel	7c5f74e18a	Fix GroupMemberList search for users without displayname ... When there is a user in a group which has no displayname set the search failed with "Cannot read property 'toLowerCase' of null"	2017-11-20 17:02:20 +01:00
David Baker	e2f5e16fa7	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-20 10:00:47 +00:00
Michael Telatynski	4d177626b5	init Linkify properly to make tests happy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 13:24:18 +00:00
Michael Telatynski	d943807ad1	remove unused imports ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 13:18:06 +00:00
Michael Telatynski	f0752572a7	make RoomDetailRow reusable for the Room Directory ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 12:49:26 +00:00
Peter Vágner	093f110199	Make the toggle button on the memberEventListSummary translatable	2017-11-18 17:48:57 +01:00
Peter Vágner	184b29daf8	Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547" ... This reverts commit 681f43913a.	2017-11-18 16:58:36 +01:00
Travis Ralston	28ff0a4ee7	Disable presence controls if there's no presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-17 22:25:15 -07:00
Travis Ralston	d010329f4a	Make the room-level URL preview notification explicit ... Fixes https://github.com/vector-im/riot-web/issues/5638 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-17 22:03:06 -07:00
Travis Ralston	cdf5a6fb8a	Fix typo that prevented URL previews on a room-account level from being saved ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-17 22:02:33 -07:00
Richard van der Hoff	4e7fd55fb4	MemberPresenceAvatar: fix null references ... avoid assuming that `member` has a `user`	2017-11-17 14:35:33 +00:00
Stefan Parviainen	8090aadb0e	Add aria-labels to ActionButtons ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-17 14:33:39 +01:00
David Baker	65e1d49f37	More sensible buttons in UnknownDeviceDialog ... Just say 'Send' (or equiv) if you actually verify all the devices, rather than 'Send Anyway'.	2017-11-16 17:59:42 +00:00
Stefan Parviainen	df921438f3	Make PresenceLabel more easily translatable ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-16 18:36:54 +01:00
David Baker	3c8645871f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 16:47:15 +00:00
David Baker	196eafdc7f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 15:59:16 +00:00
David Baker	02629d13d9	Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity ... Do something more sensible for sender profile name/aux opacity	2017-11-16 15:35:16 +00:00
Luke Barnard	7ffb542cb5	Do something more sensible for sender profile name/aux opacity ... - If no translation is needed, don't do it. - For now, ignore the fact that this doens't allow us easily to put Flair into "luke sent an image" but we don't kow where the flair should go for this anyway.	2017-11-16 15:24:36 +00:00
David Baker	6f8427a5af	Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584 ... Because apparently the revert did not revert this part	2017-11-16 15:11:47 +00:00
Luke Barnard	b54e563cb6	Merge branch 'develop' into luke/linting-keyword-spacing	2017-11-16 13:23:42 +00:00
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +00:00
Matthew Hodgson	f62b04c3be	Merge branch 'develop' into travis/granular_bugs	2017-11-16 13:12:03 +00:00
Luke Barnard	f99755378a	Merge pull request #1612 from matrix-org/t3chguy/state_events ... differentiate between state events and message events	2017-11-16 13:06:36 +00:00
Luke Barnard	a80935e181	JSX does not do comments in a way one might expect	2017-11-16 11:45:40 +00:00
Travis Ralston	d0a0a9ce7f	Fix URL preview string not being translated ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 22:33:23 -07:00
Stefan Parviainen	2c1618bc10	Fix conflict and update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-15 20:40:51 +01:00
David Baker	b0027525f3	Wire up Unknown Devices popup for outbound calls	2017-11-15 17:21:04 +00:00
Michael Telatynski	c0002e7778	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events	2017-11-15 16:03:07 +00:00
Michael Telatynski	5563b71c47	differentiate between state events and message events ... so that people can't fake state event types and have them rendered. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-15 15:56:54 +00:00
Richard Lewis	750e64deee	Pass required props to TintableSvg.	2017-11-15 15:17:21 +00:00
David Baker	93800be742	Factor out showing UnknownDeviceDialog ... So we can re-use it for calls that fail due to unknwon devices	2017-11-15 15:15:21 +00:00
Richard Lewis	7bab7813bb	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 13:26:29 +00:00
Richard Lewis	59d405d4fa	Use TintableSvgButtons for widget menubar icons.	2017-11-15 13:24:38 +00:00
Richard Lewis	6c2e9096cd	Tintable SVGs that behave like normal image buttons / links.	2017-11-15 13:08:24 +00:00
David Baker	f8fc6dc83e	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-15 12:11:33 +00:00
Matthew Hodgson	96a3eff5d3	lint hell	2017-11-15 11:25:56 +00:00
Travis Ralston	f58e8826c0	Use the correct settings store for presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-14 19:18:04 -07:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Matthew Hodgson	f05958e334	Merge pull request #1482 from turt2live/travis/presence ... Implement user-controlled presence	2017-11-14 23:53:16 +00:00
Richard Lewis	58966c5c3d	Make edit icon green by default	2017-11-14 19:53:59 +00:00
Richard Lewis	e87940f63c	Make app tile title stronger	2017-11-14 19:53:32 +00:00
Stefan Parviainen	f8660de52d	Add note about alternative to opacity	2017-11-14 20:13:00 +01:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Stefan Parviainen	788be67c75	Clarifications	2017-11-14 20:08:27 +01:00
Luke Barnard	12d9f05883	Merge branch 'develop' into luke/fix-restrict-power-level-options	2017-11-14 13:08:31 +00:00
Luke Barnard	3fa1bece0a	Simplify further ... Also fix not-i18n-friendly "of" to be "=".	2017-11-14 13:06:54 +00:00
David Baker	e7c99a71b6	Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display ... Determine whether power level is custom once Roles have been determined	2017-11-14 12:42:55 +00:00
Luke Barnard	c3492634bd	Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options	2017-11-14 12:41:36 +00:00
Luke Barnard	d2ef6bffa8	Remove reverseRoles ... This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.	2017-11-14 12:02:37 +00:00
Travis Ralston	d92cba25ef	Use the SettingsStore to get the theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 13:14:00 -07:00
Stefan Parviainen	2acd42e7c5	Make eslint happy	2017-11-13 21:10:08 +01:00
Travis Ralston	0648b3eae7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:29:36 -07:00
Stefan Parviainen	3afbaf61e7	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
Travis Ralston	c5c346f0b7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:18:41 -07:00
David Baker	0659ac1ccb	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-13 17:45:57 +00:00
Luke Barnard	52af7a7659	Attempt to clarify the affect that the users_default has on power levels ... This modifies displayed power levels such that: - If users_default is !== 0: - the power level 0 is displayed as "Restricted (0)" - the power level users_default is displayed as "Default ({users_default})" - Otherwise: - the power level 0 is displayed as "Default (0)" When changing users_default, to say, 10, when the textual powers are rendered again, they will take users_default into account. So those previously at 10 and which would have previously have been rendered "Custom of 10" will now read "Default (10)". Conversely, those that were "Default (0)" will now read "Restricted (0)".	2017-11-13 17:03:48 +00:00
Luke Barnard	88010fa26c	Determine whether power level is custom once Roles have been determined ... Instead of potentially inspecting an empty {} before mounting. This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294	2017-11-13 11:57:34 +00:00
Matthew Hodgson	2827bc0718	replace some of the status.im theme with general config options	2017-11-11 23:46:43 +00:00
Matthew Hodgson	a0cdaf29f9	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:42 -08:00
Luke Barnard	a96bfee9f2	Remove unused UserSettingsStore import	2017-11-10 16:12:27 +00:00
Luke Barnard	ceda5939f9	Remember to import React	2017-11-10 15:55:55 +00:00
Luke Barnard	853d33a93a	Make groups a fully-fleged baked-in feature	2017-11-10 15:42:11 +00:00
Luke Barnard	6e1cf6ce17	Merge pull request #1548 from matrix-org/rxl881/widgetrendering ... Improve widget rendering on prop updates	2017-11-10 12:41:20 +00:00
Luke Barnard	74c6ebc5c6	Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action ... Display group member profile (avatar/displayname) in ConfirmUserActionDialog	2017-11-10 12:31:47 +00:00
David Baker	d2549b621c	Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule ... Don't crash if there isn't a room notif rule	2017-11-10 11:57:43 +00:00
Luke Barnard	981ca458ec	Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip ... Show group name in flair tooltip if one is set	2017-11-10 11:51:45 +00:00
Richard Lewis	ba8a9f2a43	Comment length	2017-11-10 11:50:14 +00:00
David Baker	ff5e00d244	Don't crash if there isn't a room notif rule	2017-11-10 11:50:00 +00:00
Luke Barnard	6deeaf94d6	group name not required	2017-11-10 11:43:05 +00:00
Richard Lewis	d2070a08d8	Replace 'qs' dep. with 'querystring'	2017-11-10 11:42:56 +00:00
Luke Barnard	90a63d78b9	Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar ... Convert group avatar URL to HTTP before handing to BaseAvatar	2017-11-10 11:41:51 +00:00
Luke Barnard	d179267714	Add prop type	2017-11-10 11:41:36 +00:00
Peter Vágner	681f43913a	Make the disabled PowerSelector element showing custom value translatable. Fixes #5547	2017-11-10 11:26:53 +01:00
Richard Lewis	bd6b5c4498	Improve function name.	2017-11-10 10:17:55 +00:00
Richard Lewis	98ac3dd19b	Explicitly set initialisation state.	2017-11-10 09:44:58 +00:00
Luke Barnard	31be27515c	Modify the group room visibility API to reflect the js-sdk changes ... See https://github.com/matrix-org/matrix-js-sdk/pull/569	2017-11-09 16:28:21 +00:00
David Baker	b1ec430523	Remove now-unused dispatches	2017-11-09 16:09:12 +00:00
David Baker	820d9c1c25	Show staus bar on Unknown Device Error ... Don't pop up the dialog as soon as we can't send a message. Also removes dispatches used to keep the RoomStatusBar up to date. We can get the same events straight from the js-sdk via the pending events event.	2017-11-09 15:58:15 +00:00
Luke Barnard	a8487c540f	Convert group avatar URL to HTTP before handing to BaseAvatar ... This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.	2017-11-09 14:34:04 +00:00
Richard Lewis	da8b1ff1cd	Ensure that loading state is reset when showing app panel.	2017-11-09 14:28:24 +00:00
Luke Barnard	9a6c9594a1	Correctly display group invite ... By making sure the groupName truncates in the right place	2017-11-09 14:16:54 +00:00
Richard Lewis	f796bc79c3	Fix addition of scalar token to widget URL. ... Add error logging.	2017-11-09 14:07:29 +00:00
Luke Barnard	9027780215	Show group name in flair tooltip if one is set ... e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver" Fixes https://github.com/vector-im/riot-web/issues/5341	2017-11-09 12:38:43 +00:00
Luke Barnard	6eeb91ee2e	Display group member profile (avatar/displayname) in ConfirmUserActionDialog ... Fixes https://github.com/vector-im/riot-web/issues/5486	2017-11-09 12:24:20 +00:00
Travis Ralston	030633fa90	Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings	2017-11-08 17:43:38 -07:00
Travis Ralston	2711da28b4	Use the SettingsStore in the UnknownDeviceDialog	2017-11-08 17:43:06 -07:00
Travis Ralston	f7da5836e1	Make blacklistUnverifiedDevices override the level order ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-08 17:41:32 -07:00
Richard Lewis	8016fb82d7	Fix broken commit.	2017-11-08 20:38:54 +00:00
Richard Lewis	56581ef408	Fix various loadingElement related issues.	2017-11-08 20:38:31 +00:00
Richard Lewis	b2b07d9370	Formatting	2017-11-08 20:17:28 +00:00
David Baker	7b243bf64d	Revert "UnknownDeviceDialog: get devices from SDK"	2017-11-08 18:49:50 +00:00
Richard Lewis	be0a76dbd6	Update variable name and JSdoc for improved clarity.	2017-11-08 17:44:54 +00:00
David Baker	b575df7da7	Merge pull request #1591 from matrix-org/luke/groups-order-admins-first ... Order users in the group member list with admins first	2017-11-08 14:04:28 +00:00
Luke Barnard	e2a0cba6cb	If group member privilege level is equal, disambiguate with displayname or userId	2017-11-08 13:57:38 +00:00
Matthew Hodgson	e729bc431d	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-08 04:29:52 -08:00
Luke Barnard	e3e161fbea	Order users in the group member list with admins first	2017-11-08 11:51:58 +00:00
Luke Barnard	7075931c58	Merge pull request #1589 from matrix-org/luke/improve-room-address-picker ... Improve address picker for rooms	2017-11-08 11:49:45 +00:00
Luke Barnard	c1d9d3714a	Fix not being able to filter community rooms - fixes vector-im/vector-web#5538	2017-11-08 10:55:51 +00:00
Luke Barnard	077ca36b05	Rank rooms with shorter matching aliases first	2017-11-08 10:47:45 +00:00
Luke Barnard	b3674f503d	Do not search through room topics	2017-11-08 10:32:48 +00:00
Luke Barnard	4c47f75918	Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility ... Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-08 10:04:41 +00:00
Peter Vágner	a29ab0976b	Make the addresses heading on the aliases settings view translatable	2017-11-08 10:23:11 +01:00
Matthew Hodgson	ce6957a288	Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api ... Alter group member api	2017-11-07 22:46:11 +00:00
Travis Ralston	289b0c2b6a	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
Luke Barnard	8fbe50a1cf	Merge pull request #1580 from matrix-org/luke/groups-new-group-settings ... Improve group creation UX	2017-11-07 18:55:34 +00:00
Luke Barnard	d777e370f2	Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing ... Disable RoomDetailList in GroupView when editing	2017-11-07 18:53:04 +00:00
Luke Barnard	edc744067f	Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-07 18:51:41 +00:00
Matthew Hodgson	3b1726657f	Merge pull request #1586 from turt2live/travis/message-pinning-fix1 ... Default to no read pins if there is no applicable account data	2017-11-07 18:24:21 +00:00
David Baker	49a935881f	Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk ... UnknownDeviceDialog: get devices from SDK	2017-11-07 18:15:59 +00:00
Travis Ralston	e0ddd88ec9	Default to no read pins if there is no applicable account data ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 11:14:27 -07:00
Matthew Hodgson	e14e0bf200	Merge pull request #1486 from turt2live/travis/pinned-notice ... Add a small indicator for when a new event is pinned	2017-11-07 17:56:12 +00:00
David Baker	10f15dfc56	Unmounted guard	2017-11-07 17:10:40 +00:00
Luke Barnard	80d4873542	Disable RoomDetailList in GroupView when editing ... Otherwise the rooms can be clicked on.	2017-11-07 16:54:28 +00:00
David Baker	ec560345c7	UnknownDeviceDialog: get devices from SDK ... rather than having to have the error message passed in. This is in preparation for not having the dialog pop up straight away when a message isn't sent so we don't have to keep the error object knocking around somewhere.	2017-11-07 16:37:43 +00:00
Travis Ralston	142d23a099	Cap the read pin event IDs to 10 ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 09:16:19 -07:00
Luke Barnard	646cabf324	Add missing whitespace	2017-11-07 15:15:10 +00:00
Luke Barnard	ddc1ff2f23	Name things in a sane way	2017-11-07 15:13:26 +00:00
Luke Barnard	62305a1ccd	Implement tooltip for group rooms	2017-11-07 14:07:31 +00:00
Richard Lewis	96de72ab44	Switch to using existing dep "qs" and record in package.json	2017-11-07 12:45:12 +00:00
Richard Lewis	d3784b4925	Fix URL parameter encoding.	2017-11-07 12:33:38 +00:00
Richard Lewis	eb8c15075a	Fix url params parsing.	2017-11-07 11:58:38 +00:00
Luke Barnard	7a09127687	Alter group member api ... To match https://github.com/matrix-org/synapse/pull/2647	2017-11-07 11:27:42 +00:00
Richard Lewis	70c4100350	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-07 11:04:05 +00:00
Luke Barnard	47bf991471	Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills ... Room notifs in autocomplete & composer	2017-11-07 10:25:48 +00:00
David Baker	df5c6470e8	get dict syntax right	2017-11-06 22:01:23 +00:00
Luke Barnard	36cd22663a	Open group settings when the group is created	2017-11-06 18:02:50 +00:00
David Baker	029853d379	Merge pull request #1578 from matrix-org/luke/groups-admin-badges ... Indicate admins in the group member list with a sheriff badge	2017-11-06 17:16:34 +00:00
David Baker	08d006d112	PR feedback	2017-11-06 17:15:09 +00:00
Luke Barnard	d6a6e59d6c	Indicate admins in the group member list with a sheriff badge	2017-11-06 16:37:16 +00:00
David Baker	adc4290451	Pillify room notif pills in composer	2017-11-06 15:11:42 +00:00
Richard Lewis	f1db564506	Merge pull request #1533 from anoadragon453/develop ... Remember whether widget drawer was hidden per-room	2017-11-06 14:29:25 +00:00
Travis Ralston	781b94c8f4	Appease the linter ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 15:37:06 -07:00
Travis Ralston	45140cab69	Don't assume false means "use state" ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:42 -07:00
Travis Ralston	ef45d82ec6	Fix URL preview save calls ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:20 -07:00
Travis Ralston	b75be41f94	Fix split-brain for blacklistUnverifiedDevices ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:06 -07:00
Travis Ralston	cb17c0a379	Migrate blacklistUnverifiedDevicesPerRoom ... This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:15:55 -07:00
Matthew Hodgson	8587b36715	Merge branch 'develop' into matthew/status	2017-11-04 23:51:26 +00:00
Matthew Hodgson	b2ddcb8027	tint the colours in the theme rather than hardcode vector green	2017-11-04 23:43:20 +00:00
Travis Ralston	c7eee36990	Fix lanugage detection ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:38:26 -06:00
Travis Ralston	4f1ad974fc	Delay URL preview saving until the save button is pressed ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:32:13 -06:00
Travis Ralston	358298e4ee	Support room color in settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:10:25 -06:00
Matthew Hodgson	3fd5937687	Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing ... Fixes React warning	2017-11-04 15:41:57 +00:00
Travis Ralston	8282534f87	Add SettingsLevel enum; Move settings to own file. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 23:19:45 -06:00
Travis Ralston	893c39bfbe	Merge branch 'develop' into travis/granular-settings	2017-11-03 22:00:07 -06:00
Travis Ralston	de6fc32a87	Show an indicator when there are any pins in the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 20:00:48 -06:00
Travis Ralston	a2b7f6d30e	Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice	2017-11-03 19:57:39 -06:00
Travis Ralston	5c37155730	Don't assume we have a valid event. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 18:18:09 -06:00
Travis Ralston	3656fdb571	Store read pinned events as an array to avoid racing saves. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 18:12:57 -06:00
Luke Barnard	58f1757f0c	Handle rooms with no aliases or canonical alias	2017-11-03 17:52:36 +00:00
Luke Barnard	98312a4647	Use, if possible, a room's canonical or first alias when viewing the room ... (Only affects rooms the user has never joined)	2017-11-03 17:37:13 +00:00
Luke Barnard	abff4ee6b5	Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog ... Add CSS classes to group ID input in CreateGroupDialog	2017-11-03 16:14:59 +00:00
Luke Barnard	b88c13d527	Use prefixed class names to avoid collisions with other libraries	2017-11-03 16:02:41 +00:00
Luke Barnard	e84e4ed5f5	Add CSS classes to group ID input in CreateGroupDialog	2017-11-03 15:38:12 +00:00
Matthew Hodgson	6747390333	merge	2017-11-03 15:12:24 +00:00
David Baker	43a23d7e89	Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room ... Give autocomplete providers the room they're in	2017-11-03 14:29:59 +00:00
David Baker	2c9a93a8ac	Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills ... Fix multiple pills on one line	2017-11-03 14:24:33 +00:00
David Baker	802ab16746	Fix multiple pills on one line	2017-11-03 14:06:59 +00:00
Michael Telatynski	b2cd65e182	Fixes React warning ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-03 12:30:58 +00:00
Luke Barnard	151f9917b1	Fix group invites such that they look similar to room invites ... - Change GroupInviteTile to use RoomTile CSS - Give group invites their own sub list, with heading "Community Invites"	2017-11-03 12:19:37 +00:00
Richard Lewis	853ada027d	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-02 18:34:46 +00:00
Richard Lewis	0e854ee356	Fix loading and initialisation spinners.	2017-11-02 18:33:11 +00:00
David Baker	843d797ded	Better type checking	2017-11-02 18:17:57 +00:00
David Baker	7f9967389d	Pass room into Autocompleter	2017-11-02 18:15:26 +00:00
David Baker	498b117d5a	copyrights	2017-11-02 18:01:28 +00:00
David Baker	4953d4de4d	Give autocomplete providers the room they're in ... Removes the gut-wrenching that RoomView does to jam the user list into the user autocomplete provider.	2017-11-02 17:51:08 +00:00
Richard Lewis	a52bb9d603	Pass URL to check.	2017-11-02 17:27:59 +00:00
David Baker	7c17ad8509	Merge pull request #1566 from matrix-org/luke/groups-room-publicity ... Add toggle to alter visibility of a room-group association	2017-11-02 15:38:03 +00:00
Luke Barnard	982e87e01c	Communities are communities, wrap div for label alignment	2017-11-02 15:04:40 +00:00
David Baker	8895ab7e5b	Merge pull request #1564 from matrix-org/dbkr/pillify_at_room ... Pillify room notifs in the timeline	2017-11-02 14:22:58 +00:00
Luke Barnard	bf77b51b5e	Merge branch 'develop' into luke/groups-room-publicity	2017-11-02 13:39:33 +00:00
Luke Barnard	790db94fd7	Add toggle to alter the visibility of a room-group association	2017-11-02 13:31:11 +00:00
Luke Barnard	e909d859ab	Merge branch 'develop' into luke/groups-room-info	2017-11-02 10:56:33 +00:00
David Baker	4f8d6d8fbe	Pillify room notifs in the timeline ... This scans text nodes in the DOM for room notifications and turns them into pills. Changes the pillification code around a bit so it works with text nodes. Uses the push processor directly to test the event against the room notifiation rule so we know whether this event would actually trigger a room notification (needs to hook into push at a lower level because otherwise our own room notifications would not pillify since our own events never generate notifications). Requires https://github.com/matrix-org/matrix-js-sdk/pull/565	2017-11-01 19:42:47 +00:00
Luke Barnard	64a369216a	Implement simple GroupRoomInfo ... which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.	2017-11-01 17:27:35 +00:00
Luke Barnard	0dcd52d88f	Fix some react warnings firing	2017-11-01 17:12:22 +00:00
Matthew Hodgson	64d8c81897	Merge branch 'develop' into matthew/status	2017-11-01 15:24:30 +00:00
Stefan Parviainen	e1e4fc2dac	Make eslint happy ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 16:18:48 +01:00
Stefan Parviainen	d6f1e12bee	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:50:45 +01:00
Richard Lewis	17c0405862	Restructure to pass props from componentWillRecieveProps.	2017-10-31 16:31:46 +00:00
Luke Barnard	302bd6c3e9	Escape dash in regex	2017-10-31 11:48:56 +00:00
Richard Lewis	758df29b23	Fix onLoad on wrong element.	2017-10-31 10:43:17 +00:00
Richard Lewis	35b33263ea	Use querystring lib	2017-10-31 10:37:40 +00:00
Luke Barnard	53938f7998	Change client-side validation of group IDs to match synapse	2017-10-31 10:25:06 +00:00
Richard Lewis	1cb878bb57	Formatting	2017-10-31 10:04:37 +00:00
Richard Lewis	648b295971	Removed comment	2017-10-31 10:04:02 +00:00
Travis Ralston	6f8523081b	Some documentation ... Far from complete, and probably needs a bit of work, but it's a start. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 21:09:24 -06:00
Travis Ralston	f070604350	Rename SettingsCheckbox to be a bit more generic ... Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 20:08:27 -06:00
Travis Ralston	9c846e4dd9	Fix URL preview options ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:49:44 -06:00
Luke Barnard	4e234cfc3b	Alter UI for disinviting a group member ... The same API as kicking is used for disinviting, so only cosmetic changes needed here.	2017-10-30 18:17:35 +00:00
Luke Barnard	19b798be10	Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools ... Only show admin tools to privileged users	2017-10-30 18:03:24 +00:00
Luke Barnard	3e64333ada	Only show admin tools to privileged users	2017-10-30 16:45:45 +00:00
David Baker	57d516f042	Don't refresh page on password change prompt ... It's on the form submit but missing a preventDefault	2017-10-30 16:28:27 +00:00
Luke Barnard	14d600a69f	Fix initial in GroupAvatar in GroupView	2017-10-30 15:04:12 +00:00
Travis Ralston	72517f95bb	Don't explode if the SdkConfig isn't available ... This can happen prior to logging in, for some reason. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:53:59 -06:00
Travis Ralston	99ee58d13a	Don't break the room settings page ... A later commit will make the URL preview settings behave like the rest of the settings page. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:18:03 -06:00
Travis Ralston	c056f4faa6	Make URL preview checkboxes pretty again ... Works for all other settings too! Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:17:15 -06:00
Travis Ralston	b139c8d01c	Generate unique IDs for SettingsCheckbox ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:16:46 -06:00
Travis Ralston	786bd87fec	Support URL previews (with bugs) ... Known issues at this point: * The room-level setting accepts the current user's default, which is wrong * The checkboxes on RoomSettings are not independent * The checkboxes in RoomSettings need some layout fixes Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:48:29 -06:00
Travis Ralston	b5d5c81f32	Add a new component to back various settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:43:27 -06:00
Travis Ralston	0d3f0eaf98	Convert local settings to granular settings ... This breaks language selection. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:53:00 -06:00
Travis Ralston	ae10a11ac4	Convert synced settings to granular settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 01:43:52 -06:00
Travis Ralston	bf815f4be9	Support labs features ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 20:21:50 -06:00
David Baker	858c3a2548	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-10-27 18:59:57 +01:00
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
Richard Lewis	3756ce606d	Check URL prop updates and ensure that widgets are refreshed.	2017-10-27 17:49:14 +01:00
Matthew Hodgson	5d0629ff73	resolve matrix.status.im v. matrix.org confusion	2017-10-27 14:23:16 +01:00
Richard Lewis	7662b5ac8f	Unfinished, non-working changes to try and handle URL changes gracefully	2017-10-27 13:47:51 +01:00
Luke Barnard	e094c32c62	Simplify GroupStore listener registration	2017-10-27 11:38:10 +01:00
Matthew Hodgson	0952befdea	target blank for tg	2017-10-27 01:09:37 +01:00
Matthew Hodgson	015aed0597	hide optionality of email for status	2017-10-27 01:03:04 +01:00
Andrew (anoa)	b4868a6846	showWidget->hideWidgetDrawer and remove logs ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-26 11:27:58 -07:00
Michael Telatynski	1d5b4a9d50	Merge branch 'develop' into t3chguy/mention_user	2017-10-26 18:10:10 +01:00
Matthew Hodgson	14d9743e30	unbreak reg	2017-10-26 17:22:32 +01:00
Luke Barnard	eec6ed36cd	Use correct icon for group room deletion and make themeable ... Also fix cancel icons to have class mx_filterFlipColor	2017-10-26 14:05:58 +01:00
David Baker	5871a74228	Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo ... Add invite button to MemberInfo if user has left or wasn't in room	2017-10-26 11:35:45 +01:00
Luke Barnard	591a7f4b86	Default to false	2017-10-26 10:06:04 +01:00
Luke Barnard	97b9cf6402	Actually use the synced setting	2017-10-26 09:58:46 +01:00
David Baker	e6c3483c8b	Add correct telegram link	2017-10-26 09:58:05 +01:00
Matthew Hodgson	deb0f902e3	linting	2017-10-26 01:59:18 +01:00
Matthew Hodgson	1237de3ef0	Merge branch 'develop' into matthew/status	2017-10-26 01:47:22 +01:00
Travis Ralston	e773585a02	Merge remote-tracking branch 'matrix-org/develop' into travis/presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-25 11:21:39 -06:00
Luke Barnard	3ae97348f8	Add option to mirror local video feed	2017-10-25 18:17:33 +01:00
Luke Barnard	4cfbd66729	Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip ... Use the correct userId when displaying who redacted a message	2017-10-25 17:47:22 +01:00
Luke Barnard	cedc0b27a9	Handle redaction with no sender	2017-10-25 17:37:20 +01:00
Luke Barnard	5990e41bd7	Use the correct userId when displaying who redacted a message	2017-10-25 17:24:45 +01:00
Stefan Parviainen	53e983f9c7	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-25 18:19:27 +02:00
Michael Telatynski	fd7e057ec0	Merge branch 'develop' into t3chguy/invite_in_memberinfo	2017-10-25 16:33:50 +01:00
David Baker	8ed3474b64	Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists ... Only show editing UI for aliases/related_groups for users /w power	2017-10-25 15:52:51 +01:00
Luke Barnard	39fa866d68	Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui ... Swap from `ui_opacity` to `panel_disabled`	2017-10-25 15:47:18 +01:00
Luke Barnard	b1f2a6c1e9	Dramatically simplify use of mx_fadable ... by applying it to parent elements of things that need to be faded.	2017-10-25 15:15:49 +01:00
David Baker	19364c25ee	Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name ... Fix room address picker tiles default name	2017-10-25 14:25:51 +01:00
Luke Barnard	fbe0cc4927	Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50 ... T3chguy/hide level change on 50	2017-10-25 14:09:59 +01:00
Michael Telatynski	f3c8951d4e	remove unused lastPresenceTs ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:56:23 +01:00
Luke Barnard	27f845a7aa	Match on any alias	2017-10-25 12:42:58 +01:00
Luke Barnard	7029ab07fc	If no canonical alias, use first alias (and fallback to Unnamed)	2017-10-25 12:38:39 +01:00
Luke Barnard	2f8f2ce76e	Swap from ui_opacity to panel_disabled ... to simplify the process of disabling panels in the UI.	2017-10-25 11:23:51 +01:00
Richard Lewis	fd85c74bc5	Merge pull request #1520 from matrix-org/rxl881/deleteWidget ... Add a delete confirmation dialog for widgets	2017-10-25 10:45:52 +01:00
Richard Lewis	2e3bdfd55d	Fix string indentation.	2017-10-25 10:45:17 +01:00
Matthew Hodgson	6beb604cd0	fascist linting >:(	2017-10-25 02:31:30 +01:00
Matthew Hodgson	eb4b7c78a0	skin register screen	2017-10-25 02:04:02 +01:00
Matthew Hodgson	adbea44d70	hide login options for status	2017-10-25 01:30:09 +01:00
Michael Telatynski	b3463146ba	Add invite button to MemberInfo if user has left or wasn't in room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 01:00:13 +01:00
Andrew (anoa)	9821f0d459	Fix linting ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-24 16:42:06 -07:00
Andrew (anoa)	f032284eff	Remember whether widget drawer was hidden per-room ... Fixes #4850 Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-24 16:28:10 -07:00
Matthew Hodgson	26e8b2c1b3	switch to a LoginPage wrapper component ... as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered	2017-10-24 23:37:26 +01:00
Michael Telatynski	5514d81683	Add Mention button to MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 23:01:40 +01:00
Michael Telatynski	c896dfb17b	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 22:21:33 +01:00
Michael Telatynski	f813a752e7	only show change power level option in MemberInfo if we can actually ... send m.room.power_level AND are lower PL than them Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 22:12:48 +01:00
Stefan Parviainen	88fd60066f	Fix typo ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 20:07:57 +02:00
Stefan Parviainen	b5024cca75	Further simplify MemberEventListSummary a bit ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 19:34:08 +02:00
Luke Barnard	e9ce7f97f5	canSetRelatedRooms -> canSetRelatedGroups	2017-10-24 17:57:26 +01:00
Stefan Parviainen	4ff369c884	Merge branch 'develop' into departify	2017-10-24 18:27:24 +02:00
Luke Barnard	640d88f25d	Typo	2017-10-24 16:21:18 +01:00
Luke Barnard	ee7ebc425c	Only show editing UI for aliases/related_groups for users /w power	2017-10-24 16:19:09 +01:00
David Baker	ba46faf1b1	Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings ... Fix some react warnings in GroupMemberList	2017-10-24 11:18:03 +01:00
Luke Barnard	d1db0d6426	Deduplicate members, key by userId	2017-10-24 10:50:31 +01:00
Luke Barnard	e419446081	Add fields needed by RoomDetailList to groupRoomFromApiObject ... and also alter props API for RDL to match the returned rooms. (This doesn't affect RoomDirectory - this does not use RDL (yet))	2017-10-24 10:13:38 +01:00
Luke Barnard	1cc427ba46	Fix some react warnings in GroupMemberList ... - If the list contains two users twice, react would warn about duplicate keys. Use `index` instead. - Check if unmounted before setting state after fetching members.	2017-10-24 09:58:45 +01:00
Richard Lewis	11d4a63a32	Update text and split across multiple lines.	2017-10-23 23:59:36 +01:00
Richard Lewis	8b7f737c97	Remove logging. ... Return early.	2017-10-23 23:47:37 +01:00
Richard Lewis	54bd916862	Split string across multiple lines.	2017-10-23 20:08:52 +01:00
Stefan Parviainen	115772d526	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:57:52 +02:00
Stefan Parviainen	ef30ba889b	Make MemberEventListSummary more translatable ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:55:40 +02:00
Richard Lewis	3c4c986aca	Update button text	2017-10-23 18:42:43 +01:00
Luke Barnard	2f418976aa	Only show flair for groups with avatars set ... Fix vector-im/riot-web#5377	2017-10-23 17:06:47 +01:00
Richard Lewis	ee60155846	Add delete widget confirmation dialog.	2017-10-23 17:05:44 +01:00
Luke Barnard	0799e5cde4	Refresh group member lists after inviting users	2017-10-23 16:04:26 +01:00
Luke Barnard	03f4e6c622	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-10-23 14:57:50 +01:00
Luke Barnard	a133fd1cf4	Fix "failed to create community" message	2017-10-23 14:57:40 +01:00
Matthew Hodgson	440b8e0e31	16px for flair please	2017-10-23 14:56:24 +01:00
Luke Barnard	e89371fb1c	Add click-to-open-settings functionality to GroupAvatar	2017-10-23 14:54:57 +01:00
Matthew Hodgson	f09fbccc19	WIP	2017-10-23 00:56:15 +01:00
David Baker	cbb36f4780	Lint	2017-10-19 17:31:06 +01:00
David Baker	b9574ff382	Group create dialog: only enter localpart ... Since we currently can only create groups on the local server anyway, there's no point making the user jump through the hoop of forming the whole group ID and telling them off if they got the server name wrong.	2017-10-19 16:47:43 +01:00
David Baker	19173ab4d6	Space, man.	2017-10-19 16:31:45 +01:00
David Baker	4abaa93cf0	Add clientside error for non-alphanumeric group ID	2017-10-19 16:28:02 +01:00
Luke Barnard	ea1dbe1f76	Fix invites to groups without names	2017-10-19 15:47:52 +01:00
Luke Barnard	2be0ebdd1d	More Groups->Communities	2017-10-19 15:01:16 +01:00
Luke Barnard	fd65cb1396	Merge pull request #1501 from matrix-org/luke/groups-are-communities ... Groups -> Communities	2017-10-19 12:16:15 +01:00
Luke Barnard	71443e9b94	Remove logs comments	2017-10-19 10:34:24 +01:00
Luke Barnard	5f3c06b38a	Factor out Flair cache into FlairStore ... This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).	2017-10-19 10:28:59 +01:00
Luke Barnard	a40704f085	Merge branch 'develop' into luke/groups-are-communities	2017-10-18 15:57:37 +01:00
Stefan Parviainen	7eeed3e093	Simplify MemberEventListSummary by using pluralization provided by the i18n library ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 23:46:23 +02:00
Stefan Parviainen	fc860c66bc	De-partify RoomPreviewBar ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 22:03:49 +02:00
Stefan Parviainen	468a05c6f1	Fix SenderProfile ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 21:32:35 +02:00
Luke Barnard	1b8c5b50db	Don't show room IDs when picking rooms	2017-10-17 18:02:35 +01:00
Luke Barnard	85d99d429d	Use correct logic operator	2017-10-17 09:49:39 +01:00
Stefan Parviainen	8083dccfa5	De-partify SenderProfile ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi> Also, text does not need to be EmojiText	2017-10-16 20:53:43 +02:00
Luke Barnard	14eee9a37a	Only show invited section if there are invited group members	2017-10-16 17:59:53 +01:00
Luke Barnard	0c34e943fb	Merge branch 'develop' into luke/groups-are-communities	2017-10-16 17:34:06 +01:00
Luke Barnard	760b3cc60a	Merge pull request #1488 from matrix-org/luke/groups-invited-users ... Show "Invited" section in the user list	2017-10-16 18:29:15 +02:00
Luke Barnard	9b08f4d11f	Separate fetching indicator state	2017-10-16 17:21:05 +01:00
Luke Barnard	008e8d4f54	Show "Invited" section in the user list	2017-10-16 16:38:32 +01:00
Luke Barnard	47ac0988ba	Refactor class names for an entity tile being hovered over	2017-10-16 16:31:13 +01:00
Luke Barnard	eaa5dd5f22	Groups -> Communities in the UI ... Translation files still need updating, and this would be much simpler with a script that could automate the tedium	2017-10-16 13:18:39 +01:00
David Baker	e4a3309752	Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque ... Modify GroupView UI	2017-10-16 10:17:44 +01:00
Travis Ralston	4f6cd6b23a	Add a small indicator for when a new event is pinned ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-15 21:17:43 -06:00
Stefan Parviainen	ad2f54f8ab	Fix italics and parens ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-15 18:01:57 +02:00
Stefan Parviainen	15d1dc1f3b	Fix indentation ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-15 16:57:22 +02:00
Stefan Parviainen	9a5cffb5eb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify	2017-10-15 16:49:27 +02:00
Travis Ralston	7307bc412f	Respond to updates from presence context menu ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 23:16:12 -06:00
Travis Ralston	c483717282	Make onClick be a context menu for presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 21:44:07 -06:00
Travis Ralston	788e16a716	Linting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 20:23:50 -06:00
Travis Ralston	0b20681f6a	Put presence management behind a labs setting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 19:13:46 -06:00
Travis Ralston	854394cb2e	Merge branch 'develop' into travis/presence	2017-10-14 18:49:58 -06:00
Matthew Hodgson	1d75d9e90d	yet more horrifically strict linting :/	2017-10-15 01:47:11 +01:00
Matthew Hodgson	635996c083	more bizarrely strict linting :/	2017-10-15 01:19:06 +01:00
Matthew Hodgson	247e32115f	bizarrely strict linting :/	2017-10-15 01:13:52 +01:00
Matthew Hodgson	2b367edccf	Merge pull request #1439 from turt2live/travis/pinned_messages ... Message/event pinning	2017-10-15 01:03:18 +01:00
Travis Ralston	49c19bc9b4	Merge branch 'develop' into travis/presence	2017-10-14 17:26:54 -06:00
Matthew Hodgson	e57d9e686b	Merge branch 'develop' into t3chguy/jump_to_rr	2017-10-14 23:45:17 +01:00
Matthew Hodgson	f32ba0b54c	Merge pull request #1462 from pafcu/translation-fixes ... Use standard subsitution syntax in _tJsx	2017-10-14 23:43:12 +01:00
Matthew Hodgson	71d25bf787	Merge pull request #1442 from turt2live/travis/no_grey ... Don't suggest grey as a color scheme for a room	2017-10-14 23:41:32 +01:00
Travis Ralston	8a641c7173	Hide message pinning behind a labs setting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 16:40:10 -06:00
Travis Ralston	c34b55c6c7	Merge branch 'develop' into travis/pinned_messages	2017-10-14 16:10:32 -06:00
Matthew Hodgson	3efa0d2a76	Merge pull request #1478 from turt2live/travis/unset-avatar ... Buttons to remove room/self avatar	2017-10-14 22:13:32 +01:00
Matthew Hodgson	0284a582a1	Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist ... T3chguy/fix memberlist	2017-10-14 22:09:55 +01:00
Travis Ralston	6cd07731c4	Add MemberPresenceAvatar and control presence ourselves ... Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 14:37:47 -06:00
Michael Telatynski	c1edc0c32e	add option to disable BigEmoji ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 19:40:45 +01:00
Michael Telatynski	b0b7472901	undo bad merge ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 17:14:57 +01:00