4764 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Barnard	1740319b7a	Add margin to flair avatars to separate them	2017-09-27 14:15:21 +01:00
Luke Barnard	2adf08dee0	CSS for GroupView: align "save"/"cancel" buttons in settings	2017-09-27 10:31:35 +01:00
David Baker	f64f293cdb	Merge pull request #5125 from vector-im/luke/groups-add-rooms ... Implement "Add room to group" feature	2017-09-26 18:15:54 +01:00
Luke Barnard	888e3abc75	Implement "Add room to group" feature ... This step needs to be taken before adding a room to a group summary	2017-09-26 14:35:38 +01:00
David Baker	94855c0f48	Merge pull request #4967 from vector-im/rob/electron-screensharing ... Add Jitsi screensharing support in electron app	2017-09-25 17:00:00 +01:00
David Baker	798558e5cc	Merge pull request #5117 from vector-im/luke/refactor-right-panel-header-buttons ... Refactor right panel header buttons	2017-09-25 16:37:44 +01:00
Robert Swain	f79b8e0c71	ElectronPlatform: Import desktopCapturer explicitly	2017-09-25 17:19:04 +02:00
Robert Swain	44c0fb77da	Merge branch 'develop' into rob/electron-screensharing	2017-09-25 17:16:21 +02:00
Luke Barnard	bfdb92ff6b	Nit: Re-order property	2017-09-25 16:13:54 +01:00
Luke Barnard	77f30aacf9	Re-add clickPhase for FilePanel header button	2017-09-25 16:13:13 +01:00
Luke Barnard	fd7e81193e	Less coupling between HeaderButton and RightPanel ... Use isHighlighted as a prop instead of computing based on phases and currentPhase	2017-09-25 16:06:46 +01: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
Luke Barnard	28e9fdc873	rebase in progress; onto 7137ba71	2017-09-25 14:42:44 +01:00
Luke Barnard	7137ba7188	Refactor right panel header buttons ... To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.	2017-09-25 14:13:02 +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