gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,271 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

4271 Commits

Author SHA1 Message Date
Richard Lewis 41afbb117d Add show and hide icons 2017-08-04 23:44:52 +01:00
David Baker 4b5febadb7 Merge pull request #4740 from vector-im/luke/upgrade-dep-draft-js-0.11.0-alpha 
Update draft-js from 0.10.1 to 0.11.0-alpha
 2017-08-03 15:55:57 +01:00
Luke Barnard 8ca2af0fe7 Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269) 2017-08-03 15:22:52 +01:00
David Baker f5e5bb8720 Merge pull request #4739 from vector-im/t3chguy/mouse_forward_back-windows 
electron support for mouse forward/back buttons in Windows
 2017-08-03 15:21:33 +01:00
Michael Telatynski a6d5158830
electron support for mouse forward/back buttons in Windows 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-03 15:03:50 +01:00
Luke Barnard 4b8764c070 Merge pull request #4730 from vector-im/luke/update-dep-draft-js 
Update draft-js from 0.8.1 to 0.10.1
 2017-08-02 13:06:31 +01:00
Luke Barnard 2f99a4883f Update draft-js from 0.8.1 to 0.10.1 
Hopefully to fix #4675 and friends
 2017-08-02 11:52:47 +01:00
Richard Lewis af85f18eae Styling tweaks 2017-08-01 17:30:22 +01:00
David Baker 384727a553 Merge pull request #4693 from vector-im/luke/css-sending-event-tile 
Make pills, emoji translucent when sending
 2017-07-28 15:34:09 +01:00
Luke Barnard 397523f4ac Make pills, emoji translucent when sending 
also fix header colours, which now inherit the font colour of the event tile (so all headers have the correct colour when sending or when the event tile is highlighted for a mention)
 2017-07-28 15:13:36 +01:00
Richard Lewis ca5fdff72f Merge pull request #4690 from vector-im/rxl881/widgetPermissions 
Widget permissions styling and icon
 2017-07-28 14:15:41 +01:00
Richard Lewis 317ff8c6af Beta tag styling 2017-07-27 23:02:19 +01:00
Richard Lewis 50f5abf535 Permissions button cursor. 2017-07-27 20:19:08 +01:00
Richard Lewis c1fe3533c4 Add red cancel icon and styling. 2017-07-27 18:10:56 +01:00
Richard Lewis 0bee03e86f Fix App body height. 
App warning colours.
App loading styling.
 2017-07-27 16:40:33 +01:00
David Baker 068a2b869e Merge pull request #4682 from vector-im/luke/css-fix-rte-auto-scroll 
CSS required for composer autoscroll
 2017-07-26 16:58:32 +01:00
Richard Lewis ff2554c8a6 App permission component styling. 2017-07-26 16:48:24 +01:00
Luke Barnard 35c239aae8 CSS required for composer autoscroll 
for https://github.com/matrix-org/matrix-react-sdk/pull/1248
 2017-07-26 16:45:00 +01:00
David Baker ec6efd2488 Merge pull request #4608 from vector-im/dbkr/groupview_edit 
CSS for group edit UI
 2017-07-25 10:21:51 +01:00
Matthew Hodgson bcedc206e1 seems folk prefer darker pills 2017-07-25 09:55:34 +01:00
Matthew Hodgson dbeeacf11c tweak pill colours some more 2017-07-24 22:13:29 +01:00
Richard van der Hoff 7dbb4bba09 Merge pull request #4671 from vector-im/rav/promise_fail_fails 
Fix a couple of minor errors in the room list
 2017-07-24 21:22:45 +01:00
Richard van der Hoff bc2f639aae Fix a couple of minor errors in the room list 
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
 2017-07-24 17:19:46 +01:00
Luke Barnard e923847dac Make user mentions more pill-like 
By adding subtle background-colors
 2017-07-24 14:49:43 +01:00
David Baker d2f02e8e99 Swap classes instead of using 0 height elements 2017-07-21 14:14:27 +01:00
David Baker 5ba3453dcc cursor: pointer on avatar picker 2017-07-21 11:12:46 +01:00
Richard Lewis 55084d3aca Merge pull request #4584 from vector-im/rxl881/beta 
Styling for beta testing icon.
 2017-07-20 14:05:06 +01:00
Richard van der Hoff 7e00a86048 Merge pull request #4650 from vector-im/rav/bump_indexeddb_timeot 
Increase the timeout for clearing indexeddbs
 2017-07-20 11:50:23 +01:00
Kegan Dougal 62579ed6b0 Add tracebacks to deploy exceptions 2017-07-20 11:25:19 +01:00
Luke Barnard 01eef7eb41 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-07-20 11:16:26 +01:00
Luke Barnard ccf5d6fc90 Adjust pill CSS 
-Remove space after mentions without pill background colour
-Increase space between pill avatar and first letter of the pill by 1px
 2017-07-20 11:14:54 +01:00
Kegsay 9864ce5bb2 Support multiple config.json symlinks in redeploy.py (#4644) 
* Support multiple config.json symlinks in redeploy.py

* Review comments
 2017-07-20 11:02:10 +01:00
Richard van der Hoff 238afde00a Increase the timeout for clearing indexeddbs 
Chrome seems to take ages (like, 1500ms regularly) to clear out the indexeddbs,
and that's causing test timeouts. Bump the timeout to hack around it.

Also: clear both dbs in parallel (can't hurt, right?) and improve diagnostics
on the process.
 2017-07-20 11:01:27 +01:00
Luke Barnard f7d282fc8e Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills 
Make some adjustments to mx_UserPill and mx_RoomPill
 2017-07-19 17:26:13 +01:00
Luke Barnard 3544c2b0c8 Merge pull request #4639 from vector-im/luke/css-rte-pre 
Apply CSS to <pre> tags to distinguish them from each other
 2017-07-19 17:16:02 +01:00
Luke Barnard 0c253e2437 Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd 
Use `catch` instead of `fail` to handle room tag error
 2017-07-19 14:27:37 +01:00
Luke Barnard 53ae42ed68 Use `catch` instead of `fail` to handle room tag error 
Because bluebird doesn't support fail
 2017-07-19 14:11:22 +01:00
Luke Barnard 871c9e6d3e Add bing mention pill CSS 
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
 2017-07-19 11:02:51 +01:00
Luke Barnard ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other 2017-07-19 09:25:53 +01:00
Matthew Hodgson bd693768cc deliberately de-theme pre tags 2017-07-18 17:45:17 +01:00
Matthew Hodgson b45108d80d ooooops, fix dark theme code blocks correctly 2017-07-18 15:50:28 +01:00
Matthew Hodgson e7ba618bbe fix text in code blocks on dark theme 2017-07-18 15:33:41 +01:00
David Baker fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:14:27 +01:00
David Baker cd418a5525 Retest 2017-07-17 18:16:50 +01:00
David Baker 65b9086f18 Add group header button css 2017-07-17 17:20:11 +01:00
Luke Barnard 0e71ea7a5a Make some adjustments to mx_UserPill and mx_RoomPill 
So that they can appear correctly in the body of a text message.
 2017-07-17 14:52:08 +01:00
Richard Lewis f272961fbd Styling for beta testing icon. 2017-07-14 23:30:47 +01:00
Luke Barnard cb4f57eb4a Merge pull request #4583 from vector-im/luke/feature-rte-pills 
CSS for decorated matrix.to links in the composer
 2017-07-14 18:04:05 +01:00
Luke Barnard a1b4b9992e Use $accent-fg-color instead of #fff 2017-07-14 17:59:53 +01:00
Luke Barnard 18a6ee5a52 white -> #fff 2017-07-14 17:52:11 +01:00