5046 commits

Author	SHA1	Message	Date
Michael Telatynski	b97aa77aca	factor out warn self demote and apply to muting yourself ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 19:27:23 +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
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
David Baker	06321deea9	Merge pull request #1935 from turt2live/travis/persist-pinned-open ... Persist pinned message open-ness between room switches	2018-06-08 16:48:40 +01:00
David Baker	8dce276e5b	Merge pull request #1933 from turt2live/travis/pin-cosmetics ... Pinned message cosmetic improvements	2018-06-08 16:46:33 +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
Michael Telatynski	ffec32c7d9	Merge pull request #1943 from akihikodaki/react ... Import react as React in src/components/views/elements/DNDTagTile.js	2018-06-06 10:08:52 +01:00
Akihiko Odaki	bf0d03bce3	Import react as React in src/components/views/elements/DNDTagTile.js ... Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>	2018-06-06 17:59:50 +09: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
Travis Ralston	254e8c358a	Remove unused imports ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-28 11:38:09 -06:00
Travis Ralston	98613748b6	Move Scalar Widget URL check to WidgetUtils ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-27 11:12:55 -06:00
Travis Ralston	23162c8625	Support third party integration managers in AppPermission ... Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL). Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-27 10:56:50 -06:00
Michael Telatynski	96ec3ab78a	Merge pull request #1934 from turt2live/travis/realtime-pins ... Update pinned messages in real time	2018-05-27 17:50:23 +01:00
Travis Ralston	929da30df8	onEvent -> onStateEvent ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-27 10:28:47 -06:00
Travis Ralston	ec53b5f5ab	Expose at-room power level setting ... Fixes https://github.com/vector-im/riot-web/issues/5835 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 21:22:42 -06: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	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
Travis Ralston	53396ff38d	Show timestamp of pinned messages on hover ... Addresses part of https://github.com/vector-im/riot-web/issues/5405 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 19:46:11 -06:00
Travis Ralston	085271a864	Update pinned messages in real time ... Fixes https://github.com/vector-im/riot-web/issues/5358 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 19:18:35 -06:00
Travis Ralston	033c41a2a8	Align pinned message contents and reduce image size ... Fixes https://github.com/vector-im/riot-web/issues/5421 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 18:40:48 -06:00
Travis Ralston	62f4cfe734	Don't affect avatars in pinned message contents ... This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 18:21:24 -06: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
Richard Lewis	b2c26e6984	Merge pull request #1920 from matrix-org/rxl881/refreshWidget ... Add a "reload widget" button.	2018-05-24 18:11:22 +01:00
Richard Lewis	6288e9bc08	Merge pull request #1923 from matrix-org/rxl881/devTools ... Make devTools styling more consistent and easier to edit event data.	2018-05-24 18:10:59 +01:00
Luke Barnard	033b110f5f	Merge pull request #1929 from matrix-org/luke/cookie-bar-update ... Cookie bar update	2018-05-24 17:19:05 +01:00
Luke Barnard	023c4e2a43	Merge pull request #1928 from matrix-org/dbkr/leave_server_notices_room_message ... Message for leaving server notices room	2018-05-24 17:06:41 +01:00
David Baker	168b956b3c	homeserver	2018-05-24 17:01:00 +01:00
Luke Barnard	fd8d501732	Update cookie bar wording	2018-05-24 16:58:14 +01:00
David Baker	9d2f223773	Message for leaving server notices room	2018-05-24 16:54:48 +01:00
Luke Barnard	24aeda2e05	Fix bug where usage data link not visible when no cookie policy url	2018-05-24 16:52:04 +01:00
Richard Lewis	9753ee8d82	Better check of jitsi widget message origin.	2018-05-24 16:14:18 +01:00
Richard Lewis	a13d58f6c2	More thorough check of IM URL validity.	2018-05-24 14:58:59 +01:00
Luke Barnard	aae89efa01	Add usage data link to cookie bar ... this opens the analytics modal	2018-05-24 12:47:27 +01:00
Luke Barnard	03c97140a6	Merge pull request #1925 from matrix-org/luke/deactivate-account-reword ... Change wording and appearance of Deactivate Account dialog	2018-05-24 12:02:10 +01:00
Luke Barnard	dca1217a45	Change wording and appearance of Deactivate Account dialog	2018-05-24 11:50:45 +01:00
Matthew Hodgson	3bee23e733	Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering ... fix membership list ordering when presence is disabled.	2018-05-24 11:29:29 +01:00
Matthew Hodgson	cc79384839	fix https://github.com/vector-im/riot-web/issues/6643	2018-05-24 01:57:22 +01:00
Richard Lewis	2a9859c7b6	Styling for consistency.	2018-05-23 17:40:15 +01:00
Richard Lewis	9f9cde12ce	Make devTools styling more consistent and easier to edit event data.	2018-05-23 17:18:33 +01:00
Luke Barnard	b124989968	Implement erasure option upon deactivation	2018-05-23 16:33:32 +01:00
Luke Barnard	ba3dd0c87a	Refactor onOk to async function	2018-05-23 13:35:42 +01:00
Luke Barnard	ef686a966d	Add cookie warning to widget warning (AppPermission)	2018-05-23 10:46:32 +01:00
Luke Barnard	c1a42637e7	Merge pull request #1919 from matrix-org/luke/consent-dialog ... Terms and Conditions dialog	2018-05-23 10:17:14 +01:00