2265 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard van der Hoff	5348b8a980	Merge pull request #2001 from vector-im/rav/fix_readme_lies ... Update encryption info in README	2016-08-24 10:22:38 +01:00
Richard van der Hoff	f2936dc15c	Update encryption info in README	2016-08-23 18:07:07 +01:00
Matthew Hodgson	864f9747f0	Merge pull request #2000 from vector-im/wmwragg/chat-message-presentation ... Added event/info message avatars back in	2016-08-23 17:14:21 +01:00
wmwragg	3ea62eb73a	Added event/info message avatars back in	2016-08-23 15:57:53 +01:00
Matthew Hodgson	2fae966884	notification panel WIP	2016-08-23 14:28:10 +01:00
Matthew Hodgson	f888ec6e81	notification panel WIP	2016-08-23 14:27:58 +01:00
wmwragg	d2e8201d79	Making sure that the sub list count always stays up to date, including when people read the outstanding notifications	2016-08-23 13:24:02 +01:00
wmwragg	65d7d01dfa	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 12:49:43 +01:00
wmwragg	2cf2df20f6	Added updating of count when room tile notification state changed	2016-08-23 12:40:15 +01:00
Matthew Hodgson	1d1f89e0de	Merge pull request #1987 from vector-im/wmwragg/chat-message-presentation ... Wmwragg/chat message presentation	2016-08-23 12:19:58 +01:00
wmwragg	ee73bc3aa4	Refactor of the badge logic, and also added no badges when zero notifications	2016-08-23 11:35:03 +01:00
wmwragg	d3fa680373	Added all the notification states to the sub list count logic	2016-08-23 11:14:45 +01:00
wmwragg	ef9d6d45b6	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 10:54:05 +01:00
wmwragg	a980864886	Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list	2016-08-23 10:47:17 +01:00
wmwragg	ca4d506391	Header wording for capped truncation count updated	2016-08-22 22:47:00 +01:00
Aviral Dasgupta	554c33a883	Extract autocomplete styling to CSS	2016-08-23 00:36:01 +05:30
Aviral Dasgupta	56813eb11e	remove whatwg-fetch and use browser-request	2016-08-22 23:59:32 +05:30
wmwragg	4d5e3bc22b	Initial tag section header badge	2016-08-22 17:25:43 +01:00
wmwragg	ff55a951c9	Number of rooms added to header of sections	2016-08-22 17:02:52 +01:00
wmwragg	895172d498	Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on	2016-08-22 16:42:08 +01:00
wmwragg	71f73d8df2	Collapsing and truncation initial state and onClick event logic	2016-08-22 15:50:36 +01:00
wmwragg	97daca4b31	Initial restyle of the sub lists and room lists	2016-08-22 14:10:06 +01:00
wmwragg	e9eafc3380	Further tweak	2016-08-22 11:15:49 +01:00
wmwragg	600a1cae79	Read avatars position tweaked, now that the spacing has changed	2016-08-22 11:13:42 +01:00
wmwragg	0b1fc1b925	Avatar and Sender Profile alignment, along with reducing the distance between initial messages and the previous one	2016-08-22 10:45:00 +01:00
wmwragg	bdaa9faea0	Added the font-size back in, as the textarea gets overidden otherwise	2016-08-19 18:03:12 +01:00
wmwragg	dbadb07adf	Moved the font-size into the .mx_MessageComposer_input so that it sets the size for RTE as well as normal composer	2016-08-19 17:57:24 +01:00
wmwragg	4a2c899d05	Merge branch 'develop' into wmwragg/chat-message-presentation	2016-08-19 17:22:26 +01:00
wmwragg	85084f5fd7	Fixed spacing on multiline messages	2016-08-19 16:46:15 +01:00
wmwragg	78692c83a6	Removal of the mini avatars for action (info) messages	2016-08-19 16:37:45 +01:00
wmwragg	173e6011e8	Alignment tweak to the readAvatars	2016-08-19 11:12:06 +01:00
wmwragg	9e542ba232	Alignment adjustment so that the readAvatars sit in the center of the top line in a new message	2016-08-19 10:58:51 +01:00
wmwragg	5005675561	Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message	2016-08-18 22:50:40 +01:00
wmwragg	29759ca71e	Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message	2016-08-18 21:54:07 +01:00
Aviral Dasgupta	be28a96d8d	add fancy changelog dialog	2016-08-18 22:53:47 +05:30
Matthew Hodgson	9b5e5c9acb	squidge video icon a bit	2016-08-18 16:48:28 +01:00
David Baker	fbbbd44dc3	Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work ... Make the notification slider work	2016-08-18 15:24:14 +01:00
David Baker	0bb3eaaf67	Use constants	2016-08-18 13:46:47 +01:00
David Baker	e48d68a449	PR feedback	2016-08-18 13:11:57 +01:00
wmwragg	67175c5a72	Positional tweaks, and font standardisation, so all browser now use ttf, so sizing is the same across all browsers	2016-08-18 11:15:42 +01:00
David Baker	6b0aeefc66	RoomNotifs.js moved to react-sdk ... Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing	2016-08-17 18:29:38 +01:00
Aviral Dasgupta	9a7f5388d9	Update autocomplete design	2016-08-17 17:27:01 +05:30
wmwragg	d1649771cc	Images now slighlty set in so they don't appear under the context button, and give a margin to the right of the image	2016-08-16 17:41:54 +01:00
wmwragg	08e5f61b10	Image button now has cursor set to pointer	2016-08-16 17:41:09 +01:00
wmwragg	012f085f33	alignment tweaks and persistent highlight when meni clicked, plus menu button no longer an input item	2016-08-16 17:33:37 +01:00
wmwragg	9f570152e5	Altered message composer size to match that of the message timeline messages	2016-08-16 16:20:38 +01:00
wmwragg	3099ef68a9	Added linked message styling	2016-08-16 16:17:15 +01:00
wmwragg	f0bac3a3b0	Design tweaks	2016-08-16 16:03:10 +01:00
David Baker	cd0ed879e3	Make the slider work ... Still WIP though: need to make vector work with the 'contains display name' rule being an override	2016-08-16 15:54:28 +01:00
wmwragg	95418089f3	Updating timestamp format	2016-08-16 15:01:25 +01:00