105 Commits (4811154f25db75bbba8ee3dfd0ba09256a81c496)

Author	SHA1	Message	Date
Matthew Hodgson	9783b6100d	Merge branch 'develop' into matthew/dharma	2018-07-29 17:03:23 +01:00
Matthew Hodgson	30bb7eeeae	tweaks from pairing with @dharmaone	2018-05-26 00:07:39 +01:00
Matthew Hodgson	c1000a7cd5	emojioneify the composer ... and also fix up the selectedness CSS for pills and emoji	2018-05-14 03:02:12 +01:00
David Baker	6d9e07580b	UI fixes in SessionRestoreErrorDialog ... * Make the 'delete my data' button not the default * Make it red * Give it a confirmation dialog * Remove the 'cancel' button: what does it mean to cancel an error? In this case, it tried again and almost certainly got the same error. * Remove the top-right 'x' and don't cancel on esc for the same reason. * Move 'send bug report' to a button rather than a 'click here' link * Add a 'refresh' button which, even if it's no more likely to work, will at least look like it's doing something (it's mostly so if you don't have a bug report endpoint, there's still a button other than the one that deletes all your data).	2018-04-27 12:38:49 +01:00
Matthew Hodgson	79d3cca6e9	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00