10564 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	5551855133	Merge pull request #2038 from akihikodaki/group_upstream ... Import react as React in src/GroupAddressPicker.js	2018-07-04 10:29:53 +01:00
Luke Barnard	bfbd499737	Merge pull request #2036 from matrix-org/dbkr/many_persistedelements ... Give PersistedElement a key	2018-07-04 09:20:50 +01:00
Akihiko Odaki	2ddcb83e8d	Import react as React in src/GroupAddressPicker.js ... Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>	2018-07-04 10:57:03 +09:00
David Baker	ad35fbf208	Pull out z-index to the sticker picker ... As it's not a thing that's necessary for other PersistedElements, only the sticker picker because it has to sit above the ContextMenu it sits in.	2018-07-03 18:25:33 +01:00
David Baker	74f2d0a360	Use inline class field for PropTypes	2018-07-03 14:54:43 +01:00
David Baker	3f88721bc1	Give PersistedElement a key ... So there can be more than one on a page	2018-07-03 14:43:27 +01:00
David Baker	f429ae5617	Merge pull request #2034 from matrix-org/revert-1945-t3chguy/click_username_state_ev ... Revert " make click to insert nick work on join/parts, /me's etc"	2018-07-03 10:36:10 +01:00
Michael Telatynski	7225f7372c	Revert " make click to insert nick work on join/parts, /me's etc"	2018-07-03 10:30:08 +01:00
Luke Barnard	767e67dc70	Merge pull request #2033 from matrix-org/luke/track-uisis-piwik-specify-event-name ... Track an event name when tracking a decryption failure	2018-07-02 10:26:34 +01:00
David Baker	34f6134595	Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute ... warn on self-mute	2018-07-02 10:13:49 +01:00
David Baker	41082f448b	Merge pull request #1945 from matrix-org/t3chguy/click_username_state_ev ... make click to insert nick work on join/parts, /me's etc	2018-07-02 10:12:40 +01:00
Luke Barnard	0dd3a77432	Track an event name when tracking a decryption failure ... Otherwise piwik will not agregate the failures correctly for all views.	2018-07-02 09:45:32 +01:00
Michael Telatynski	ea6e1b6f72	Merge branch 'develop' into t3chguy/warn_self_mute	2018-06-29 19:17:43 +01:00
Michael Telatynski	85a0736c78	update wording as per D4ve's feedback ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 19:16:56 +01:00
Michael Telatynski	2c537a8dff	update styling ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 15:28:36 +01:00
Michael Telatynski	36ace9dcb9	using map-i18n remap all changed %(...)s => <...> to keep i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 15:21:44 +01:00
Michael Telatynski	6021c3a634	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev	2018-06-29 14:56:18 +01:00
Michael Telatynski	dddf7991b9	create map-i18n to aid with transforming the i18n entries not to waste them ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 14:56:06 +01:00
Michael Telatynski	1d91469104	switch to <ClickableUsername> and use <a> over <span> ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 14:52:25 +01:00
David Baker	41dee71d38	Merge branch 'master' into develop	2018-06-29 11:52:20 +01:00
David Baker	2dc94ac277	v0.12.8	2018-06-29 11:40:18 +01:00
David Baker	66b17d9120	Prepare changelog for v0.12.8	2018-06-29 11:39:35 +01:00
David Baker	30ddc9610a	Released js-sdk	2018-06-29 11:34:56 +01:00
Michael Telatynski	a1fcff8bb8	Revert "affix copyButton so that it doesn't get scrolled horizontally"	2018-06-29 11:28:25 +01:00
Michael Telatynski	21978b18df	when the user switches room, close room settings ... this is especially annoying if they choose Leave Room which indirectly switches room Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 11:28:15 +01:00
Michael Telatynski	c4b6b458f2	don't fire share dialog when clicking timestamp of event, ... it was tripping people up and broke search permalinks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 11:28:03 +01:00
David Baker	80a9bc3f2a	Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout ... Fix layout bug introduced by #2025	2018-06-29 10:49:15 +01:00
David Baker	b07a2cb09a	Merge pull request #2028 from matrix-org/luke/fix-room-settings-editable-text-resets ... Fix room topics/names resetting when UserSetting re-renders	2018-06-29 10:46:48 +01:00
David Baker	053a46a5e0	Merge pull request #2027 from matrix-org/luke/track-uisis-piwik-improved ... Improve tracking of UISIs	2018-06-29 10:44:17 +01:00
Luke Barnard	ad5f1bf180	Fix layout bug introduced by #2025 ... Fixes https://github.com/vector-im/riot-web/issues/6958 (https://github.com/matrix-org/matrix-react-sdk/pull/2025)	2018-06-29 09:46:01 +01:00
Luke Barnard	016e9176f6	Fix room topics/names reseting when UserSetting re-renders ... This reverts a fix to EditableText introduced in https://github.com/matrix-org/matrix-react-sdk/pull/1445 which introduced a bug that causes room name and topic to reset when UserSettings is rerendered because `initialValue != this.value` This also fixes the same bug originally fixed by #1445: >fix entering the same thing twice (which had the bug of not >emptying the "new" field) which, in other words meant that clicking "+" when adding a room alias would not reset the contents of the bottom-most alias in the list. The fix is to increment the `key` of the element, causing a new instance to be mounted instead of passing new props to the existing one.	2018-06-28 18:11:52 +01:00
Luke Barnard	3846aef8a1	Alter docs, add comments	2018-06-28 16:06:12 +01:00
Luke Barnard	ab990d8cec	Increase grace period to allow time for key sharing	2018-06-28 15:07:58 +01:00
Luke Barnard	01dd387970	Track UISIs in bulk ... Piwik supports sending an event value, which we can use to indicate cardinality of UISIs to be tracked instead of tracking them individually. This means we can track them at a lower frequency of (fairly arbitrary) 60s.	2018-06-28 15:07:27 +01:00
David Baker	48f03bfd86	Merge pull request #2026 from matrix-org/dbkr/share_icons ... Replace share icons	2018-06-27 17:22:21 +01:00
David Baker	7bce29db6e	Replace share icons ... with ones that look a bit more like the actual logos those sites use now	2018-06-27 17:17:44 +01:00
David Baker	74770acf73	Merge pull request #2025 from matrix-org/luke/fix-status-bar-consent-error ... Improve status bar errors (namely the consent error)	2018-06-27 15:40:18 +01:00
Luke Barnard	66002a4c00	Fix status bar element positioning	2018-06-27 15:19:27 +01:00
Luke Barnard	8be173cae3	Show nicer error when receiving a consent error after sending a message	2018-06-27 15:17:57 +01:00
Luke Barnard	a0871116d8	Merge pull request #2023 from matrix-org/luke/fix-copy-button-position ... Fix incorrectly positioned copy button on `<pre>` blocks	2018-06-27 11:37:22 +01:00
Luke Barnard	6345fcb8f2	Fix incorrectly positioned copy button on <pre> blocks	2018-06-27 11:31:55 +01:00
Luke Barnard	4c575bb1ca	Merge pull request #2018 from matrix-org/luke/fix-piwik-path-reporting ... Redact pathnames with origin `file://`	2018-06-27 10:40:17 +01:00
Luke Barnard	cf24427d12	Merge pull request #2022 from matrix-org/dbkr/update_package_lock ... Update package-lock.json	2018-06-27 10:33:41 +01:00
Luke Barnard	483edb8211	pathname is not constant	2018-06-27 10:31:51 +01:00
David Baker	6fb57c0c66	Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click ... on room sub list badge click goto first relevant room	2018-06-27 10:29:22 +01:00
David Baker	2bc1679b97	Merge pull request #2020 from matrix-org/t3chguy/improve_linkifier2 ... improve linkifier AGAIN	2018-06-27 10:27:30 +01:00
David Baker	ee729233c8	Update package-lock.json	2018-06-27 10:17:25 +01:00
Michael Telatynski	a6ab51cd73	change GroupInviteTile from RoomSubList css so new :hover won't apply ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-27 09:50:32 +01:00
Michael Telatynski	613e83edb4	on roomsublist invite badge click goto first room/group ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-27 09:49:58 +01:00
Michael Telatynski	b3341e6664	on click roomsublist notif badge, goto first room with notif ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-27 09:49:25 +01:00