OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
29,628 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

2535 Commits (86025459f40c661e4118d54d9e34eaaf19773e43)

Author SHA1 Message Date
Luke Barnard 21ec34d4ba
Merge pull request #1882 from matrix-org/t3chguy/m.relates_to 
Remove margins when in a ReplyThread to stop them taking so much space
 2018-05-14 11:22:06 +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
Matthew Hodgson b10f9a9cb7 remove spurious vendor prefixing 2018-05-14 02:54:55 +01:00
Matthew Hodgson 721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Luke Barnard 6500797d2a Use correct CSS selector in message composer 
to stop any last div from having its right-padding removed
 2018-05-11 14:49:50 +01:00
Luke Barnard 0c1846630c Improve appearance of short-lived app loading spinner 
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
 2018-05-09 16:54:01 +01:00
Michael Telatynski ee0e6c5913
Remove margins when in a ReplyThread to stop them taking so much space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-09 11:53:37 +01:00
Matthew Hodgson 8b2eb2c400 make history work again 2018-05-08 01:54:06 +01:00
Matthew Hodgson a2233a48c2 stub out yet more 2018-05-06 01:18:26 +01:00
Michael Telatynski 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
Luke Barnard 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
Luke Barnard 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
Eric Newport e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
Matthew Hodgson 45c0c0eddd add CSS destroyed by stickerpacks 
fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)
and 38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)

also fixes https://github.com/vector-im/riot-web/issues/6492
 2018-04-29 04:50:44 +01:00
Matthew Hodgson 8538cc1666 fix regressions introduced by 00b7cc512b 2018-04-29 04:41:30 +01:00
Eric Newport 55566b35a2 convert attribute to class 2018-04-28 12:39:25 -04: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
Michael Telatynski 71acf87c04
Add comments to _EventTile.scss 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:13:09 +01:00
Luke Barnard ff4909e6ab Merge branch 'develop' into luke/fix-piwik-page-url-reporting 2018-04-26 11:03:55 +01:00
Luke Barnard 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
Richard Lewis 0f0e89d394 Add a button to 'pop out' widgets in to their own tab. 2018-04-25 12:49:30 +01:00
Eric Newport 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
Michael Telatynski 563fc9adc7
fix bad copy-paste from other diff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:37:25 +01:00
Michael Telatynski 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
Matthew Hodgson 6d1563449d fix missing NLs 2018-04-17 16:57:08 +01:00
Matthew Hodgson 7b53e36698 retheming commentary 2018-04-17 16:55:32 +01:00
Matthew Hodgson 46f5c0d205 finish merging vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 01:13:03 +01:00
Matthew Hodgson 32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 00:04:04 +01:00
Matthew Hodgson 5f3e4444d0 fix theme paths 2018-04-13 01:25:34 +01:00
Matthew Hodgson 5d03eabb15 rethemedex 2018-04-13 00:54:41 +01:00
Matthew Hodgson 8371774d13 move default ringtones over from riot-web 2018-04-12 00:25:36 +01:00
Matthew Hodgson 8ce4df7ce3 move non-Riot image resources over from riot-web 2018-04-12 00:25:07 +01:00
Matthew Hodgson 848403a0ab move default fonts over from riot-web 2018-04-12 00:24:51 +01:00
Matthew Hodgson cdb5d489a4 organise themes (even light & dark) in the SDK layer 2018-04-12 00:24:22 +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