3936 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	b944fff5c5	unscrew merge	2017-05-05 20:57:18 +01:00
Michael Telatynski	110ca22c4c	Merge branch 'develop' into webrtc_settings	2017-05-05 20:56:20 +01:00
Richard van der Hoff	28e0a32d6c	Merge pull request #862 from matrix-org/rav/log_device_id ... Log deviceid at login	2017-05-05 14:52:49 +01:00
David Baker	e00605571b	Fix the spinner to actually appear ... We started with clientSyncState being null, which it remained until the SYNCING event was emitted. We need to set clientSyncState's initial value correctly.	2017-05-05 10:48:54 +01:00
Richard van der Hoff	bfceaa827b	Log deviceid at login ... - to help understand rageshakes	2017-05-04 18:04:47 +01:00
Richard van der Hoff	8d4663f437	Fix lint in Lifecycle.js	2017-05-04 18:03:35 +01:00
Luke Barnard	8e3851b380	Merge pull request #860 from t3chguy/patch-4 ... Guests can't send RR so no point trying	2017-05-04 17:53:59 +01:00
Luke Barnard	6e30134403	Merge pull request #861 from matrix-org/dbkr/remove_babelcheck ... Remove babelcheck	2017-05-04 17:45:37 +01:00
Michael Telatynski	f76b9b4489	remove link to issue ... not very useful	2017-05-04 17:25:23 +01:00
Luke Barnard	7918ff2fc2	Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements ... T3chguy/settings versions improvements	2017-05-04 16:56:45 +01:00
David Baker	396b38512c	Remove babelcheck ... Nobody is likley to be upgrading from babel 5 any more, so this can go away now.	2017-05-04 16:50:47 +01:00
Michael Telatynski	da4c2f8b31	Guests can't send RR ... so they shouldn't try lets not hit the HS quite as much	2017-05-04 16:42:41 +01:00
David Baker	c8b0a15902	Merge pull request #852 from t3chguy/max-len ... Change max-len 90->120	2017-05-04 16:24:20 +01:00
Michael Telatynski	3c6e301f7f	Improve regex to ignore trailing -dirty and for rc tags ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-04 16:22:39 +01:00
Michael Telatynski	2edfc3e598	remove commented out code as per review ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-04 15:51:31 +01:00
Michael Telatynski	cb478f1194	no idea why those got in there... ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-04 15:50:52 +01:00
Luke Barnard	d5b49a11d7	Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing ... Remove DM-guessing code	2017-05-04 14:15:28 +01:00
Luke Barnard	694fc26a55	Merge pull request #855 from matrix-org/luke/fix-jump-to-rm-in-mels ... Fix jumping to an unread event when in MELS	2017-05-04 13:03:30 +01:00
Luke Barnard	6d9a1f047d	Typo	2017-05-04 13:03:04 +01:00
Luke Barnard	bfa3123f9b	Combine data-scroll-token and -contained-scroll-tokens ... - Instead of using one attribute, use one that might just contain one token - Use the first token when tracking a child - Mandate that no commas can be in individual tokens	2017-05-04 10:00:13 +01:00
Michael Telatynski	74b2c86f93	tidy up UserSettings ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-02 21:17:12 +01:00
Michael Telatynski	76e98d4267	improve version hyperlinking ... removed redundant v prefix (key already says version) links to most applicable version/tag tag-commit -> commit commit1-commit2-commit3 -> commit1 (v)x.y.z -> tag<x.y.z> commit -> commit Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-02 21:12:58 +01:00
Luke Barnard	f4bb76922d	Merge pull request #856 from matrix-org/luke/fix-phone-number-invalid-feedback ... Validate phone number on login	2017-05-02 19:45:27 +01:00
Luke Barnard	af137f8867	Validate phone number on login ... To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637	2017-05-02 18:30:46 +01:00
Luke Barnard	4febc63aee	Add comment to _scrollToToken	2017-05-02 17:41:09 +01:00
Luke Barnard	fe83a99ab7	Update ScrollPanel docs	2017-05-02 17:36:59 +01:00
Luke Barnard	3f25928380	Fix jumping to an unread event when in MELS ... This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child. MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).	2017-05-02 16:34:39 +01:00
Matthew Hodgson	4f72450847	Merge pull request #827 from t3chguy/develop ... Failed to enable HTML5 Notifications Error Dialogs	2017-04-30 13:40:27 +01:00
Matthew Hodgson	e11dd23026	Merge pull request #854 from t3chguy/patch-2 ... Pin filesize ver to fix break upstream	2017-04-30 13:08:56 +01:00
Michael Telatynski	c8fb18dc93	Pin filesize ver to fix break upstream ... https://travis-ci.org/vector-im/riot-web/builds/227340622 https://github.com/avoidwork/filesize.js/issues/87 3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us	2017-04-30 13:00:47 +01:00
Michael Telatynski	86a5ff42e9	Change max-len 90->120 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-29 14:23:08 +01:00
Michael Telatynski	c6262d62a6	webrtc config electron ... init on LoggedInView mounting configurable via UserSettings new class: CallMediaHandler Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-28 18:21:22 +01:00
Michael Telatynski	47827e0b81	un-eat the space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-28 01:00:50 +01:00
Michael Telatynski	c9c72036f3	Change wording ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-28 01:00:10 +01:00
Matthew Hodgson	19482d751d	comment out spammy CTD logging	2017-04-28 00:52:31 +01:00
David Baker	b91f53652d	Merge pull request #848 from matrix-org/luke/room-directory-improve ... Improve RoomDirectory Look & Feel	2017-04-27 18:28:28 +01:00
Luke Barnard	88abe54ffe	Give the SRH its prop back	2017-04-27 17:58:02 +01:00
Luke Barnard	791f7f7f6b	Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve	2017-04-27 17:57:19 +01:00
Luke Barnard	0b06e979cb	Add optional tintable SVG icon for SimpleRoomHeader	2017-04-27 17:57:13 +01:00
Luke Barnard	9d57e8b959	Merge pull request #845 from matrix-org/luke/rm-fix ... Only show jumpToReadMarker bar when RM !== RR	2017-04-27 17:01:39 +01:00
Luke Barnard	6313193aa8	Null check readMarkerEventId, update comment	2017-04-27 16:52:40 +01:00
Luke Barnard	50831796bb	Remove RHS when viewing RoomDirectory	2017-04-27 16:49:23 +01:00
Richard van der Hoff	786fa6b6e7	Merge pull request #846 from matrix-org/luke/fix-rm-stuck-in-mels ... Allow MELS to have its own RM	2017-04-27 15:22:24 +01:00
Luke Barnard	2012513c0e	Allow MELS to have its own RM ... This inserts a RM if any of the events in a MELS if the RM is tracking an event within it. Fixes https://github.com/vector-im/riot-web/issues/3749	2017-04-27 14:16:50 +01:00
Luke Barnard	8f7359fce1	Only show jumpToReadMarker bar when RM !== RR ... If RM !== RR, use the pos. of the RM to determine whether it is visible, as before.	2017-04-27 14:03:54 +01:00
David Baker	021cdb8010	Merge pull request #844 from matrix-org/luke/fire-activity-on-keydown ... Use document.onkeydown instead of onkeypress	2017-04-27 13:47:17 +01:00
Matthew Hodgson	fc774e8508	Merge pull request #808 from matrix-org/rob/shiny-avatars ... (Room)?Avatar: Request 96x96 avatars on high DPI screens	2017-04-27 12:02:52 +01:00
Robert Swain	39de37b547	*Avatar: Calculate thumbnail dimensions based on devicePixelRatio ... Multiply the dimension by the device pixel ratio and then round it to get the width/height of the thumbnail to use in the request.	2017-04-27 12:38:03 +02:00
Luke Barnard	8291b36b3e	Use document.onkeydown instead of onkeypress	2017-04-27 10:16:24 +01:00
David Baker	0e880f7971	Merge pull request #842 from matrix-org/luke/fix-emote-rrs ... Add mx_EventTile_emote class	2017-04-26 18:25:24 +01:00