f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-05-02 13:08:38 +01:00
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
...
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog
...
Fix UX issues with bug report dialog
2018-04-30 17:56:19 +01:00
e037cf0063
namespace CSS better and fix bug
2018-04-30 12:22:16 -04:00
45c0c0eddd
add CSS destroyed by stickerpacks
...
fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)https://github.com/vector-im/riot-web/issues/6492
2018-04-29 04:50:44 +01:00
8538cc1666
fix regressions introduced by 00b7cc512b
2018-04-29 04:41:30 +01:00
55566b35a2
convert attribute to class
2018-04-28 12:39:25 -04:00
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
71acf87c04
Add comments to _EventTile.scss
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:13:09 +01:00
e16c50d4be
Explain that full URL is sent to Piwik
...
Also, redesign analytics modal to be one big table, instead of table +
paragraph.
2018-04-26 10:59:43 +01:00
d42fa9d17a
Hide inline encryption icons except when hovering over a message
...
Closes https://github.com/vector-im/riot-web/issues/2882
This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988 )
I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
2018-04-22 22:30:37 -04:00
563fc9adc7
fix bad copy-paste from other diff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:37:25 +01:00
06408f843b
post BigMerge fixup - merge in stuff from riot-web PR
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:23:27 +01:00
7b53e36698
retheming commentary
2018-04-17 16:55:32 +01:00
46f5c0d205
finish merging vector-im/riot-web#5881 into matrix-react-sdk
2018-04-16 01:13:03 +01:00
32dd7f976f
merge vector-im/riot-web#5881 into matrix-react-sdk
2018-04-16 00:04:04 +01:00
5d03eabb15
rethemedex
2018-04-13 00:54:41 +01:00
79d3cca6e9
move components' CSS to be in the same repo as their JS
2018-04-12 00:23:58 +01:00
Michael Telatynski