2474 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
wmwragg	059f5198e5	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-05 12:07:21 +01:00
wmwragg	2acbad36a6	Initial commit of the new ChatInviteDialog	2016-09-05 12:03:43 +01:00
wmwragg	519dd16135	Added the correct styling back for the dialog buttons, that got regressed somewhere	2016-09-05 10:50:58 +01:00
wmwragg	fb103cb9e1	Rename the action to make it clearer what it is doing	2016-09-05 10:27:54 +01:00
Richard van der Hoff	5e9a95fdfe	Merge pull request #2085 from vector-im/rav/e2e_devices ... e2e device CSS	2016-09-05 00:43:52 +01:00
Aviral Dasgupta	b8610ab466	RTE formatbar (wip)	2016-09-04 21:03:00 +05:30
Richard van der Hoff	ee3fdbee5b	e2e device CSS ... CSS to make the deviceinfo stuff a little bit closer to the designs	2016-09-04 13:42:33 +01:00
wmwragg	2d827a75a6	Sending the top and left position tweaks with the action	2016-09-04 12:16:01 +01:00
wmwragg	50bb4edd1c	Small refactor, to make it clearer whats happening	2016-09-04 08:54:15 +01:00
wmwragg	e52f5b5d08	Removed unrequired positional tweak props	2016-09-04 08:49:43 +01:00
wmwragg	fd81ce126b	Code tidy up	2016-09-04 08:40:43 +01:00
wmwragg	7ae821e2b5	Removed nolonger needed conditional test, as the parent will always exist	2016-09-04 08:39:32 +01:00
wmwragg	cb98e2421e	Removed the nolonger required methods	2016-09-04 07:56:32 +01:00
wmwragg	5417385c83	Tolltip thweak to not require the passing in of the parent	2016-09-04 07:41:48 +01:00
wmwragg	c2d8067523	Testing to see if having the header badges when collapsed is usable	2016-09-03 14:55:35 +01:00
wmwragg	52bd61a2f0	When collapsed a long hover on the header now shows the full tag name and room count	2016-09-03 14:48:10 +01:00
wmwragg	aee56a5bd1	z-index tweak for badge, so it does sit aboce the header	2016-09-03 14:47:36 +01:00
wmwragg	7f52fa74a4	Better comments, and syntax tweak	2016-09-03 14:14:11 +01:00
wmwragg	d1dd4bd3d8	Updated tooltip styling to be better inline with the design	2016-09-03 13:57:49 +01:00
wmwragg	ab9f48cd47	Restyled tooltip to better match the design	2016-09-03 13:44:00 +01:00
Matthew Hodgson	c597f05e71	Merge branch 'develop' into matthew/notif-panel	2016-09-03 13:33:37 +01:00
wmwragg	80e6cd6d7c	Further tweaks to the tooltip to better handle its position, and simplify it's use	2016-09-03 12:44:09 +01:00
wmwragg	cb101b0a3b	Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover	2016-09-02 18:50:47 +01:00
wmwragg	bf4e3364b4	Tweak of the RoomTooltip to use DOM element for the parent rather than a React component	2016-09-02 18:41:27 +01:00
Matthew Hodgson	0494dff545	Merge branch 'master' into develop	2016-09-02 17:23:02 +01:00
Remi Rampin	d5865421bd	Open commits in new window/tab from changelog	2016-09-02 12:22:51 -04:00
Remi Rampin	8578203073	Open HTML commit page for changelog entries	2016-09-02 12:22:15 -04:00
Matthew Hodgson	e63e6e7016	0.7.5-r3	2016-09-02 17:21:30 +01:00
Matthew Hodgson	dec62ab92c	bump react-sdk	2016-09-02 17:20:23 +01:00
Matthew Hodgson	67d38bfab8	Prepare changelog for v0.7.5-r3	2016-09-02 17:20:08 +01:00
wmwragg	d2e2c726eb	Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari	2016-09-02 15:45:43 +01:00
Matthew Hodgson	00d53e4824	css for conf join	2016-09-02 15:38:40 +01:00
Matthew Hodgson	4ce80a0837	fix dialog css	2016-09-02 14:39:44 +01:00
Richard van der Hoff	9aa59fa358	Merge pull request #2069 from vector-im/rav/update_olm ... Bump to olm 1.1.0	2016-09-02 12:02:27 +01:00
Richard van der Hoff	6c8a492637	Bump to olm 1.1.0 ... Olm 1.0.0 made broken OlmAccounts.	2016-09-02 12:01:27 +01:00
Matthew Hodgson	9709a38250	merge master	2016-09-01 22:38:40 +01:00
Matthew Hodgson	06ca94c1e6	0.7.5-r2	2016-09-01 22:29:36 +01:00
Matthew Hodgson	67255e3f84	Prepare changelog for v0.7.5-r2	2016-09-01 22:29:36 +01:00
Matthew Hodgson	a20962ac14	bump to react-sdk v0.6.5-r1	2016-09-01 22:28:39 +01:00
Matthew Hodgson	b4cf86a362	fix padding-top for unread msgs	2016-09-01 17:00:52 +01:00
wmwragg	bf8d7050cc	New People icon in place of Directory icon, and placeholder functionality	2016-09-01 16:46:51 +01:00
Matthew Hodgson	49e5fa41ad	fix overscroll on view source	2016-09-01 16:06:50 +01:00
Matthew Hodgson	e069d808f8	Merge pull request #2056 from jansol/develop ... Improve readability of the changelog dialog	2016-09-01 15:16:46 +01:00
Jan Solanti	e85674711c	Improve readability of the changelog dialog	2016-09-01 15:13:09 +03:00
Matthew Hodgson	7a89328ccb	file upload when on call	2016-09-01 00:38:37 +01:00
Matthew Hodgson	e77e6c2af0	fix typing notif layout	2016-09-01 00:35:07 +01:00
Matthew Hodgson	ad26631874	fix icon layout	2016-09-01 00:33:45 +01:00
Matthew Hodgson	cc75eb8b0e	fix statusbar height and behaviour during voip calls	2016-09-01 00:14:51 +01:00
Matthew Hodgson	735da3c15e	show ongoing audio call in LeftPanel CSS	2016-09-01 00:14:32 +01:00
Matthew Hodgson	56dfdbeb6b	call noisy notifs... noisy	2016-09-01 00:14:01 +01:00