4752 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robert Swain	44c0fb77da	Merge branch 'develop' into rob/electron-screensharing	2017-09-25 17:16:21 +02:00
Luke Barnard	75fef3f21a	Merge pull request #5104 from vector-im/dbkr/publicity_toggle ... CSS for publicity status & toggle button	2017-09-25 14:53:23 +01:00
David Baker	813615610f	CSS for publicity status & toggle button	2017-09-22 19:27:36 +01:00
Luke Barnard	ae6b705d7b	Merge pull request #5103 from vector-im/luke/groups-remove-featured-rooms-and-users ... CSS for "X" in top right of features users/rooms	2017-09-22 16:32:46 +01:00
Luke Barnard	1b67e7d606	CSS for "X" in top right of features users/rooms	2017-09-22 15:58:36 +01:00
David Baker	39c7bf633d	Merge pull request #5051 from vector-im/dbkr/add_finnish ... Include Finnish translation	2017-09-22 10:19:50 +01:00
David Baker	133e17c1db	Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish	2017-09-22 09:50:56 +01:00
David Baker	ef503cca11	Merge branch 'master' into develop	2017-09-21 21:56:58 +01:00
David Baker	2b7ee756f8	v0.12.6	2017-09-21 21:53:09 +01:00
David Baker	b25075974c	Prepare changelog for v0.12.6	2017-09-21 21:53:09 +01:00
David Baker	af3feccc2d	v0.12.6	2017-09-21 21:50:48 +01:00
David Baker	aaff9133c7	Newer js-sdk & react-sdk for js-sdk build fix	2017-09-21 21:49:43 +01:00
David Baker	50e6536195	Merge branch 'master' into develop	2017-09-21 18:11:46 +01:00
David Baker	fbccf22e00	v0.12.5	2017-09-21 18:08:17 +01:00
David Baker	e8c347a755	Prepare changelog for v0.12.5	2017-09-21 18:08:17 +01:00
David Baker	dbd4cf8756	Clean on prepublish (#5097) ... Otherwise you can make broken releases on case insensitive file systems	2017-09-21 18:06:41 +01:00
David Baker	f450ce422e	v0.12.5	2017-09-21 18:06:03 +01:00
David Baker	874e88c4a8	react-sdk v0.10.5	2017-09-21 18:05:22 +01:00
Luke Barnard	0eefae031f	Merge pull request #5096 from vector-im/luke/groups-membership-section-redesign ... Redesign membership section of GroupView	2017-09-21 17:49:55 +01:00
Luke Barnard	96b9570465	Update comment	2017-09-21 17:31:06 +01:00
Luke Barnard	96bb804eb8	Redesign membership section of GroupView	2017-09-21 15:11:57 +01:00
David Baker	1cca4c2133	Fix debug message to be clearer	2017-09-21 10:26:07 +01:00
David Baker	26ec25b2f7	Merge pull request #5090 from vector-im/dbkr/deploy_config_glob ... Make --config accept globs	2017-09-21 10:01:05 +01:00
David Baker	9b9073f0ed	Merge pull request #5093 from vector-im/luke/groups-add-featured-rooms-and-users ... CSS for GroupView: Add a User	2017-09-21 09:55:14 +01:00
David Baker	b4ea938be3	This is the default	2017-09-20 18:17:06 +01:00
David Baker	6ec26932af	This is the default anyway	2017-09-20 17:54:52 +01:00
David Baker	21d233b5af	oops, leftover debug	2017-09-20 17:48:47 +01:00
David Baker	b9b4ac3166	Rename symlink to 'include' & add to redeploy ... Because redeploy.py already has a 'symlink' option that does something else.	2017-09-20 17:22:47 +01:00
Luke Barnard	0d4b3b41f9	CSS for GroupView: Add a User ... codep matrix-org/matrix-react-sdk#1402	2017-09-20 17:07:32 +01:00
David Baker	6ff91789b2	Rename 'config' option to 'symlink' ... because that's really all it's doing and we can use it for other things	2017-09-20 17:04:31 +01:00
David Baker	8d9f06cc47	Merge branch 'master' into develop	2017-09-20 15:24:11 +01:00
David Baker	2ea9fc3f9a	v0.12.4	2017-09-20 15:19:10 +01:00
David Baker	d96759b8ad	Prepare changelog for v0.12.4	2017-09-20 15:19:10 +01:00
David Baker	e814eb4555	v0.12.4	2017-09-20 15:18:17 +01:00
David Baker	d957f0cdd7	released js-sdk & react-sdk	2017-09-20 15:16:42 +01:00
David Baker	be938ac0f4	Accept globs for the config location ... and make the default config*.sjon so we'll automatically symlink any config files in the current dir.	2017-09-20 14:38:41 +01:00
David Baker	e4082d4f45	Support multiple configs on the command line	2017-09-20 14:25:33 +01:00
Matthew Hodgson	fbe1c82dfa	Merge pull request #5074 from vector-im/t3chguy/devtools-1 ... T3chguy/devtools 1	2017-09-19 22:14:52 +01:00
David Baker	8fc69198b1	Merge pull request #5085 from vector-im/luke/fix-separate-sender-profile ... Alter opacity for flair	2017-09-19 17:21:57 +01:00
David Baker	283829cb0c	Merge pull request #5082 from vector-im/luke/fix-ugly-integ-button ... Fix ugly integ button	2017-09-19 17:21:47 +01:00
Luke Barnard	0d6b09a5f6	Merge branch 'develop' into luke/fix-ugly-integ-button	2017-09-19 17:03:06 +01:00
Luke Barnard	7469ab5ed9	Alter opacity for flair ... Apply 0.7 opacity to flair, but keep name and aux at 0.5	2017-09-19 16:56:46 +01:00
Luke Barnard	fbcccd8be0	Merge pull request #4830 from vector-im/dbkr/group_userlist ... Group Membership UI	2017-09-19 13:26:02 +01:00
Luke Barnard	d25c3be627	CSS to fix ugly integrations button ... See matrix-org/matrix-react-sdk#1399	2017-09-19 11:59:51 +01:00
David Baker	ca50d1f04a	v0.12.4-rc.1	2017-09-19 10:57:02 +01:00
David Baker	ab66833c45	Prepare changelog for v0.12.4-rc.1	2017-09-19 10:57:01 +01:00
David Baker	8a4710b270	v0.12.4-rc.1	2017-09-19 10:55:28 +01:00
David Baker	57851cd508	js-sdk & react-sdk rc.1	2017-09-19 10:54:35 +01:00
Luke Barnard	38c0d62478	Fix typo for integs error button error	2017-09-19 10:46:00 +01:00
David Baker	ff8bc1ca68	Merge pull request #5053 from vector-im/dbkr/3pid_invite_update_when_joined ... Fix test for new behaviour of 'joining' flag	2017-09-19 10:34:31 +01:00