2968 commits

Author	SHA1	Message	Date
David Baker	a918d73c29	Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings ... fix a bunch of instances of react console spam	2018-06-18 10:47:20 +01:00
David Baker	210d920a92	Merge pull request #1949 from matrix-org/luke/track-uisis-piwik ... Track decryption success/failure rate with piwik	2018-06-18 10:12:26 +01:00
Michael Telatynski	eb32dda260	given we also want to hide widget events, hide all except m.room.message ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 19:52:15 +01:00
Michael Telatynski	b87824ba92	hide m.room.avatar from FilePanel via sync filter ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 19:50:51 +01:00
Michael Telatynski	7d19841e68	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 09:48:57 +01:00
Michael Telatynski	61e09395d0	split continuations if longer than N ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 09:45:06 +01:00
Michael Telatynski	423b8939e7	simplify handled logic by inverting it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 08:52:14 +01:00
Michael Telatynski	ff33ef4b51	allow using tab to navigate room list smarter ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 08:50:53 +01:00
Michael Telatynski	1afdb0e3c0	add null-guard ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 08:44:57 +01:00
Michael Telatynski	8971211639	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 08:42:40 +01:00
Michael Telatynski	efaccf7344	implement hitting enter after Ctrl-K should switch to the first result ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 08:42:28 +01:00
Michael Telatynski	43681026b8	s/onClick/onChange because react cries about it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 19:01:12 +01:00
Michael Telatynski	a899871d52	specify unique key to make react happy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 18:55:37 +01:00
Michael Telatynski	a2219472f6	inline redundant bodyNodes, fixes react no unique key warning too ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 18:47:15 +01:00
Michael Telatynski	5fbadbc44f	comment out visibility:hidden div as it seems unfinished ... and refers to undefined method `this._onJoinGroupClick` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 18:42:51 +01:00
Luke Barnard	b0a2772889	Use more consistent start/stop pattern	2018-06-15 17:58:43 +01:00
Luke Barnard	488cc416cf	For now, shelve persistance across sessions	2018-06-15 17:08:11 +01:00
Luke Barnard	7489d7d531	Fix incorrect call to DFT	2018-06-15 16:50:52 +01:00
Luke Barnard	f08274585e	Persist tracked event ID hash using localStorage	2018-06-15 15:30:54 +01:00
Luke Barnard	cfe52a2888	Instead of passing dft.eventDecrypted, call it instead ... So that `this` has the correct reference.	2018-06-15 15:15:05 +01:00
Luke Barnard	62601d657d	Implement DecryptionFailureTracker for less agressive tracking ... Instead of pinging Analytics once per failed decryption, add the failure to a list of failures and after a grace period, add it to a FIFO for tracking. On an interval, track a single failure from the FIFO.	2018-06-15 13:42:18 +01:00
David Baker	349f95d5ab	Merge pull request #1957 from matrix-org/t3chguy/roomsublist_search_aliases ... apply roomlist searchFilter to aliases if it begins with a `#`	2018-06-15 10:55:32 +01:00
David Baker	6904c2bafe	Merge pull request #1948 from matrix-org/export_Group ... Share Dialog	2018-06-15 10:52:27 +01:00
David Baker	5523c1e50a	Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y ... fix styling of clearButton when its not there	2018-06-14 11:47:44 +01:00
Michael Telatynski	3b501137a5	change cursor:pointer iff clicking TagPanel background does something ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 11:42:21 +01:00
Michael Telatynski	c811c30c0d	fix styling of clearButton when its not there ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 11:36:04 +01:00
Michael Telatynski	384c974589	tidy up if statements and fix up comments ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 11:16:57 +01:00
Michael Telatynski	2454540bc0	Merge branch 'develop' into t3chguy/audio_output	2018-06-14 11:03:59 +01:00
David Baker	84a9c6a824	Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y ... improve tag panel accessibility and remove a no-op dispatch	2018-06-14 10:56:03 +01:00
Michael Telatynski	d4578783ef	apply pr review feedback ... fix copyright headers fix user settings link accessibility fix typo and add noopener Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 18:46:02 +01:00
Michael Telatynski	75abb415d4	improve tag panel accessibility and remove a no-op dispatch ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 16:17:26 +01:00
Luke Barnard	3cadbd3974	Include decryption error in decryption failure metrics	2018-06-13 11:21:26 +01:00
Luke Barnard	5a275fcfef	Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname ... don't set the displayname on registration as Synapse now does it	2018-06-13 10:03:35 +01:00
Michael Telatynski	41be46a712	apply roomlist searchFilter to aliases if it begins with a # ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 09:51:35 +01:00
Luke Barnard	230de44071	Adjust comment	2018-06-13 09:38:57 +01:00
Luke Barnard	64b86108d0	Only track decryption failures	2018-06-13 09:38:23 +01:00
Michael Telatynski	175f1aa15c	don't set the displayname on registration as Synapse now does it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 16:43:54 +01:00
Luke Barnard	b18a8c483e	Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen ... Keep context menus that extend downwards vertically on screen	2018-06-12 16:27:57 +01:00
Luke Barnard	ffcba9498e	Keep context menus that extend downwards vertically on screen ... This fixes https://github.com/vector-im/riot-web/issues/3429 in the case of RoomList context menus *and* EventTile context menus. This was mostly stolen from #1903 and it would be good to factor things out at a later date such that #1903 is replaced with similar logic within ContextualMenu.	2018-06-12 16:14:24 +01:00
David Baker	e858cf3bcb	Merge branch 'master' into develop	2018-06-12 14:26:29 +01:00
David Baker	13d52065f5	Merge branch 'release-v0.12.7'	2018-06-12 14:23:48 +01:00
Luke Barnard	0934006817	Track decryption success/failure rate with piwik ... Emit a piwik event when a decryption occurs in the category "E2E" with the action "Decryption result" and the name either "failure" or "success". NB: This will cause Riot to a lot of networking when decrypting many events. One HTTP request per decrypted event should be expected.	2018-06-12 14:13:09 +01:00
Michael Telatynski	7f1ce52dd3	link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 11:22:01 +01:00
Michael Telatynski	64bcf6fd7e	allow ContextualMenu to run without background, for tooltips & fix copy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 11:22:01 +01:00
David Baker	50e08c7560	Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone ... re-run checkIfAlone if a member change occurred in the active room	2018-06-08 17:36:42 +01:00
Michael Telatynski	0b9b03c9ee	re-run checkIfAlone if a member change occurred in the active room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-07 22:01:27 +01:00
Travis Ralston	83f0459a7f	Merge branch 'develop' into travis/persist-pinned-open	2018-06-06 09:17:08 -06:00
David Baker	bea99e07b3	Merge pull request #1940 from matrix-org/luke/exit_settings ... Fix click on faded left/right/middle panel -> close settings	2018-06-05 10:36:58 +01:00
Luke Barnard	6a317569d7	Add null-guard to support browsers that don't support performance ... Like Tor. Fixes https://github.com/vector-im/riot-web/issues/6781	2018-06-04 09:38:21 +01:00
Luke Barnard	d30bc2dc6b	Merge pull request #1937 from turt2live/travis/no-guest ... Replace "Login as guest" with "Try the app first" on login page	2018-06-01 11:58:26 +01:00
Luke Barnard	404c071f2a	Remove lie from docs	2018-05-29 13:19:56 +01:00
Luke Barnard	da9fe9917b	Fix click on faded left/right/middle panel -> close settings ... - implement generic dispatch to close user/room/group settings - use dispatch to allow clicks on disabled left/right/middle panel to close settings A much more maintainable approach would be to use dedicate routing instead of doing different things depending on what page of the app is currently being viewed. At the very least we could make the concept of a settings page generic.	2018-05-29 13:16:39 +01:00
Michael Telatynski	05357b9f8c	improve comment	2018-05-29 12:07:56 +01:00
Matthew Hodgson	25216d4660	Merge branch 'develop' into matthew/e2e_backups	2018-05-28 00:46:05 +01:00
Travis Ralston	e690bcb6ef	Replace "Login as guest" with "Try the app first" on login page ... Fixes vector-im/riot-web#5875 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 20:54:19 -06:00
Travis Ralston	52cdf60954	Add options to pin unread/mentioned rooms to the top of the room list ... Fixes https://github.com/vector-im/riot-web/issues/6604 Fixes https://github.com/vector-im/riot-web/issues/732 Fixes https://github.com/vector-im/riot-web/issues/1104 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 20:29:35 -06:00
Travis Ralston	752605429c	Persist pinned message open-ness between room switches ... Addresses part of https://github.com/vector-im/riot-web/issues/5405 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 19:58:12 -06:00
Michael Telatynski	6636fa32f6	Allow selecting audio output for WebRTC Audio/Video calls ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-26 17:22:23 +01:00
Michael Telatynski	5147246c17	kill stream when using gUM for permission to device labels to kill camera ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-26 15:41:25 +01:00
Matthew Hodgson	7fe2bfc212	remove numbers	2018-05-25 16:30:38 +01:00
Matthew Hodgson	3bf28a08ec	experiments in dharma	2018-05-25 03:17:29 +01:00
David Baker	168b956b3c	homeserver	2018-05-24 17:01:00 +01:00
David Baker	9d2f223773	Message for leaving server notices room	2018-05-24 16:54:48 +01:00
Luke Barnard	658e88c30f	Implement consent/terms and conditions dialog for /_matrix/consent flow	2018-05-22 18:03:56 +01:00
David Baker	ae10491f95	Space between sentences in 'leave room' warning	2018-05-22 09:28:41 +01:00
Luke Barnard	0bda607bb2	Only show cookie bar if analytics configured	2018-05-16 15:53:43 +01:00
Luke Barnard	d15051a635	Add policyLink configuration to piwik ... Also: - Make CookieBar ES6 class - Alter phrasing on CookieBar - Conditionaly display longer "...(See our ++cookie and privacy policies++)." if policy link is configured.	2018-05-16 15:49:23 +01:00
Luke Barnard	d01e738839	Fix UserSettings for new analyticsOptIn	2018-05-16 15:20:38 +01:00
Luke Barnard	ac1cd384e7	Implement opt-in analytics with cookie bar	2018-05-16 15:20:38 +01:00
Travis Ralston	9e11720191	Add setting to enable widget screenshots (if widgets declare support) ... Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-12 14:30:59 -06:00
Luke Barnard	1f2f3474ed	Delinting	2018-05-11 17:28:12 +01:00
Luke Barnard	2c2eda1f00	Export ContextualMenu component, with added hasBackground property ... , which is only enabled when `createMenu` is used.	2018-05-10 17:51:49 +01:00
Luke Barnard	9046769132	Factor out ContextualMenu component	2018-05-10 16:02:25 +01:00
Luke Barnard	22f2d6f292	Fix crash when browser doesn't report page change measurement	2018-05-03 14:08:10 +01:00
Michael Telatynski	4c3f811050	switch RoomView:uploadFile to async to clean up then/catch handling ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-02 13:14:47 +01:00
Michael Telatynski	f2102e283c	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-05-02 13:08:38 +01:00
Michael Telatynski	db55f87699	avoid .done and .then anti-pattern ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-01 18:14:35 +01:00
Luke Barnard	6ec9e5f670	Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor ... Refactor GroupStores into one global GroupStore	2018-05-01 12:33:06 +01:00
Luke Barnard	25690336c3	Prevent user getting trapped in group settings when an error occurs	2018-05-01 11:52:02 +01:00
Luke Barnard	023daef4b7	Refactor GroupStores into one global GroupStore ... Take a step closer to a flux-like architecture for group data, for the purposes of providing features that require it. Now the app has a single GroupStore that can be poked to fetch updates for a particular group.	2018-05-01 11:24:17 +01:00
Luke Barnard	22047d7e72	Merge pull request #1845 from kethinov/hide_encryption_icons ... Hide inline encryption icons except when hovering over a message	2018-04-30 17:57:22 +01:00
David Baker	37cb8abf13	Fix UX issues with bug report dialog ... * Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' & escape to cancel works) * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous about submitting logs. * Continued campaign against 'Click here' links. Fixes https://github.com/vector-im/riot-web/issues/6622	2018-04-30 13:39:46 +01:00
Michael Telatynski	bbf4d3e39f	add comment ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-29 00:34:27 +01:00
David Baker	0c309c88ad	Bluebird has no need for your .done()	2018-04-27 17:52:25 +01:00
David Baker	0323f8ed0c	Wrap exception handling around all of loadSession ... The user might (probably does) have a session even if we haven't actually tried to load it yet, so wrap the whole loadSession code in the error handler we were using for restoring sessions so we gracefully handle exceptions that happen before trying to restore sessions too. Remove the catch in MatrixChat that sent you to the login screen. This is never the right way to handle an error condition: we should only display the login screen if we successfully determined that the user has no session, or they explicitly chose to blow their sessions away.	2018-04-27 11:25:13 +01:00
Michael Telatynski	82d117974f	Remove unused import ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:16:29 +01:00
Luke Barnard	665e052596	Allow debugging of unhandled login errors	2018-04-26 15:09:17 +01:00
David Baker	80837a9199	s/contian/contain/g ... Fixes https://github.com/vector-im/riot-web/issues/6565	2018-04-24 17:53:23 +01:00
Eric Newport	d42fa9d17a	Hide inline encryption icons except when hovering over a message ... Closes https://github.com/vector-im/riot-web/issues/2882 This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988) I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.	2018-04-22 22:30:37 -04:00
Michael Telatynski	58cd585e86	start of BigMerge fixup ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:12:02 +01:00
Matthew Hodgson	92c98aa3e5	displayName should be tracked as static	2018-04-18 16:19:37 +01:00
Matthew Hodgson	f84573ec9f	convert HomePage to ES6 and split out the vectory bit	2018-04-18 10:23:32 +01:00
Matthew Hodgson	40a67ca8fe	point imports at the new locations	2018-04-13 00:43:44 +01:00
Michael Telatynski	c77807bd22	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/i18n/strings/en_EN.json # src/i18n/strings/eu.json # src/i18n/strings/fr.json # src/i18n/strings/lv.json # src/i18n/strings/ru.json # src/i18n/strings/zh_Hant.json	2018-04-12 09:48:06 +01:00
Matthew Hodgson	8ab8f76254	move non-Riot-specific components over from riot-web	2018-04-11 23:58:04 +01:00
Luke Barnard	fca7325b20	Change comments	2018-04-10 15:56:57 +01:00
Luke Barnard	31e9979285	Add 500ms delay to show membershipBusy for longer ... to avoid a UI that flashes quickly	2018-04-10 15:31:04 +01:00
David Baker	74c84addea	Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update ... Improve group join/leave feedback	2018-04-10 13:40:50 +01:00
Luke Barnard	de1073aacb	Factor out _closeSettings for cleanliness	2018-04-10 13:28:42 +01:00
Luke Barnard	24d4df87d1	Show membership spinner next to Leave/Join button when leaving/joining	2018-04-10 11:49:59 +01:00
Luke Barnard	0681df71b0	Hide settings after leaving a group	2018-04-10 11:49:35 +01:00
Luke Barnard	42141f7da7	Fetch group data when leaving or joining to update the view	2018-04-10 10:03:54 +01:00
Matthew Hodgson	0ff2837d7f	rename createGroupButton to not be a total misnomer...	2018-04-09 23:02:59 +01:00
Luke Barnard	2da45277cd	Update group join button to match new API	2018-04-09 16:57:27 +01:00
David Baker	03016b9fc8	Merge pull request #1828 from matrix-org/luke/fix-redact-avatar ... Make stickers/messages continuations of each other	2018-04-06 17:58:26 +01:00
Luke Barnard	01dd494f50	Make stickers/messages continuations of each other	2018-04-06 17:47:44 +01:00
Luke Barnard	008572afe1	Revert "Handle non-m.room.message event types." ... This reverts commit f8d7ab10fa.	2018-04-06 16:42:59 +01:00
Luke Barnard	1e586428ac	Update to match is_openly_joinable API	2018-04-06 14:58:10 +01:00
Luke Barnard	adb78c2931	Fix broken ForgotPassword component	2018-04-06 10:27:03 +01:00
Luke Barnard	59abfa6337	Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable ... Add radio button for setting group m.join_policy	2018-04-05 17:03:04 +01:00
David Baker	03747b8287	Update to use new join_policy API	2018-04-05 16:56:35 +01:00
Richard Lewis	369cbdaaf6	Add missing PropType declarations.	2018-04-04 13:38:07 +01:00
Richard Lewis	702380c591	Add props to style (remaining) menu padding attributes.	2018-04-04 13:37:52 +01:00
Michael Telatynski	1d90835de0	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/RoomView.js	2018-04-04 11:08:34 +01:00
Richard Lewis	f8f8bc469e	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot	2018-04-03 11:34:14 +01:00
Michael Telatynski	80fbc757f5	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-03-31 17:46:31 +01:00
Richard Lewis	ff0834ad9d	Add comment.	2018-03-29 21:31:09 +01:00
Luke Barnard	c9283ad988	Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable	2018-03-29 17:28:44 +01:00
Luke Barnard	2bc8d6d3a4	Use less confusing values on radio buttons	2018-03-29 17:25:06 +01:00
Luke Barnard	e9193ff0b6	Merge branch 'develop' into luke/feature-group-set-joinable	2018-03-29 17:01:19 +01:00
Luke Barnard	f42cdf6a4c	Add radio button for setting group is_joinable ... which dictates whether the group can be joined without invitation.	2018-03-29 16:57:07 +01:00
Richard Lewis	35fcb2c9ab	Catch rather than 'done' error handler.	2018-03-29 16:56:02 +01:00
Richard Lewis	23a52bdb4c	Indentation.	2018-03-29 16:46:22 +01:00
Luke Barnard	1226ad3330	Merge pull request #1815 from matrix-org/luke/feature-group-join ... Join this community button	2018-03-29 15:44:46 +01:00
Luke Barnard	c4322892de	Reword group setting delay	2018-03-29 14:33:54 +01:00
Luke Barnard	385211528d	Implement "Join this community" button ... for groups that have truthy summary.profile.is_joinable.	2018-03-29 12:39:09 +01:00
Luke Barnard	00167fbc06	Init page change state in willMount	2018-03-28 11:25:28 +01:00
Luke Barnard	8d994f2788	Merge branch 'develop' into luke/track-page-change-duration	2018-03-28 10:56:36 +01:00
Luke Barnard	c8312dd5ae	Use a less fragile API to track page change performance	2018-03-28 10:25:28 +01:00
Michael Telatynski	fac89d9c58	Merge branch 'develop' into t3chguy/m.relates_to	2018-03-28 08:38:33 +00:00
Luke Barnard	39e9d52c04	Make sure to proxy special prop ref	2018-03-27 13:04:26 +01:00
Luke Barnard	b80568b1c5	Wrap GeminiScrollbar in a component, enabled forceGemini ... Fixes https://github.com/vector-im/riot-web/issues/6294	2018-03-27 13:04:26 +01:00
Luke Barnard	69d9080dd5	Track duration of page changes ... The duration measured is between - componentWillUpdate of MatrixChat and - componentDidUpdate of MatrixChat. This does not account for *all* changes to the view that occur when a room switch happens, for example. But it does at least capture the difference between switching to a "big" room and switching to a small test room.	2018-03-27 11:17:49 +01:00
Michael Telatynski	b5ed08eba2	Merge ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-24 17:52:49 +00:00
David Baker	580b68a1b6	Merge pull request #1652 from pvagner/dialog-a11y ... Dialog a11y	2018-03-20 11:35:57 +00:00
Luke Barnard	6789a6ec25	Add missing trailing comma	2018-03-19 14:57:41 +00:00
Luke Barnard	0c125b3dff	Merge branch 'develop' into luke/submit-debug-logs	2018-03-19 14:55:28 +00:00
Luke Barnard	aed7c2039d	Update debug logs submission explanation	2018-03-19 14:54:50 +00:00
David Baker	f42769509f	Merge remote-tracking branch 'origin/develop' into dbkr/remove_crypto_migrated_message	2018-03-16 15:48:02 +00:00
Luke Barnard	0d7099fd61	Merge pull request #1801 from matrix-org/luke/perf-room-list ... Improve room list performance when receiving messages	2018-03-15 13:33:19 +00:00
David Baker	ba4626521f	Remove the message on migrating crypto data ... This was for when the new and old versions were available concurrently on /develop and /app. The various migration steps are still logged to the console in js-sdk.	2018-03-15 10:09:12 +00:00
Luke Barnard	bc5699b3d7	Add change delay warning in GroupView settings	2018-03-14 18:17:15 +00:00
Luke Barnard	8672b97f9a	Improve room list performance when receiving messages ... In summary this makes RoomTiles (and RoomAvatars) do more for themselves in terms of reacting individually to state changes in the js-sdk. Instead of force updating the entire room list for avatar changes and room name changes, do this in the RoomTile and RoomAvatar instead. This increases the number of listeners listening to the matrix client, but allows us to properly implement a shouldComponentUpdate for RoomTile (because the avatar, name and notification count are now in component state)	2018-03-14 14:29:55 +00:00
Richard Lewis	b2d23b6999	Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.	2018-03-12 13:56:02 +00:00
Luke Barnard	5ba55858e8	Use TintableSvg for TagPanel clear filter button	2018-03-08 17:06:48 +00:00
Richard Lewis	e2cedbe9d7	Pull in changes from develop	2018-03-05 16:43:59 +00:00
Luke Barnard	86295acba3	Merge branch 'develop' into luke/fix-group-avatar-update	2018-03-01 15:27:06 +00:00
David Baker	e91ae6b5ac	Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness ... Workaround for atlassian/react-beautiful-dnd#273	2018-03-01 15:05:47 +00:00
Luke Barnard	61a6f140f5	onClientSync -> _onClientSync	2018-03-01 14:43:26 +00:00
Luke Barnard	4037a22492	Fix bug where avatar change not reflected in LLP ... Fixes vector-im/riot-web#6189	2018-03-01 14:40:03 +00:00
Luke Barnard	64332b3021	Workaround for atlassian/react-beautiful-dnd#273 ... Fix two bugs in Riot due to a single bug in react-b-dnd Fixes vector-im/riot-web#6253 Fixes vector-im/riot-web#6156	2018-03-01 13:48:46 +00:00
Luke Barnard	27c71f15b9	Add setting to disable TagPanel	2018-02-28 18:16:01 +00:00
Luke Barnard	2b49947e1e	Add "Did you know:..." microcopy to groups view ... To explain how to drag group avatars into the TagPanel	2018-02-27 09:20:06 +00:00
Richard Lewis	b2bf4d4709	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot	2018-02-23 15:37:33 +00:00
Matthew Hodgson	d8ef6f79b1	s/autoShow/autoshow/	2018-02-23 10:14:02 +00:00
Luke Barnard	f08ec3498a	Fix bug that prevented tint updates	2018-02-22 10:53:06 +00:00
Luke Barnard	ff868691c9	Only show "X" when filtering, add alt/title	2018-02-21 17:15:43 +00:00
Luke Barnard	fc73442cdc	Change icon from "R" to "X"	2018-02-21 15:06:10 +00:00
Michael Telatynski	665ddccb0d	restrict to m.text for now ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-20 15:45:25 +00:00
Michael Telatynski	90f9badbf3	s/Reply/ReplyThread/ ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-20 15:40:19 +00:00
Luke Barnard	bc15303358	Factor out updateDmState	2018-02-20 14:10:34 +00:00
Luke Barnard	d21f55633d	Fix DMs being marked as with the current user ("me") ... Whilst testing various DM paths, @lukebarnard1 found that there were many failures to add the room as a DM against the correct user. It turned out most of the failures seen were because the user chosen was the current user. If the user accepted an invite it would often be marked as with themselves because we chose the sender of the join event as the DM user. This fix makes the DM room setting process the same for both the inviting client and the invited client. A RoomState.members event causes the DM room state to be set in the room, regardless of whether we are currently `joining` (see previous impl.) The two cases for setting a DM are: - this user accepting an invite with is_direct - this user inviting someone with is_direct This should handle all cases for setting DM state.	2018-02-20 14:03:43 +00:00
Michael Telatynski	7048d85246	attach message_sent and replies to file uploads ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-19 23:42:04 +00:00
Luke Barnard	7a0c82a327	Fix click background to deselect	2018-02-16 18:08:29 +00:00
Luke Barnard	113fc696d8	Implement global filter to deselect all tags ... and make TagPanel scrollable whilst we're at it.	2018-02-16 17:43:43 +00:00
Luke Barnard	1a880761e0	Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first ... Change CSS class for message panel spinner	2018-02-15 14:51:12 +00:00
Luke Barnard	3948ee8ca1	Give each GroupTile avatar its own droppable ... so that they can be dragged and dropped without interacting with each other, as they would do if GroupView contained one droppable to contain them all.	2018-02-14 17:53:54 +00:00
Luke Barnard	74c8a74e7d	Add Droppable to GroupView ... to contain the GroupTiles as Draggables	2018-02-14 16:43:01 +00:00
Luke Barnard	b626420eb9	Move DND context to LoggedInView ... so that we can drag things from any part of the logged in app to another. (Specifically GroupView and TagPanel).	2018-02-14 16:40:58 +00:00
Luke Barnard	47c232b5b3	Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first	2018-02-14 11:00:27 +00:00
David Baker	7cc82a682c	Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback ... Give the login page its spinner back	2018-02-14 10:31:36 +00:00
Luke Barnard	36e8bf1f20	Change CSS class for message panel spinner ... to stop scrollbars appearing when we - jump to a message or, - permalink that is to an not paginated in event	2018-02-13 14:13:47 +00:00
Luke Barnard	493116b17e	Give the login page its spinner back	2018-02-13 11:43:22 +00:00
Luke Barnard	db0ea9eb0e	Merge branch 'develop' into luke/room-list-flux	2018-02-13 10:18:24 +00:00
Luke Barnard	6d3634a06c	Move groups button to TagPanel	2018-02-13 09:44:00 +00:00
Richard Lewis	55593416fa	Hide apps drawer when viewining room settings.	2018-02-09 13:23:34 +00:00
Peter Vágner	410570936a	Reimplement setting aria-hidden on the main app node by dispatching actions rather than assuming we can find and manipulate the node directly	2018-02-08 22:51:07 +01:00
Luke Barnard	0154772789	Change wording of debug log submission ... Fixes https://github.com/vector-im/riot-web/issues/5985	2018-02-08 18:18:57 +00:00
Richard Lewis	234ca8b062	Remove top padding from app tile.	2018-02-08 17:50:30 +00:00
Richard van der Hoff	5823b32ab1	RoomView: guard against unmounting during peeking ... it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.	2018-02-08 10:01:24 +00:00
lukebarnard	45ad46b468	Fix HS/IS URL reset when switching to Registration	2018-02-07 15:58:29 +00:00
Luke Barnard	cf4ae681f4	Offline mode (#1723) ... * Allow the client to run without connection to HS (i.e. using indexeddb) Allows running without having pushRules (it's safe not to have these when running from indexeddb sync.) This means rooms will be displayed with "unknown" notifcation state. This assumes anything that uses the push rules will get pushRule state again when the client starts syncing again. For recovering from being disconnected, * If an avatar has fallen back, try again on reconnection * If a thumbnail image failed to load, retry on reconnect * Load joined groups when reconnecting Update tests to give MELS a context.matrixClient	2018-02-06 17:50:53 +00:00
lukebarnard	73e3a594ac	Prevent TagTiles from being dragged into other droppables ... for the time being at least.	2018-01-25 22:52:19 +01:00
lukebarnard	d0e3319bd9	Remove DragDropContext from TagPanel and RoomList ... So that we can have one context that can handle DND between the TagPanel and RoomList.	2018-01-25 22:05:20 +01:00
lukebarnard	815f52587b	Move TagPanel out of LoggedInView ... (...and into LeftPanel in riot-web. Can we merge the projects yet?)	2018-01-25 21:53:34 +01:00
Will Hunt	5206c9d18b	Show a warning if the user attempts to leave a room that is invite only	2018-01-19 22:52:43 +00:00
Luke Barnard	a8320fe7e2	Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd ... Swap RoomList to react-beautiful-dnd	2018-01-19 14:49:49 +00:00
lukebarnard	00dc077271	Remove react-dnd, revert fa14bc9 as no longer needed	2018-01-19 13:34:56 +00:00
Richard Lewis	910623d287	Close context menu on resize.	2018-01-18 12:04:00 +00:00
Richard Lewis	917d85d603	Refer rest parameters	2018-01-18 12:03:24 +00:00
Matthew Hodgson	80d3edfbb3	simplify the 'send anyway' text, as 'mark devices known' is meaningless to users	2018-01-18 09:57:29 +00:00
Richard Lewis	f8d7ab10fa	Handle non-m.room.message event types.	2018-01-17 17:19:20 +00:00
David Baker	c64b4e1b1c	Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting	2018-01-16 17:38:32 +00:00
Luke Barnard	62caa4f096	Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd ... Replace TagPanel react-dnd with react-beautiful-dnd	2018-01-16 11:26:44 +00:00
lukebarnard	f19dcd8114	Comment workaround to atlassian/react-beautiful-dnd#273	2018-01-16 11:07:25 +00:00
lukebarnard	bda2d6b0a6	Work around atlassian/react-beautiful-dnd#273 ... For some reason, after dragging an item the parent draggable receives a mouse click. The workaround is to use onMouseDown for deselecting tags	2018-01-16 10:44:11 +00:00
lukebarnard	16c13fb079	Replace TagPanel react-dnd with react-beautiful-dnd ... This new library handles the simple case of an ordered vertical (or horizontal) list of items that can be reordered. It provides animations, handles positioning of items mid-drag and exposes a much simpler API to react-dnd (with a slight loss of potential function, but we don't need this flexibility here anyway). Apart from this, TagOrderStore had to be changed in a highly coupled way, but arguably for the better. Instead of being updated incrementally every time an item is dragged over another and having a separate "commit" action, the asyncronous action `moveTag` is used to reposition the tag in the list and both dispatch an optimistic update and carry out the request as before. (The MatrixActions.accountData is still used to indicate a successful reordering of tags). The view is updated instantly, in an animated way, and this is handled at the layer "above" React by the DND library.	2018-01-15 18:12:27 +00:00
Matthew Hodgson	a233af67ea	initial pseudocode WIP for e2e online backups	2018-01-15 02:02:48 +00:00
Michael Telatynski	b526fc057c	Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep	2018-01-14 18:32:17 +00:00
David Baker	e42bea6277	Don't paginate whilst decrypting events ... As comment hopefully explains. This meant loading the app on an e2e room would often be very slow as it tried to pull hundreds of events into the timeline.	2018-01-12 18:17:03 +00:00
David Baker	b152bd4ab9	Merge pull request #1625 from matrix-org/t3chguy/analytics_info ... Add Analytics Info and add Piwik to SdkConfig.DEFAULTS	2018-01-11 11:02:34 +00:00
David Baker	efb96cdd2a	Merge pull request #1695 from matrix-org/dbkr/send_without_verifying ... Add 'send without verifying' to status bar	2018-01-11 10:34:56 +00:00
Michael Telatynski	1a7dc22a8d	make wantsDateSeparator generic and throw into DateUtils ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:06:24 +00:00
Michael Telatynski	1bc9d344ae	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/messages/TextualBody.js	2018-01-10 11:54:58 +00:00
David Baker	9dd9a5be4b	Wording tweak	2018-01-09 17:59:49 +00:00
David Baker	dbb8f878cb	Tidy up imports	2018-01-09 17:57:18 +00:00
David Baker	4c101628b5	Add 'send without verifying' to status bar ... Fixes other part of https://github.com/vector-im/riot-web/issues/5936	2018-01-09 13:52:37 +00:00
Richard Lewis	5df9a01e64	Use m.room.sticker event.	2018-01-08 12:06:32 +00:00
Luke Barnard	8c84c3f929	Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar ... Hide status bar on visible->hidden transition	2018-01-05 15:26:22 +00:00
David Baker	845dda8f48	Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent ... [revived] Singularise unsent message prompt, if applicable	2018-01-05 12:24:06 +00:00
Michael Telatynski	9f295b7a86	fix typo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-05 12:03:46 +00:00
Michael Telatynski	558a90a359	comment out RoomView.onStatusBarHidden ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-05 11:58:42 +00:00
David Baker	5aed77c752	Merge pull request #1677 from aidalgol/PropTypes ... Remove use of deprecated React.PropTypes	2018-01-05 11:53:55 +00:00
Richard Lewis	54671ab67e	Send m.sticker messages	2018-01-04 21:57:24 +00:00
Richard Lewis	eb4053bc99	Handle sticker message payloads	2018-01-04 18:41:47 +00:00
David Baker	b34f360f96	Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop ... Remove unused selectedRoom prop	2018-01-04 17:33:36 +00:00
David Baker	5961cf3958	Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click ... Fix shift and shift-ctrl click in TagPanel	2018-01-04 17:08:01 +00:00
Michael Telatynski	be48460595	Singularise unsent message prompt, if applicable ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-04 15:05:08 +00:00
lukebarnard	2282f5c26f	Remove unused selectedRoom prop	2018-01-04 14:19:10 +00:00
Richard Lewis	e96d199b28	Inject stickers	2018-01-04 09:53:26 +00:00
David Baker	613e3b7ac1	Remove extra full stop	2018-01-03 11:57:49 +00:00
lukebarnard	85cdd888e8	Combine TagOrderStore and FilterStore ... so that shift-click semantics can work. The store that computes the shift-click rules has to be aware of the actual order of tags displayed, so they must be done in the same store.	2018-01-03 11:33:59 +00:00
Luke Barnard	8eef09335a	Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting ... Get Group profile from TagTile instead of TagPanel	2018-01-02 19:02:33 +00:00
Michael Telatynski	875eb3d34f	Hide status bar on visible->hidden transition ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-01 21:15:26 +00:00
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
Matthew Hodgson	fa14bc9b8d	don't gutwrench	2017-12-18 22:49:23 +00:00
Matthew Hodgson	e65c67ca15	fix https://github.com/vector-im/riot-web/issues/5841	2017-12-18 22:47:28 +00:00
Alexandr Korsak	78af02b29b	Replace lodash/every by Array.prototype.every function	2017-12-18 15:51:01 +03:00
Alexandr Korsak	c07c4fd1cb	Allow multiple file uploads on drag & drop	2017-12-18 13:20:18 +03: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
Luke Barnard	8b11b10531	Avoid NPEs by using ref method for collecting loggedInView in MatrixChat	2017-12-15 15:24:37 +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	9975941f3c	Merge pull request #1653 from matrix-org/luke/feature-ordered-tag-panel ... DnD Ordered TagPanel	2017-12-14 10:36:16 +00:00
Luke Barnard	950f591b3f	Clarify more docs	2017-12-13 15:50:20 +00:00
lukebarnard	f38690f265	Doc orderedGroupTagProfiles	2017-12-13 10:51:04 +00:00
lukebarnard	a8b245d0cf	Add unmounted guard	2017-12-13 10:42:11 +00:00
lukebarnard	42c1f3cfe2	Fix incorrect bind	2017-12-13 10:41:24 +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
Luke Barnard	13925db251	Refactor to allow dispatching of two kinds of Actions ... They are: 1. The existing type of Action, Objects with an `action` type. 1. Asyncronous Actions, functions that accept a `dispatch` argument, which can be used to dispatch Actions asyncronously.	2017-12-12 17:32:43 +00:00
Luke Barnard	a120335130	Handle groups being joined and left	2017-12-11 18:03:19 +00:00
Luke Barnard	aa914098dc	Return null if TagOrderStore is loading ... The view should decide the default state.	2017-12-11 17:19:29 +00:00
Luke Barnard	991ea4ebe5	Fix a few bugs with TagOrderStore: ... - Have TagOrderStore listen for MatrixSync actions so that it can initialise tag ordering state. - Expose an empty list until the client has done its first sync and has fetched list of joined groups	2017-12-11 17:17:05 +00:00
David Baker	bb9376098a	Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning ... Warn when migrating e2e data to indexeddb	2017-12-08 16:52:05 +00: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
Luke Barnard	8f0774496f	Remove redundant MatrixChat	2017-12-08 11:29:21 +00:00
Luke Barnard	72550961e5	Move 'commit_tags' to action creator	2017-12-08 10:52:20 +00:00
Luke Barnard	ee6df105fe	Introduce action creators ... These can be used to dispatch actions immediately, or after some asynchronous work has been done. Also, create GroupActions.fetchJoinedGroups as an example. The concept of async action creators can be used in the following cases: - stores or views that do async work, dispatching based on the results - actions that have complicated payloads, would make more sense as functions with documentation that dispatch created actions.	2017-12-07 14:17:32 +00:00
David Baker	1a3671d241	remove stray param	2017-12-06 19:04:29 +00:00
David Baker	5bca5a7a8e	More underscore	2017-12-06 19:02:26 +00:00
David Baker	aa99b898ce	Add that it might not work now either ... also a comma	2017-12-06 18:57:48 +00:00
David Baker	4462694438	lint	2017-12-06 16:06:33 +00:00
David Baker	65c210cdde	Warn when migrating e2e data to indexeddb	2017-12-06 15:28:20 +00:00
Luke Barnard	7e1f1cdbd9	Move DragDropContext to wrap LoggedInView ... Becuase the tests rely on being able to inspect the state of MatrixChat	2017-12-06 15:01:16 +00:00
Luke Barnard	35a108eecc	Simplify render of TagPanel - remove sorting	2017-12-06 14:17:26 +00:00
Luke Barnard	7aa5dcef69	Move DragDropContext to wrap entire app	2017-12-06 13:10:58 +00:00
Luke Barnard	a8a650c24a	Move TagTile to separate file, and make it dragable	2017-12-06 11:25:46 +00:00
Luke Barnard	8178496457	Implement Store for ordering tags in the tag panel	2017-12-05 14:45:44 +00: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
Luke Barnard	b26cf23574	Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics ... Implement shift-click and ctrl-click semantics for TP	2017-12-01 12:04:21 +00:00
Luke Barnard	363fe04a10	isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent	2017-12-01 10:44:00 +00:00
Luke Barnard	ddd0e161c0	Fix broken imports	2017-12-01 10:41:56 +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
Luke Barnard	eaaa9fe747	Don't show group when clicking tag panel	2017-11-30 15:35:40 +00:00
Luke Barnard	3bcb3195c4	Implement shift-click and ctrl-click semantics for TP	2017-11-30 14:48:54 +00:00
Luke Barnard	f708250d44	Add feature flag for Tag Panel	2017-11-29 18:00:42 +00:00
Luke Barnard	ead30fae9d	Use unmounted instead of mounted	2017-11-29 17:07:43 +00: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	55b5f2b249	Merge branch 'develop' into luke/allow-guest-view-group	2017-11-28 14:06:43 +00:00
Luke Barnard	a8594a58e5	Allow guest to see MyGroups, show ILAG when creating a group	2017-11-28 13:32:46 +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
Luke Barnard	1a3ad5a342	Allow guests to view individual groups ... For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.	2017-11-28 11:52:46 +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
Richard van der Hoff	8be3862e68	Merge branch 'master' into develop	2017-11-28 10:29:40 +00:00
David Baker	81ae081f15	Merge pull request #1617 from turt2live/travis/granular-theme ... Pull the theme through the default process	2017-11-27 18:07:09 +00:00
lukebarnard	9ed9422af8	Move group publication toggles to UserSettings	2017-11-27 17:24:42 +00:00
Richard van der Hoff	80b8cbb473	Ignore unrecognised login flows ... Update the Login component so that if it sees an unrecognised login flow, it just ignores it and uses another one, so that riot can still be used with homeservers supporting custom login types.	2017-11-27 16:47:49 +00: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	f61f858cf7	Add Analytics Info and add Piwik to SdkConfig.DEFAULTS ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 15:33:07 +00:00
David Baker	1675737e7d	Merge remote-tracking branch 'origin/master' into develop	2017-11-17 17:48:42 +00:00
David Baker	6d23182f5f	Fix the force TURN option ... The call object is created within the js-sdk for inbound calls, so we never got the chance to set it.	2017-11-17 14:54:44 +00:00
Travis Ralston	33a3b07d88	Pull the theme through the default process ... This is to ensure the `config` level is respected. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-16 20:52:12 -07:00
David Baker	196eafdc7f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 15:59:16 +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
Travis Ralston	10a1d9cb29	Language is a local setting ... Fixes https://github.com/vector-im/riot-web/issues/5611 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 21:16:12 -07:00
Travis Ralston	022e40a127	Use SettingsStore for default theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 19:04:49 -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	aeca83ff2e	Unused import	2017-11-15 15:20:45 +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
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	060a890275	Merge pull request #1516 from turt2live/travis/granular-settings ... Granular settings	2017-11-15 10:55:55 +00:00
David Baker	63919befd0	Catch call failures due to unknown devices ... And show a specific dialog that you can then launch the UDD from (although currently with a 'Send Anyway' button which makes little sense for VoIP)	2017-11-15 10:49:29 +00:00
Matthew Hodgson	e91e94fd42	fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601	2017-11-15 09:56:44 +00:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Matthew Hodgson	546b062d82	automatically and correctly retint when changing theme	2017-11-15 01:45:51 +00:00
Matthew Hodgson	f05958e334	Merge pull request #1482 from turt2live/travis/presence ... Implement user-controlled presence	2017-11-14 23:53:16 +00:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Matthew Hodgson	7c98558b6a	fix neglible race when loading CSS	2017-11-14 16:07:48 +00:00
Matthew Hodgson	1fd7ac30e4	turns out i made up the .complete property on link elements	2017-11-14 16:04:11 +00:00
Matthew Hodgson	8d6e3dd27d	fix lint	2017-11-14 15:37:03 +00:00
Matthew Hodgson	dcfbe93409	fix race when loading CSS ... fixes https://github.com/vector-im/riot-web/issues/5590	2017-11-14 15:28:34 +00:00
Matthew Hodgson	8c218557df	fix disable_custom_urls	2017-11-14 15:17:50 +00:00
David Baker	55260becc9	Revert "Lowercase all usernames"	2017-11-14 14:13:22 +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
Travis Ralston	63bebe9dfd	Split out avatar and display name hiding ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 12:58:10 -07: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
Matthew Hodgson	46387e135e	Merge branch 'develop' into matthew/status	2017-11-11 23:50:48 +00:00
Matthew Hodgson	2827bc0718	replace some of the status.im theme with general config options	2017-11-11 23:46:43 +00:00
David Baker	39763d668c	Revert "Lowercase all usernames"	2017-11-11 15:59:43 +00:00
David Baker	bce4815851	Initialise unread messages value correctly	2017-11-11 15:57:20 +00:00
Matthew Hodgson	a0cdaf29f9	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:42 -08:00
Luke Barnard	0d174ffe9a	Fix tests	2017-11-10 11:13:52 +00:00
Luke Barnard	f4428267a1	Refactor onboarding redirect, add groups to the onboarding starters	2017-11-10 10:51:28 +00:00
Luke Barnard	266a504981	Use the same MatrixClient for the duration of GroupView lifecycle ... Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.	2017-11-10 10:49:14 +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
Travis Ralston	030633fa90	Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings	2017-11-08 17:43:38 -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
Matthew Hodgson	58ee4d0a76	rewrite the tinter to be ES6, and correctly cache fixups per theme	2017-11-08 06:55:07 -08:00
Matthew Hodgson	e729bc431d	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-08 04:29:52 -08:00
Luke Barnard	120e7b821f	Merge pull request #1585 from matrix-org/luke/groups-inviter-profile ... Use the getProfileInfo API for group inviter profile	2017-11-08 10:24:00 +00:00
Luke Barnard	10778e075e	Merge branch 'develop' into luke/groups-inviter-profile	2017-11-08 10:10:43 +00:00
Luke Barnard	4bb083d959	Style	2017-11-08 10:08:04 +00:00
Luke Barnard	f53f9ed8ca	inviterProfile = null initially	2017-11-08 10:07:43 +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
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
Luke Barnard	80d4873542	Disable RoomDetailList in GroupView when editing ... Otherwise the rooms can be clicked on.	2017-11-07 16:54:28 +00:00
Luke Barnard	ed709f52d1	Use the getProfileInfo API for group inviter profile	2017-11-07 16:42:43 +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
Luke Barnard	9019fee49e	Adjust long desc placeholder text	2017-11-07 10:48:56 +00:00
Luke Barnard	956c5ff343	Use a constant for easy reading of long desc placeholder	2017-11-06 18:52:55 +00:00
Luke Barnard	477051cfa6	Add placeholder for when a long desc hasn't been set ... this is only visible to group admins.	2017-11-06 18:35:52 +00:00
Luke Barnard	137f1311b3	Add useful placeholder for the long description textarea	2017-11-06 18:35:23 +00:00
Luke Barnard	36cd22663a	Open group settings when the group is created	2017-11-06 18:02:50 +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	10519f9465	Fix the tests ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 14:56:41 -07:00
Travis Ralston	7ce4316cc8	Initial support for notification settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 21:47:18 -07:00
Travis Ralston	3958e32672	Ensure blacklistUnverifiedDevices persists reloads ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 20:13:23 -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
Matthew Hodgson	68115f5b9c	tint when theming correctly	2017-11-05 00:40:38 +00:00
Matthew Hodgson	e72e30197a	calculate new CSS tinting when we change theme	2017-11-04 23:50:57 +00: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
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
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
Luke Barnard	71c59eff2c	Add a GeminiScrollbar to Your Communities	2017-11-03 11:19:29 +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
Matthew Hodgson	64d8c81897	Merge branch 'develop' into matthew/status	2017-11-01 15:24:30 +00:00
Stefan Parviainen	d6f1e12bee	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:50:45 +01:00
Luke Barnard	16dca08b77	Use constants instead of string literals	2017-10-31 16:13:13 +00:00
Luke Barnard	5bfed67463	Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state	2017-10-31 14:25:10 +00:00
Luke Barnard	d6cbc44e0f	If groupRoomsLoading, replace RoomDetailList entirely with Spinner	2017-10-31 14:21:00 +00:00
Luke Barnard	45e15fd865	Merge branch 'develop' into luke/groups-expose-ready-state	2017-10-31 11:50:12 +00:00
Luke Barnard	775468e71a	Display whether the group summary/room list is loading ... This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.	2017-10-31 11:42:09 +00:00
Luke Barnard	20bf69c3c2	Prevent non-members from opening group settings	2017-10-31 10:54:44 +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
Luke Barnard	14d600a69f	Fix initial in GroupAvatar in GroupView	2017-10-30 15:04:12 +00: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	e8acb0e102	Use getValueAt() ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:02:51 -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
Matthew Hodgson	672fbb2873	hopefully fix NPE on toLowerCase	2017-10-28 18:33:38 +01:00
David Baker	858c3a2548	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-10-27 18:59:57 +01:00
David Baker	580d8dce19	Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method ... Use "crop" method to scale group avatars in MyGroups	2017-10-27 18:40:19 +01:00
Luke Barnard	5209f29a5c	Use "crop" method to scale group avatars in MyGroups	2017-10-27 18:27:54 +01:00
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
David Baker	4eb8fe3e6a	Lowercase all usernames ... As synapse doesn't accept usernames with capitals in them now Fixes https://github.com/vector-im/riot-web/issues/5445	2017-10-27 17:49:44 +01:00
Matthew Hodgson	5d0629ff73	resolve matrix.status.im v. matrix.org confusion	2017-10-27 14:23:16 +01:00
Luke Barnard	e094c32c62	Simplify GroupStore listener registration	2017-10-27 11:38:10 +01:00
Matthew Hodgson	e3f896c5e0	don't forget login prompt class	2017-10-27 01:35:21 +01:00
Matthew Hodgson	1bf3ef6de4	fix password reset	2017-10-27 01:23:50 +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
Matthew Hodgson	655d0c615a	remove spurious Sign In button and legacy Return to App buttons	2017-10-26 17:57:49 +01:00
David Baker	c8a489ca77	Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members ... Only show group settings cog to members	2017-10-26 14:52:16 +01:00
Luke Barnard	9643784f85	Only show group settings cog to members ... Non-members have no settings to change.	2017-10-26 14:31:27 +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
Matthew Hodgson	5c32b5b11a	fix i18n	2017-10-26 02:10:03 +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
Matthew Hodgson	5a9dae5ff1	use generic 'text button' for delete buttons in UserSettings	2017-10-26 01:44:05 +01:00
Matthew Hodgson	ac7a94afb2	apply theme tint at launch	2017-10-26 01:43:42 +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
Stefan Parviainen	53e983f9c7	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-25 18:19:27 +02: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
Luke Barnard	813d0cd64c	Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep ... fix missing date sep caused by hidden event at start of day	2017-10-25 14:07:28 +01:00
Michael Telatynski	1bbc26a27f	fix missing date sep caused by hidden event at start of day ... if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:52:51 +01:00
Luke Barnard	37b55984ec	Fix group Leave button tooltip	2017-10-25 12:09:13 +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
Matthew Hodgson	ae40ef4460	fix error layouts	2017-10-25 02:18:14 +01:00
Matthew Hodgson	eb4b7c78a0	skin register screen	2017-10-25 02:04:02 +01:00
Matthew Hodgson	67cc02df3b	hide header when error is up	2017-10-25 01:37:06 +01: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
Stefan Parviainen	4ff369c884	Merge branch 'develop' into departify	2017-10-24 18:27:24 +02:00
Luke Barnard	459ffc47d6	Prevent editing of UI requiring user privilege if user unprivileged	2017-10-24 15:25:35 +01:00
Stefan Parviainen	115772d526	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:57:52 +02: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
Matthew Hodgson	37fd19290f	concept of default theme	2017-10-20 18:42:29 +01:00
Luke Barnard	1a7710c192	Adjust wording on placeholder	2017-10-20 18:10:14 +01:00
Luke Barnard	a0e218d107	Add placeholder to MyGroups page, adjust CSS classes ... - This is part of a general improvement in the look of MyGroups - Wording on "Create a community to..." modified to not have the word "community" twice	2017-10-20 17:38:02 +01:00
Luke Barnard	a85a011db9	Fix faulty translation in GroupView	2017-10-19 18:06:32 +01:00
Luke Barnard	b0f8619754	Improve MyGroups UI ... as per design layed out by @tur2live!	2017-10-19 17:24:45 +01:00
Luke Barnard	2be0ebdd1d	More Groups->Communities	2017-10-19 15:01:16 +01:00
Luke Barnard	bafa2c6be0	Fix typo	2017-10-19 12:03:59 +01:00
Luke Barnard	c3f143acc3	Merge branch 'develop' into luke/groups-are-communities	2017-10-19 11:31:00 +01:00
Matthew Hodgson	7fe8c9cb01	fix lint	2017-10-19 01:48:49 +02:00
Matthew Hodgson	1087b36597	fix editing visuals on groupview header	2017-10-18 17:49:49 +01:00
Luke Barnard	a40704f085	Merge branch 'develop' into luke/groups-are-communities	2017-10-18 15:57:37 +01:00
Luke Barnard	677c8e95ee	Merge branch 'develop' into luke/groups-move-buttons	2017-10-18 10:31:54 +02:00
Luke Barnard	df9e037bfc	Default values when GETing instead of when POSTing	2017-10-17 18:11:00 +01:00
Luke Barnard	3bbff627fc	Fix bug preventing partial group profile ... When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.	2017-10-17 17:26:34 +01:00
Luke Barnard	49b7525a67	Actually move the buttons in GroupView ... - The "Leave" button is now in the top-right - The "Publish" button is not a checkbox	2017-10-17 16:10:34 +01:00
Luke Barnard	0415869b8c	Add useful functions to GroupView to inspect user flags	2017-10-17 16:08:19 +01:00
Luke Barnard	626f007f4e	Move membership section above long description textarea	2017-10-17 12:00:31 +01:00
Luke Barnard	7df3335570	Only show membership settings when editing	2017-10-17 11:59:52 +01:00
Luke Barnard	495465e865	Put invite accept/decline buttons in correct div to align them to the right	2017-10-17 11:59:16 +01:00
Luke Barnard	0c34e943fb	Merge branch 'develop' into luke/groups-are-communities	2017-10-16 17:34:06 +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
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	03800b7476	Support more positioning options on context menus ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 21:43:47 -06:00
Travis Ralston	c34b55c6c7	Merge branch 'develop' into travis/pinned_messages	2017-10-14 16:10:32 -06:00
Matthew Hodgson	9f64261707	Merge branch 'develop' into travis/alone_warning	2017-10-14 22:43:36 +01: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	8d6f0db3e2	be explicit in remove button height	2017-10-14 22:13:00 +01:00
Michael Telatynski	c7c28c7ad2	make linter happy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 19:53:08 +01: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
Travis Ralston	6e7f0d649b	Add option to unset your own avatar ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-13 21:13:47 -06:00
Stefan Parviainen	3b91ada4c8	Departify sending emails and text messages ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-13 20:44:01 +02:00
Luke Barnard	3468abc975	Use GeminiScrollbar instead of ScrollPanel	2017-10-13 17:49:52 +01:00
Luke Barnard	aaf32ac9a0	Lint	2017-10-13 16:57:52 +01:00
Luke Barnard	77418f535e	Modify GroupView UI ... - Remove featured users/rooms - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode. - Make the group view body scrollable	2017-10-13 16:46:33 +01:00
David Baker	047daec587	Merge pull request #1468 from matrix-org/dbkr/labs_config ... enable/disable features in config.json	2017-10-12 18:38:18 +01:00
David Baker	e50478aa1d	enable/disable features in config.json ... As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit# Replaces: * enableLabs setting * 'override' flag in labs * 'default' flag in labs Un-feature-flags matrix apps since this was now overidden to be enabled.	2017-10-12 17:03:38 +01:00
Travis Ralston	df7f1b46bf	Stop peeking if anything went wrong, not just explicit failure ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-12 07:24:20 -06:00
Travis Ralston	f1032bb115	Set isPeeking to false if peeking failed ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-12 07:05:09 -06:00
Travis Ralston	f3b1baa3c0	Suggest to invite people when speaking in an empty room ... Adds vector-im/riot-web#1053 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 21:15:00 -06:00
Travis Ralston	6ce7eb952a	Don't send RR or RM when peeking at a room ... Fixes vector-im/riot-web#696 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 18:43:24 -06:00
Luke Barnard	e0e5d51451	Merge pull request #1460 from matrix-org/dbkr/show_send_message_error ... Show failures when sending messages	2017-10-11 19:46:32 +02:00
Luke Barnard	d3f9a3aeb5	Run eslint --fix ... Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.	2017-10-11 17:56:17 +01:00
David Baker	5626c06b3c	Show failures when sending messages ... This is useful for the spam checking where otherwise you don't really know why your message has failed to send	2017-10-11 17:42:54 +01:00
Luke Barnard	ffb9dd844a	Merge pull request #868 from psaavedra/set_default_federate_by_settings ... Added TextInputWithCheckbox dialog	2017-10-11 16:28:03 +02:00
David Baker	92be3af990	Make it clearer which HS you're logging into ... Otherwise there's no indication without clicking 'custom server'	2017-10-10 19:16:42 +01:00
Michael Telatynski	7492f2dffa	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings	2017-10-04 22:35:29 +01:00
Luke Barnard	4017fa7f1d	Factor-out GroupStore and create GroupStoreCache ... In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required. The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore. (We're running out of words to describe the hierachy of things that store things)	2017-10-04 16:56:35 +01:00
Stefan Parviainen	a96169e80e	Fix merge conflict	2017-10-02 17:57:22 +02:00
Travis Ralston	f71e07670d	Send toggle handler for the cancel button in the pinned events pane ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 08:56:21 -06:00
Travis Ralston	874d383a8f	Add dock for pinned messages at the top of the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 08:56:21 -06:00
Luke Barnard	739ddb8410	Merge branch 'develop' into luke/groups-button	2017-09-28 12:11:26 +01:00
Luke Barnard	6b9a2909df	Add rule to enforce spacing in curly brackets in JSX children ... This required an updated in version of eslint-plugin-react to 7.4.0.	2017-09-28 11:21:06 +01:00
Luke Barnard	929c8627d3	Add button to get to MyGroups (view_my_groups or path #/groups)	2017-09-27 17:45:49 +01:00
Luke Barnard	f3b6b2cc06	Fix GroupView summary rooms displaying without avatars ... - GroupView can now render with rooms in the summary that do not have an avatar - RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar) - RoomAvatar was delinted	2017-09-27 16:18:15 +01:00
Luke Barnard	d52355f80e	Implement adding rooms to a group (or group summary) by room ID	2017-09-27 15:30:58 +01:00
Luke Barnard	6bc9b32ab7	Fix ability to feature self in a group summary ... By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.	2017-09-27 11:04:41 +01:00
Luke Barnard	1ca9102442	Fix spinner appearing above RP header ... By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel	2017-09-27 10:36:44 +01:00
Stefan Parviainen	35cb52febc	Fix merge conflict	2017-09-27 08:41:37 +02:00
David Baker	8d0983ab02	Fix group membership publicity ... * Read the new flag in the summary API (the one we were reading was actually whether the group server listed you as a member to non-members). * Remove call to now-dead _loadGroupFromServer andf use the store instead	2017-09-26 14:46:57 +01:00
David Baker	af2df77b8e	Merge pull request #1418 from matrix-org/luke/groups-summary-store ... Create GroupSummaryStore for storing group summary stuff	2017-09-25 14:59:32 +01:00
Luke Barnard	83e6218930	Remove listeners from group summary store on unmount	2017-09-25 14:49:12 +01:00
Luke Barnard	8e7d58797d	_loadGroupFromServer -> _initGroupSummaryStore	2017-09-25 14:48:49 +01:00
David Baker	1a82f121c0	lint	2017-09-25 13:17:07 +01:00
Luke Barnard	b8dca58f4f	Pass matrixClient as an argument to GSS constructor	2017-09-25 10:02:13 +01:00
Stefan Parviainen	14bce1119c	Make theme names translatable ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-23 21:36:10 +02:00
Stefan Parviainen	d4929b558e	Add dummy translation function to mark translatable strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-22 21:43:27 +02:00
David Baker	af73f1c3bb	Add status & toggle for publicity ... This doesn't work at the moment because it looks like it's broken in synapse as per https://github.com/matrix-org/sytest/pull/391 But if it did work, the client side code might look something like this.	2017-09-22 19:27:02 +01:00
Luke Barnard	791bc5e7ac	Create GroupSummaryStore for storing group summary stuff ... - Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done. - The plan is to also control the avatar, topic, body of the summary via the same class	2017-09-22 18:52:06 +01:00
Luke Barnard	4c1a85cb71	Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users ... Implement removal function of features users/rooms	2017-09-22 16:32:40 +01:00
Luke Barnard	3f9d20de97	Implement removal function of features users/rooms ... With the appeareance of a "X" in the top right of each featured item when editing. NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.	2017-09-22 15:56:35 +01:00
Luke Barnard	c19ee66565	Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign ... Redesign membership section in GroupView	2017-09-21 17:49:47 +01:00
Luke Barnard	3351770b54	Fix dodgy merge	2017-09-21 17:26:16 +01:00
Luke Barnard	d75efb83f1	Merge branch 'develop' into luke/groups-membership-section-redesign	2017-09-21 17:25:12 +01:00
Luke Barnard	cf23ac5931	Merge branch 'develop' into luke/groups-add-feature-rooms	2017-09-21 17:20:12 +01:00
David Baker	3c2e6fdf9e	Honour the is_privileged flag in GroupView	2017-09-21 16:55:56 +01:00
Luke Barnard	5f840a3031	Implement adding rooms to the group summary ... This includes making UserPickerDialog more generic such that it can also pick rooms from groups.	2017-09-21 16:53:10 +01:00
Luke Barnard	16f5a667c6	Redesign membership section in GroupView	2017-09-21 15:03:30 +01:00
Luke Barnard	3f0e596e97	Only show "Add" button when editing the group	2017-09-21 12:44:17 +01:00
Luke Barnard	4d9c43b3c8	Display dialog when errors occur whilst featuring users	2017-09-21 12:34:16 +01:00
Luke Barnard	03ddb63507	Remove redundant slice	2017-09-21 10:34:11 +01:00
Luke Barnard	5471431ee5	Disable "Add a Room" button for when we have a room picker	2017-09-20 17:02:20 +01:00
Luke Barnard	adf0a79585	Implement avatar, displayname for featured users ... Profile data has been added to the API response for users in the group summary	2017-09-20 16:54:12 +01:00
Luke Barnard	1c1bf82c2a	Add users to group summary using new API	2017-09-20 16:32:02 +01:00
Luke Barnard	44c38652ab	Implement UserPickerDialog for adding users ... Also, use AccessibleButtons.	2017-09-20 15:44:42 +01:00
Luke Barnard	1c6cecbd43	Add "Add a User/Room" buttons and always display default lists	2017-09-20 14:41:29 +01:00
Luke Barnard	e9fb5712bd	Merge branch 'develop' into dbkr/group_userlist	2017-09-19 13:26:55 +01:00
David Baker	658285ebbf	Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined ... Fix RoomView stuck in 'accept invite' state	2017-09-19 10:34:39 +01:00
Matthew Hodgson	b06d540f4c	Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded ... start MELS expanded if it contains a highlighted/permalinked event.	2017-09-17 22:09:44 +01:00
Matthew Hodgson	6a53b7b149	Merge pull request #1389 from turt2live/travis/ignored_users ... Add ignore user API support	2017-09-17 22:05:02 +01:00
Travis Ralston	2605004edb	Update ignored users when js-sdk on UserSettings on change ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-17 15:04:03 -06:00
Matthew Hodgson	bc565ba925	Merge pull request #1392 from turt2live/travis/no_emoji ... Add option to disable Emoji suggestions	2017-09-17 21:40:43 +01:00
David Baker	c265ec9571	Fix RoomView stuck in 'accept invite' state ... After accepting a 3pid invite. Rather than clear the joining flag when the join request completes, leave it so the RoomView can see that we're expecting the user to be joined in the various stages that might go through (waiting for join request, waiting for room object, waiting for 'joined' member event). The problem in this case was that we had to wait a bit for the last one, and there was no bit of state to represent it. This hopefully also makes the logic somewhat simpler. Fixes https://github.com/vector-im/riot-web/issues/5041	2017-09-15 15:07:09 +01:00
turt2live	b2de016b35	Add option to disable Emoji suggestions ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 21:28:12 -06:00
turt2live	0363f73e28	Fix the MessagePanel test ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 20:57:28 -06:00
turt2live	6e00f70320	Hide read receipts and typing notifs for ignored users ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 20:25:51 -06:00
turt2live	2e72d6cd7c	Hide events that were sent by ignored users ... This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 20:16:56 -06:00
Travis Ralston	2bc866b997	Clean up UserSettings for linting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 16:08:20 -06:00
David Baker	1f837d2ae1	Make /join join again ... The auto_join parameter to view_room got broken at some point so /join took you to the room and then sat there like a lemon. Fixes https://github.com/vector-im/riot-web/issues/5029	2017-09-14 23:06:00 +01:00
Travis Ralston	4579d20fd0	Unignore people from the settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 15:33:36 -06:00
Travis Ralston	4df16e8245	Display which users are ignored in the user settings ... Adds https://github.com/vector-im/riot-web/issues/1767 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 12:51:53 -06:00
Michael Telatynski	f612b1933b	start MELS expanded if it contains a highlighted/permalinked event. ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-14 17:53:47 +01:00
David Baker	3c3328c5f1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-09-13 16:34:39 +01:00
David Baker	d90aa6ec20	Merge pull request #1368 from matrix-org/t3chguy/fix_theme ... fix radio for theme selection	2017-09-12 11:54:49 +01:00
David Baker	6cb98d7196	Hopefully make comment clearer	2017-09-11 18:39:30 +01:00
David Baker	531fc3ac54	Fix 'Failed to load timeline position' regression ... Ignore the update that comes in from the RoomViewStore when the current room changes or we save our scoll state against the new room rather than the old one. Fixes https://github.com/vector-im/riot-web/issues/5010	2017-09-11 17:57:52 +01:00
Matthew Hodgson	0e8bd856bc	remove obsolete this._roomViewStoreToken.remove();	2017-09-08 20:14:27 +02:00
David Baker	663dc3e513	Don't re-render matrixchat unnecessarily ... ...on room switch. We were setting most of the state in viewRoom, but getting the current room ID from the RoomViewStore, but this meant we did one setState from the RoomViewStore updating, re-rendered and then setState again in viewRoom causing another render. This just sets the room ID in viewRoom.	2017-09-08 18:56:57 +01:00
David Baker	aee2f3cdef	Rename onHaveRoom ... And move some code out of it which didn't really have any reason to be hanging out there rather than just be where we set the room a few lines above.	2017-09-08 18:11:13 +01:00
David Baker	bf982004f6	Give onHaveRoom the info it needs explicitly ... Rather than giving it a state object which is not actually the whole state but happens to be everything it actually wants (currently)	2017-09-08 17:56:53 +01:00
David Baker	03dcded72f	Blank line to make comment clearer	2017-09-08 17:39:10 +01:00
David Baker	1be35a77ec	Don't wait for setState to run onHaveRoom ... onHaveRoom sets some more state (among other things) so putting it in the setState callback so it could observe the new state caused us to have to re-render again unnecessarily. Just give it the new state as a parameter.	2017-09-08 17:06:46 +01:00
David Baker	984d639a37	Merge remote-tracking branch 'origin/develop' into dbkr/scroll_state_store	2017-09-08 15:58:38 +01:00
David Baker	13b094a3f6	Merge pull request #1369 from matrix-org/dbkr/dont_always_paginate ... Don't always paginate when mounting a ScrollPanel	2017-09-08 15:51:55 +01:00
David Baker	78a2e49705	Don't always paginate when mounting a ScrollPanel ... Calling just checkFill on DidMount did not initially set the scrollTop which meant that one back pagination request is always performed regardless. This meant we would end up rending the first batch of events, then paginating and re-rendering again after the pagination got another batch, causing unnecessary render churn.	2017-09-08 15:41:19 +01:00
David Baker	59c54d3756	Remove redundant code	2017-09-08 13:39:22 +01:00
Michael Telatynski	3df379cb49	fix radio for theme selection ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-07 18:54:41 +01:00
David Baker	82d1afcc47	Correct comment	2017-09-07 17:16:32 +01:00
David Baker	408b8c18ea	Introduce a RoomScrollStateStore ... to keep the place we're scrolled to in rooms. This mainly eleimates the extra, superfluous onRoomViewStoreUpdate callback that happened when the previous room saved back its scroll state. Moving the scroll state to a separate store means we can have this not emit events because nothing needs to know when the scroll state changes.	2017-09-07 17:08:36 +01:00
David Baker	d71f15adf4	Remove unused scrollStateMap from LoggedinView	2017-09-06 22:51:10 +01:00
David Baker	609d61d53c	Revert "Implement sticky date separators"	2017-09-06 17:40:58 +01:00
David Baker	289c3a5fbd	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-09-05 14:20:02 +01:00
David Baker	262d66f579	Merge pull request #1353 from matrix-org/luke/feature-sticky-date-separators ... Implement sticky date separators	2017-09-05 14:15:47 +01:00
David Baker	79ee41351c	Fix typo	2017-09-04 15:45:28 +01:00
Luke Barnard	c9c0771355	Spelling	2017-08-31 16:29:45 +01:00
Luke Barnard	cdb28f956e	Add comment for StickyContainer extension	2017-08-31 16:29:31 +01:00
David Baker	a2f2070966	Put setSate in the promise constructor ... Avoids local variables. Also typo in comment.	2017-08-30 21:44:10 +01:00
David Baker	225fe67586	Fix room change sometimes being very slow ... If the js-sdk had a lot of history in memory for a particular room, riot would paginate all that history into the DOM and render it when switching to that room (before then removing it all again). This obviously made switching to that room very slow. This was caused by the fact that we relied on the setState that happens in TimelinePanel after the pagination taking effect such that ScrollPanel sees that it no longer needs to paginate, but in some situations (as far as I can see, in electron...?) this setState would not take effect until the pagination stopped fulfiling requests from memory and hit the network. Fix: don't resolve the promise returned by the pagination request until the setState has actually happened.	2017-08-30 19:14:26 +01:00
David Baker	9efa604706	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-30 17:39:47 +01:00
Luke Barnard	a29e7da06b	Merge branch 'develop' into luke/feature-sticky-date-separators	2017-08-30 14:06:06 +01:00
David Baker	32b33c66b9	Merge pull request #1346 from matrix-org/t3chguy/shouldHideEvent_RoomStatusBar ... apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar	2017-08-30 13:58:40 +01:00
Luke Barnard	d516906b36	Implement sticky date separators ... Use `react-sticky` to implement sticky date separators. This will pin a date separator to the top of the timeline panel when the separator scrolls out of the top of the view. A known issue of this is that the spinner, which is in line with event tiles in the timeline, will appear to push the stuck date separator down. In reality the first date separator after the spinner is in line with event tiles and is not stuck because the spinner forces the timeline to be scrolled slightly further down than it would be otherwise. But also, date separators in the timeline (not "stuck") have a greater height. Ideally the date separator would be suppressed whilst back paginating, but this will cause the stuck separator to flicker on and off. This is why the suppression has been removed.	2017-08-30 13:52:46 +01:00
David Baker	22bb635ff3	Merge pull request #1352 from matrix-org/fix_hide_rr_regression ... separate concepts of showing and managing RRs to fix regression	2017-08-30 13:50:44 +01:00
Michael Telatynski	05c232c8c3	revert fancy indents ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-30 13:32:07 +01:00
Michael Telatynski	282618d5a1	separate concepts of showing and managing RRs to fix regression	2017-08-30 13:18:14 +01:00
Luke Barnard	3f11f9148f	Merge pull request #1348 from matrix-org/dbkr/fix_forgot_password_percent_encode ... Percent encoding isn't a valid thing within _t	2017-08-29 15:02:26 +01:00
David Baker	6d5b1b7a55	Percent encoding isn't a valid thing within _t ... Just use a plain apostrophe	2017-08-29 14:18:24 +01:00
David Baker	ec983b838a	Unbreak password reset with a non-default HS ... Broken by the change from onHsUrlChanged to onServerConfigChanged in https://github.com/matrix-org/matrix-react-sdk/pull/811 where ForgotPassword got missed.	2017-08-29 14:07:43 +01:00
David Baker	d86fe0df6e	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-29 13:29:55 +01:00
Michael Telatynski	315f7a3ae7	apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar ... prevents N new message(s) when a hidden message comes in.	2017-08-28 13:46:09 +01:00
David Baker	299db845ff	PR feedback	2017-08-25 12:10:13 +01:00
David Baker	814e08d843	Merge pull request #1334 from matrix-org/dbkr/update_on_event_decrypted ... Force update on timelinepanel when event decrypted	2017-08-24 13:35:39 +01:00
Richard van der Hoff	b65e1769d7	Dispatch incoming_call synchronously ... - this should fix a race where if the 'hangup' arrives hard on the tail of the Call.incoming, we don't ignore it. (We still have a problem in that we blip the hangup tone and UI, but that is arguably a separate problem)	2017-08-24 13:05:17 +01:00
David Baker	a2943ac348	Check room ID matches	2017-08-24 11:55:39 +01:00
David Baker	67824e9acc	Force update on timelinepanel when event decrypted ... Partially fixes https://github.com/vector-im/riot-web/issues/4865 (the part about messages not appearing in the timeline until you move the cursor over the window). Requires https://github.com/matrix-org/matrix-js-sdk/pull/529	2017-08-24 11:35:01 +01:00
David Baker	5f816666e1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-22 10:08:02 +01:00
David Baker	ac64e9b705	Lint	2017-08-21 19:34:07 +01:00
David Baker	e77ea352e4	Support full group membership cycle ... Apart from knocking, ie. Invite / accept / reject / leave	2017-08-21 19:18:32 +01:00
Luke Barnard	caff761df7	Merge pull request #1308 from matrix-org/t3chguy/mels_fix ... Change OOO so that MELS generation will continue over hidden events	2017-08-18 13:08:35 +01:00
Michael Telatynski	615d96a065	catch hidden event being RM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-18 11:53:52 +01:00
Michael Telatynski	bdb2d6b475	Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings ... # Conflicts: # src/components/structures/MatrixChat.js	2017-08-17 13:39:19 +01:00
Michael Telatynski	ca5e26744f	Make dialog more specific and hide options behind advanced spoiler	2017-08-17 13:33:07 +01:00
David Baker	ddf1017799	Make group invites work	2017-08-16 14:58:30 +01:00
David Baker	252ab208e4	Merge pull request #1300 from matrix-org/dbkr/userpicker ... Refactor ChatInviteDialog to be UserPickerDialog	2017-08-16 14:29:07 +01:00
Michael Telatynski	14903274c0	Change OOO so that MELS generation will continue over hidden events ... this fixes the scenario of N Member events, then an invisible event e.g. (m.room.aliases) then more Member events. Pre hide-join-parts this is how it worked. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-16 13:20:32 +01:00
David Baker	e1ddd3781d	Merge branch 'dbkr/userpicker' into dbkr/group_userlist	2017-08-15 14:10:45 +01:00
David Baker	a15c2100d1	Sort out right panel callapsing on GroupView	2017-08-15 13:12:39 +01:00
David Baker	64f352dda7	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-15 10:49:07 +01:00
David Baker	1b66e88b6e	ChatInviteDialog -> UserPickerDialog pt 2 ... The other changes I forgot to add	2017-08-14 17:43:00 +01:00
Luke Barnard	e48c4911b8	Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel ... Revert "At /user, view member of current room"	2017-08-14 16:31:24 +01:00
Luke Barnard	0079e70006	Display RM when it = a standalone member event ... Standalone = not next to any member events in the timeline. fixes vector-im/riot-web#4694	2017-08-14 15:40:49 +01:00
Luke Barnard	2844b574d5	Re-add useful comment	2017-08-14 14:41:03 +01:00
Luke Barnard	b59de7964c	Wait for first sync before dispatching view_user on /user ... the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.	2017-08-14 14:37:49 +01:00
Luke Barnard	d9e8292a5e	Revert "At /user, view member of current room"	2017-08-14 14:06:54 +01:00
Luke Barnard	3d5d7fa9c8	Lint	2017-08-14 13:59:12 +01:00
Luke Barnard	cbd8018ac8	Support semi-perma-disabling of lab features ... Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.	2017-08-14 12:26:31 +01:00
David Baker	02217c8bd2	Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel ... At /user, view member of current room	2017-08-11 10:49:22 +01:00
Luke Barnard	12966d06cd	Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics ... un-i18n Modal Analytics	2017-08-10 15:35:46 +01:00
Luke Barnard	d3ba1f40dc	Merge pull request #1272 from matrix-org/t3chguy/hide_other_events ... allow hiding of avatar/display name changes	2017-08-10 15:35:11 +01:00
Luke Barnard	89254e77f4	When no member, use null roomId	2017-08-10 15:23:14 +01:00
Michael Telatynski	41843f021d	don't track two more potential risks ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:21:01 +01:00
Michael Telatynski	56ea528f43	don't track error messages .2 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:17:52 +01:00
Michael Telatynski	ab3abd2f7f	fix string casing ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:59:55 +01:00
Michael Telatynski	b19c1010aa	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/Analytics.js	2017-08-10 13:54:55 +01:00
Michael Telatynski	24599ace32	don't track error messages ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:49:11 +01:00
Marcel	60c1ba4f4d	Add LanguageDropdown to LoginPage (#1284)	2017-08-10 13:29:10 +01:00
Luke Barnard	07633fe67f	At /user, view member of current room ... With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name). To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change. Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.	2017-08-10 13:12:50 +01:00
David Baker	c1546ceb59	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-09 13:46:15 +01:00
Richard van der Hoff	38114711fd	Make MatrixChat do fewer render cycles during mount ... This is mostly with the intent of making the login tests more reliable, but it seems generally worthwhile: * keep screenAfterLogin in the object props rather than `state` so that we can clear it without triggering a rerender * also move our record of the window width to the object props, and call `handleResize` from componentWillMount rather than componentDidMount so that we don't trigger a rerender by updating `state.width` * Remove update of unused `loading` state	2017-08-08 22:31:40 +01:00
Luke Barnard	bef6726290	Lint	2017-08-08 13:42:51 +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
Michael Telatynski	ffdffb643d	allow hiding of avatar/display name changes	2017-08-04 17:22:01 +01:00
David Baker	fe19dbee02	Remove unused component	2017-08-03 09:26:41 +01:00
Michael Telatynski	6e39e72849	fix m.federate always being false because value is a string. Y HTML... ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 14:00:24 +01:00
Michael Telatynski	4b4b730233	fix and i18n the impl ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 13:41:26 +01:00
Michael Telatynski	fd454b476a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings	2017-08-02 12:15:00 +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	c4f049effe	Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2 ... T3chguy/hide join part (attempt) 2	2017-07-26 17:15:43 +01:00
Michael Telatynski	2348c24369	revert the rm-always-moves-down loop as thats done Server side...	2017-07-26 14:33:48 +01:00
Michael Telatynski	3eb87e2aa3	change lastShownEventIndex -> lastShownEvent since some places ... do not have the same i reference (namely MELS generation) this way a member event at bottom of MELS (if is the last event in the timeline will have last set appropriately)	2017-07-26 12:17:05 +01:00
Michael Telatynski	f42ae1662b	change wording of comment as per Luke's review	2017-07-26 11:46:59 +01:00
David Baker	7469a9ae2a	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-07-25 17:20:16 +01:00
David Baker	c2034d5335	Add user list to groups	2017-07-25 15:56:16 +01:00
Michael Telatynski	8e66e64621	fix for loop - check happens before pre-inc so cause issues at end of TL ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 13:16:16 +01:00
Michael Telatynski	c9b547368b	add algo to ensure that RM always moves forwards ... this is needed so that if a client which does not hide any events sets and RM at bottom of timeline, then riot-web which hides events sets the RM it'd set it at X-N where X is bottom and N is the amount of hidden events at bottom of the timeline, this way now an RM will fall through to the hidden events below a seen event. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 13:10:57 +01:00
Michael Telatynski	a4abd1baa7	fix comment and remove unused const ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 12:03:32 +01:00
Michael Telatynski	ae973e1e99	unrevert some more... ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 11:37:21 +01:00
Michael Telatynski	7e355f7cda	unrevert most of the logic. ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 23:18:18 +01:00
Michael Telatynski	1fa4fe0b9a	remove comments/commented code ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 22:51:31 +01:00
Michael Telatynski	5808fce60e	fix logic ordering ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 22:45:19 +01:00
Michael Telatynski	17758cd1db	attempt to incorporate more code #2 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 20:43:03 +01:00
Michael Telatynski	e47e14ed19	attempt to incorporate more code #1 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 20:22:01 +01:00
Michael Telatynski	928294eba3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2	2017-07-21 19:23:42 +01:00
David Baker	f9cff50ef5	_loadGroupFromServer doesn't return a promise	2017-07-21 14:41:29 +01:00
David Baker	d48924e768	Lint	2017-07-21 14:30:09 +01:00
David Baker	be7228996a	This should be null rather than false	2017-07-21 14:18:28 +01:00
David Baker	4eda2ab083	Swap classes instead of using 0 height elements	2017-07-21 14:13:57 +01:00
David Baker	f2afd852d8	Make group editing work	2017-07-21 14:03:10 +01:00
David Baker	571fada77e	Make group profile editing mostly work ... apart from avatars	2017-07-21 11:12:15 +01:00
David Baker	859239f881	Lint / comment out line correctly	2017-07-17 18:13:20 +01:00
David Baker	7041106bf2	Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit	2017-07-17 17:23:02 +01:00
David Baker	6f65128928	Disable edit button again ... until we have an API to edit group profile info	2017-07-17 17:18:46 +01:00
David Baker	1cd79fc918	Rename group settings to 'Edit Group'	2017-07-17 17:17:18 +01:00
David Baker	a32113ad97	Add onChange handlers & tabIndexes	2017-07-17 14:40:38 +01:00
David Baker	f6f80bf9ce	Remove now unused 'edit' block ... And add some css classes	2017-07-14 17:22:17 +01:00
David Baker	381f685013	Start on editing groups	2017-07-13 18:41:51 +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
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
Luke Barnard	ce0f9e8803	Merge pull request #1214 from matrix-org/luke/fix-rte-remove-old-disable-md-setting ... Remove `disableMarkdown` setting	2017-07-13 11:33:42 +01:00
Luke Barnard	4d844ebc34	Merge pull request #1215 from matrix-org/luke/remove-old-composer ... Remove MessageComposerInputOld	2017-07-13 11:33:23 +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	4cc8b5621d	Merge pull request #1212 from matrix-org/luke/fix-ctrl-k ... Enable ctrl+k room filter focus	2017-07-12 18:20:45 +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	0585fa048f	Remove disableMarkdown setting ... This was used by the old composer to control whether to interpret text as markdown prior to sending. The new setting is `MessageComposerInput.isRichTextEnabled`.	2017-07-12 17:35:19 +01:00
Luke Barnard	6547a55852	Update to reflect previous implementation ... Which was originally a74bbb424c	2017-07-12 17:12:57 +01:00
Luke Barnard	0dbd1d988e	Enable ctrl+k room filter focus ... By using the `focus_room_filter` dispatch	2017-07-12 13:51:55 +01:00
David Baker	53316a76f4	Sandbox app iframes	2017-07-12 10:22:14 +01:00
David Baker	eb4e4a66ff	Merge pull request #1206 from matrix-org/rav/login_unmounted_guard ... Give Login an unmounted guard	2017-07-11 18:37:50 +01:00
Luke Barnard	3bab720a7b	Merge pull request #1208 from matrix-org/rav/timelinepanel_test_flakiness ... Fix a flaky test in the timelinepanel code	2017-07-11 18:10:55 +01:00
Richard van der Hoff	1139dd2be5	Fix a flaky test in the timelinepanel code ... Sometimes it was possible for there to be a scroll event before the initial pagination completed, which then upset the rest of the test. Just give it a few ms to sort itself out instead.	2017-07-11 17:34:46 +01:00
Richard van der Hoff	67372d4fed	Give Login an unmounted guard	2017-07-11 17:04:19 +01:00
Luke Barnard	af3b6484cd	Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview ... Add more features to Group View	2017-07-11 17:03:47 +01:00
David Baker	ff3c21ef10	Lint, including putting key in right place	2017-07-11 15:16:58 +01:00
David Baker	8690ed2181	Make the category functions React components	2017-07-11 14:28:44 +01:00
David Baker	222ca054c5	Use PropTypes.shape to define our required inputs	2017-07-11 13:41:00 +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
David Baker	29990296d2	Lint	2017-07-11 11:02:23 +01:00
David Baker	925d5bd480	Add featured users to Group View	2017-07-10 19:32:02 +01:00
David Baker	0e67a9158c	hide settings button until it's wired up	2017-07-10 15:32:57 +01:00
David Baker	048912a241	Remove commented ordering code ... No lomger needed now roosm come down in order	2017-07-10 15:17:58 +01:00
David Baker	49ca29e422	Lint	2017-07-10 14:07:16 +01:00
David Baker	696c72be2b	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-10 14:03:30 +01:00
David Baker	1e713557bb	PR feedback	2017-07-07 18:34:40 +01:00
David Baker	681fd512d7	Lint	2017-07-07 13:46:05 +01:00
David Baker	c1833f9833	Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview	2017-07-07 13:44:35 +01:00
David Baker	c21f90338d	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-07 12:02:15 +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
David Baker	183f45bc1f	Fix lint errors	2017-07-07 10:41:59 +01:00
David Baker	45986306cc	Merge remote-tracking branch 'origin/develop' into dbkr/my_groups	2017-07-07 10:32:37 +01:00
David Baker	1deb406294	Fix race	2017-07-07 10:12:06 +01:00
Luke Barnard	32a01b54b8	Merge branch 'develop' into erikj/group_server	2017-07-07 10:08:49 +01:00
David Baker	fa37d03db6	Improve the Group View page ... Show the rooms in the group in thir various categories, etc	2017-07-06 19:13:14 +01:00
David Baker	8468a118b5	Merge remote-tracking branch 'origin/develop' into dbkr/my_groups	2017-06-30 16:15:41 +01:00
David Baker	e5c1aeb14c	Make the Groups page look more like the design	2017-06-30 13:59:49 +01:00
David Baker	3892362386	Make my groups page a bit saner	2017-06-29 18:30:16 +01:00
David Baker	84e13d5437	Add GroupAvatar to handle fallback images etc. ... And a few misc tidyups	2017-06-29 17:51:38 +01:00
David Baker	d6ecec1987	Behave better on rooms with no avatar / name ... Also add translation strings	2017-06-29 17:17:43 +01:00
David Baker	f99c540b3d	Groups page / Create Group dialog	2017-06-29 17:03:05 +01:00
David Baker	a2ff289ed8	Add 'groups' page	2017-06-28 13:56:18 +01:00
Richard Lewis	ff1636aaf5	Simplify boolean assignment.	2017-06-28 12:21:05 +01:00
Richard Lewis	06dafdc099	Remove unused state variable.	2017-06-28 12:20:07 +01:00
Richard Lewis	bf2a4afce5	Change to allow setting of DEBUG at run-time.	2017-06-28 12:02:07 +01:00
Richard Lewis	8dfd047f03	Don't show widgets when editing room settings and lint fixes.	2017-06-27 17:39:29 +01:00
David Baker	aa7a113324	More PR feedback	2017-06-27 13:41:43 +01:00
David Baker	6c9716637e	Fix linting errors	2017-06-27 13:13:00 +01:00
Richard Lewis	ad9a3d9ddc	Remove unused case statement.	2017-06-27 11:55:32 +01:00
Richard Lewis	89f051e693	Fix automerge error.	2017-06-27 11:52:49 +01:00
David Baker	2aeaaf26ca	remove inline css	2017-06-27 11:52:23 +01:00
Richard Lewis	ddc0da396d	Merge in changes from develop	2017-06-27 11:44:36 +01:00
Richard Lewis	e343e99355	Cleaned up unused files and removed commented code	2017-06-27 11:28:38 +01:00
David Baker	971f7ad045	Fix avatars	2017-06-27 10:32:21 +01:00
David Baker	867b47f4a2	PR feedback: remove phases	2017-06-27 10:28:46 +01:00
David Baker	f0aaca0a31	Fix some PR feedback	2017-06-27 10:05:05 +01:00
David Baker	c033d5defd	Missing React import	2017-06-27 09:58:29 +01:00
David Baker	09b1012388	Merge remote-tracking branch 'origin/develop' into erikj/group_server	2017-06-26 17:49:06 +01:00
David Baker	812b3643de	Add message for HSes that don't support groups ... Also add an unrelated missed translation	2017-06-26 17:47:17 +01:00
David Baker	a26498bc6c	Make 'group not found' work	2017-06-26 17:38:10 +01:00
Johannes Löthberg	48c32172fd	TextualBody: only highlight code block if language was specified ... The highlight.js autodetection is finicky and often wrong, so disable highlighting unless the language was explicitly specified, or if the user has explicitly enabled it in the settings. Fixes vector-im/riot-web#508. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-06-26 17:45:40 +02:00
Luke Barnard	f091d209b9	Merge branch 'develop' into luke/fix-rte-tab-complete-after-join	2017-06-26 09:39:49 +01:00
David Baker	f0f4a16e97	Translate autocomplete delay	2017-06-23 18:28:02 +01:00
Luke Barnard	ddb84f034e	Update tab-complete state onRoom received after joining ... As opposed to doing it when the component mounts. Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)	2017-06-23 17:52:50 +01:00
Luke Barnard	89afcfd897	Linting	2017-06-23 17:35:07 +01:00
David Baker	2efa099de2	Use function from HTMLUtils for sanitizing ... Encapsulates things a little nicer	2017-06-23 17:02:54 +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
David Baker	8f3eb89f8b	Fix potential race in setting client listeners	2017-06-23 10:48:21 +01:00
David Baker	75ef80ecd4	Merge remote-tracking branch 'origin/develop' into erikj/group_server	2017-06-23 09:51:24 +01:00
David Baker	ac3e039e2a	Merge pull request #1019 from matrix-org/t3chguy/updating_stuff ... manual check for updates	2017-06-22 17:36:55 +01:00
Richard van der Hoff	fcd945afc2	Fix an incorrect console error ... ... this error is thrown when registering as guest or loading from localstorage, not when using tokenparams.	2017-06-22 15:08:30 +01:00
David Baker	72e73c05ac	Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout ... reset page subtitle and favicon on_logged_out	2017-06-21 14:58:26 +01:00
David Baker	9ef9d09d44	Fix another race with first-sync ... Set the first sync variables in onWillStartClient, as they race if set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124)	2017-06-21 11:27:18 +01:00
Michael Telatynski	a2a26a9ac9	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout	2017-06-20 18:43:50 +01:00
Matthew Hodgson	d441ba1fd0	Merge pull request #1129 from matrix-org/luke/fix-logout ... Don't allow UserSettings to render if !MatrixClientPeg.get()	2017-06-20 18:43:33 +01:00
Michael Telatynski	7f6a252bcb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout	2017-06-20 18:39:59 +01:00
Richard van der Hoff	1cd152e5f7	Merge pull request #1130 from matrix-org/rav/log_fixes ... Various logging cleanups	2017-06-20 17:55:07 +01:00
Richard van der Hoff	cd73139af5	Various logging cleanups ... * don't just log errors without any context as to where they came from or what they mean * avoid the use of '%s' and multi-argument console.log because it looks awful under karma.	2017-06-20 17:38:02 +01:00
Luke Barnard	3320df4cdd	Don't allow UserSettings to render if !MatrixClientPeg.get() ... Now that it has state that updates following the nulling of the MCP (userHasGeneratedPassword) we need to stop it from rendering if the MCP is null. Fixes https://github.com/vector-im/riot-web/issues/4319	2017-06-20 17:13:06 +01:00
Michael Telatynski	b712a15a14	move in case it is racey ---- somehow? ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-20 16:15:42 +01:00
Michael Telatynski	04aed416d2	Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/MatrixChat.js	2017-06-20 15:37:05 +01:00
Michael Telatynski	5460b0f5b2	reset page subtitle on_logged_out ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-20 15:31:12 +01:00
Luke Barnard	c337485d90	Redesign the warning to be red text, move below "Sign out"	2017-06-20 15:01:53 +01:00
David Baker	a2dc17256a	Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff	2017-06-20 13:44:27 +01:00
Luke Barnard	4f9c1fe199	Merge branch 'develop' into luke/feature-user-settings-password-warning	2017-06-20 13:40:34 +01:00
Richard van der Hoff	0c431887b0	Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests ... Pop up a dialog when we get a room key request	2017-06-20 13:20:58 +01:00
David Baker	e15aedfeb2	Fix another infinite spin on register ... Don't set ready on logging_in, set it before we start the client, as commented	2017-06-20 12:03:37 +01:00
Luke Barnard	e16d1b3cfb	Implement password nag warning in user settings account section ... "To return to your account in future you need to set a password" in the account section when a user has not yet set a password (is a PWLU).	2017-06-20 11:22:07 +01:00
Richard van der Hoff	a0534e7477	Merge branch 'develop' into rav/handle_received_room_key_requests	2017-06-20 00:25:14 +01:00
Richard van der Hoff	3a6dabdc08	Merge pull request #1116 from matrix-org/rav/no_more_guestcreds ... Get rid of guestCreds	2017-06-19 14:34:12 +01:00
Luke Barnard	57f01b83be	Revert "Save scroll state immediately before updating" ... This reverts commit 4124a8dcff from PR https://github.com/matrix-org/matrix-react-sdk/pull/1076	2017-06-19 13:19:17 +01:00
Richard Lewis	f676b58c00	Add google ardboard logo	2017-06-19 11:47:03 +01:00
Richard Lewis	9d89bfe264	Fix jitsi logo references	2017-06-19 11:36:15 +01:00
Luke Barnard	513a585a3e	Merge pull request #1076 from ollieh/issues/reduce-save-restore-window ... Reduce save-restore window in ScrollPanel to reduce scrolling jumps	2017-06-19 11:23:10 +01:00
Richard van der Hoff	a5d65ee391	Get rid of guestCreds ... -- we just keep the MatrixClient running in the background, so it is easy to resume.	2017-06-19 10:36:25 +01:00
Richard van der Hoff	3b518f2c59	Fix race in registration for pusher config ... we no longer immediately create the MatrixClient, so don't assume we do.	2017-06-19 10:22:18 +01:00
Richard van der Hoff	115a3deed9	Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states ... Refactor the state machine in MatrixChat	2017-06-19 08:53:50 +01:00
Richard van der Hoff	cb29d92912	Merge pull request #1110 from matrix-org/rav/fix_token_redirect ... Avoid transitioning to loggedIn state during token login	2017-06-19 08:52:22 +01:00
Matthew Hodgson	032650e095	Merge branch 'develop' into t3chguy/fix_forwarding	2017-06-19 01:53:35 +01:00
Luke Barnard	ba95d7a16c	Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create ... Don't peek when creating a room	2017-06-16 18:35:20 +01:00
Luke Barnard	be58e1095e	Don't peek when creating a room ... This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196	2017-06-16 18:24:07 +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	8e8af5eb5c	Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server	2017-06-16 15:59:18 +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
Richard van der Hoff	db3d9c0573	Make Lifecycle.loadSession return an explicit result ... - rather than inferring it from the fact it didn't call logging_in.	2017-06-16 15:23:09 +01:00
Richard van der Hoff	5f689b7929	Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp	2017-06-16 15:20:47 +01:00
Richard van der Hoff	eb1fc9ae2d	Avoid transitioning to loggedIn state during token login ... Fixes riot-web#4334 When we do a token login, don't carry on with the normal app startup (transitioning to the loggedIn state etc) - instead tell the app about the successful login and wait for it to redirect. Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what it's supposed to be doing.	2017-06-16 15:05:53 +01:00
Michael Telatynski	8c333dc3f7	remove debug and add comment ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-16 14:39:31 +01:00
David Baker	236cf1efb2	Merge remote-tracking branch 'origin/develop' into erikj/group_server	2017-06-16 14:19:54 +01:00
Richard van der Hoff	3884c5ccf0	Log an error on unknown state instead of throwing	2017-06-16 11:51:12 +01:00
Richard van der Hoff	5e5639b730	Fix half-written comment	2017-06-16 11:50:53 +01:00
Luke Barnard	82b2da7833	Correctly inspect state when rejecting invite ... So that we view_next_room if we're looking at the room we're rejecting	2017-06-16 11:27:47 +01:00
David Baker	64b555dfe3	Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview ... Make sure to pass the roomAlias to the preview header if we have it	2017-06-16 11:21:03 +01:00
Luke Barnard	807f01b57e	Make sure to pass the roomAlias to the preview header if we have it	2017-06-16 11:10:55 +01:00
David Baker	af6392d7ca	Fix URL previews ... and also things like the unsent message error and encryption warning. Stuff that we need to do at room view mount time had got moved into a clause of the if statement in onHaveRoom and so wasn't being executed. Fixes https://github.com/vector-im/riot-web/issues/4327	2017-06-15 22:57:41 +01:00
Michael Telatynski	f0f721aa32	make hiding redactions use new pattern ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 20:22:38 +01:00
Michael Telatynski	cebb7182f0	try to make hiding events work with read markers ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 20:17:59 +01:00