7757 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Barnard	29e6627a75	Merge pull request #1608 from pafcu/simplify-translation ... Refactor translations	2017-11-16 11:29:03 +00:00
pafcu	342378f48a	Add space after if	2017-11-16 12:19:56 +01: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
Richard Lewis	5104ebfd29	Merge pull request #1611 from matrix-org/rxl881/invertOutlineColour ... Make TintableSvg links behave like normal image links	2017-11-15 18:34:51 +00:00
Richard Lewis	750e64deee	Pass required props to TintableSvg.	2017-11-15 15:17:21 +00:00
Richard Lewis	24b9269ff5	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 15:08:28 +00:00
Matthew Hodgson	f4ecc7fa5d	speculatively fix @lampholder's NPE	2017-11-15 14:47:20 +00:00
Matthew Hodgson	ec33806379	Merge pull request #1610 from matrix-org/rxl881/lintingErrors ... Fix linting errors.	2017-11-15 14:30:36 +00:00
Richard Lewis	7bab7813bb	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 13:26:29 +00:00
Richard Lewis	59d405d4fa	Use TintableSvgButtons for widget menubar icons.	2017-11-15 13:24:38 +00:00
Richard Lewis	6c2e9096cd	Tintable SVGs that behave like normal image buttons / links.	2017-11-15 13:08:24 +00:00
Matthew Hodgson	96a3eff5d3	lint hell	2017-11-15 11:25:56 +00:00
Matthew Hodgson	84591729a8	unbreak tests	2017-11-15 11:15:49 +00:00
Luke Barnard	a63c491220	Merge branch 'master' into develop	2017-11-15 11:02:02 +00:00
Luke Barnard	6fd09bc09a	v0.11.0	2017-11-15 11:01:29 +00:00
Luke Barnard	bb2bc6ac08	Prepare changelog for v0.11.0	2017-11-15 11:01:29 +00:00
Luke Barnard	9df169b500	Bump js-sdk to release 0.9.0	2017-11-15 10:59:06 +00:00
Matthew Hodgson	060a890275	Merge pull request #1516 from turt2live/travis/granular-settings ... Granular settings	2017-11-15 10:55:55 +00:00
Richard Lewis	56a70f5530	Add tinting for lowlights.	2017-11-15 10:40:07 +00:00
Richard Lewis	06b319937f	Fix linting errors.	2017-11-15 10:14:16 +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	f58e8826c0	Use the correct settings store for presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-14 19:18:04 -07:00
Travis Ralston	443bff5832	Presence feature ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-14 19:14:56 -07: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	d6fc4ebe3c	fix new tinter problems ... correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars) handle the fact that some room accountData apparently has ended up with rgb() colors in it...	2017-11-15 01:01:17 +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	ae252f7e59	Log if no match is found	2017-11-14 21:34:20 +01:00
Richard Lewis	bd8caebe41	Merge pull request #1609 from matrix-org/rxl881/editIcon ... Edit widget icon styling	2017-11-14 20:20:32 +00:00
Richard Lewis	58966c5c3d	Make edit icon green by default	2017-11-14 19:53:59 +00:00
Richard Lewis	e87940f63c	Make app tile title stronger	2017-11-14 19:53:32 +00:00
Stefan Parviainen	f8660de52d	Add note about alternative to opacity	2017-11-14 20:13:00 +01:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Stefan Parviainen	788be67c75	Clarifications	2017-11-14 20:08:27 +01:00
Stefan Parviainen	cdd03dd1c5	Use toEqual instead of toBe	2017-11-14 19:34:47 +01:00
Stefan Parviainen	772550a24a	Dont't add empty nodes	2017-11-14 19:33:12 +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	805796e4e0	force the tinter to refresh when we change theme	2017-11-14 15:27:28 +00:00
Matthew Hodgson	8c218557df	fix disable_custom_urls	2017-11-14 15:17:50 +00:00
Matthew Hodgson	b58514f427	Stop FF quantum exploding on CSS edits	2017-11-14 14:27:27 +00:00
Luke Barnard	07f4d0c304	v0.11.0-rc.3	2017-11-14 14:17:22 +00:00
Luke Barnard	a0b810a70c	Prepare changelog for v0.11.0-rc.3	2017-11-14 14:17:22 +00:00
David Baker	55260becc9	Revert "Lowercase all usernames"	2017-11-14 14:13:22 +00:00
Luke Barnard	c644e7d673	Merge pull request #1607 from matrix-org/luke/fix-restrict-power-level-options ... Attempt to improve textual power levels	2017-11-14 14:05:50 +00:00
Luke Barnard	12d9f05883	Merge branch 'develop' into luke/fix-restrict-power-level-options	2017-11-14 13:08:31 +00:00
Luke Barnard	3fa1bece0a	Simplify further ... Also fix not-i18n-friendly "of" to be "=".	2017-11-14 13:06:54 +00:00
David Baker	e7c99a71b6	Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display ... Determine whether power level is custom once Roles have been determined	2017-11-14 12:42:55 +00:00