Commit graph

2049 commits

Author SHA1 Message Date
Matthew Hodgson
1f19ee88c6 make FilePanel work, superficially at least 2016-09-06 01:45:12 +01:00
Matthew Hodgson
24351537d2 we have nothing to hide 2016-09-06 01:19:48 +01:00
Matthew Hodgson
c597f05e71 Merge branch 'develop' into matthew/notif-panel 2016-09-03 13:33:37 +01:00
Matthew Hodgson
0494dff545 Merge branch 'master' into develop 2016-09-02 17:23:02 +01:00
Matthew Hodgson
e63e6e7016 0.7.5-r3 2016-09-02 17:21:30 +01:00
Matthew Hodgson
dec62ab92c bump react-sdk 2016-09-02 17:20:23 +01:00
Matthew Hodgson
67d38bfab8 Prepare changelog for v0.7.5-r3 2016-09-02 17:20:08 +01:00
Matthew Hodgson
00d53e4824 css for conf join 2016-09-02 15:38:40 +01:00
Matthew Hodgson
4ce80a0837 fix dialog css 2016-09-02 14:39:44 +01:00
Richard van der Hoff
9aa59fa358 Merge pull request #2069 from vector-im/rav/update_olm
Bump to olm 1.1.0
2016-09-02 12:02:27 +01:00
Richard van der Hoff
6c8a492637 Bump to olm 1.1.0
Olm 1.0.0 made broken OlmAccounts.
2016-09-02 12:01:27 +01:00
Matthew Hodgson
9709a38250 merge master 2016-09-01 22:38:40 +01:00
Matthew Hodgson
06ca94c1e6 0.7.5-r2 2016-09-01 22:29:36 +01:00
Matthew Hodgson
67255e3f84 Prepare changelog for v0.7.5-r2 2016-09-01 22:29:36 +01:00
Matthew Hodgson
a20962ac14 bump to react-sdk v0.6.5-r1 2016-09-01 22:28:39 +01:00
Matthew Hodgson
b4cf86a362 fix padding-top for unread msgs 2016-09-01 17:00:52 +01:00
Matthew Hodgson
49e5fa41ad fix overscroll on view source 2016-09-01 16:06:50 +01:00
Matthew Hodgson
e069d808f8 Merge pull request #2056 from jansol/develop
Improve readability of the changelog dialog
2016-09-01 15:16:46 +01:00
Jan Solanti
e85674711c Improve readability of the changelog dialog 2016-09-01 15:13:09 +03:00
Matthew Hodgson
7a89328ccb file upload when on call 2016-09-01 00:38:37 +01:00
Matthew Hodgson
e77e6c2af0 fix typing notif layout 2016-09-01 00:35:07 +01:00
Matthew Hodgson
ad26631874 fix icon layout 2016-09-01 00:33:45 +01:00
Matthew Hodgson
cc75eb8b0e fix statusbar height and behaviour during voip calls 2016-09-01 00:14:51 +01:00
Matthew Hodgson
735da3c15e show ongoing audio call in LeftPanel CSS 2016-09-01 00:14:32 +01:00
Matthew Hodgson
56dfdbeb6b call noisy notifs... noisy 2016-09-01 00:14:01 +01:00
Matthew Hodgson
eaf47ea05c show ongoing audio call in LeftPanel 2016-09-01 00:13:49 +01:00
Matthew Hodgson
37c46cf02f add a top-level remote audio element for https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621 2016-08-31 21:51:20 +01:00
Matthew Hodgson
9d72a7cb35 get adding FilePanel 2016-08-31 11:57:45 +01:00
Matthew Hodgson
a047f81b84 Merge branch 'develop' into matthew/notif-panel 2016-08-30 23:39:00 +01:00
Richard van der Hoff
a2694113d3 Merge pull request #2009 from vector-im/rav/enable_react_checks
Turn react consistency checks back on in develop builds
2016-08-30 14:57:49 +01:00
Matthew Hodgson
0aae88d753 nudge jenkins 2016-08-30 14:40:30 +01:00
Matthew Hodgson
c7eba0f292 repin deps to dev 2016-08-30 13:52:35 +01:00
Matthew Hodgson
1bc1fc7e55 Merge pull request #2028 from vector-im/wmwragg/direct-chat-sublist
Wmwragg/direct chat sublist
2016-08-30 12:56:29 +01:00
wmwragg
b91a0dd7a5 Increased truncation limit to 10 2016-08-30 12:14:32 +01:00
wmwragg
45a813b795 Fixed historical scetion not scrolling up when clicked if not hidden and stuck 2016-08-30 11:56:16 +01:00
wmwragg
7b7a77bad0 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-30 11:22:31 +01:00
wmwragg
ff3ad47be7 Code clean up, and better comments, along with z-index fixes for scrollbar and avatar menu 2016-08-30 10:45:59 +01:00
wmwragg
f2e8607433 Over scroll of bottom sticky headers should be fixed, and expansion of hidden stuck headers should now work 2016-08-28 19:14:54 +01:00
Matthew Hodgson
b96ab58eb3 merge develop 2016-08-28 18:49:49 +01:00
Matthew Hodgson
5f233d75f2 0.7.5-r1 2016-08-28 18:09:20 +01:00
Matthew Hodgson
eb88245fe7 Prepare changelog for v0.7.5-r1 2016-08-28 18:09:20 +01:00
Matthew Hodgson
45c013f2f2 0.7.5 2016-08-28 18:07:33 +01:00
Matthew Hodgson
05f8b49eec Prepare changelog for v0.7.5 2016-08-28 18:07:32 +01:00
Matthew Hodgson
ef8f9ecbf3 pin matrix-js-sdk and matrix-react-sdk deps for release 2016-08-28 17:36:57 +01:00
wmwragg
93fff53e29 Added back the border spacing, as it wasn't the issue 2016-08-28 16:22:56 +01:00
wmwragg
4ae424f37a Removed the 2px border at top of labels to see if that has any effect on bottom stickies overscroll on matthews machine 2016-08-28 14:48:29 +01:00
Matthew Hodgson
36a608952d make /user URLs work 2016-08-28 14:04:25 +01:00
wmwragg
900b4b4cf8 Added a border to the top of the sections to better seperate them when they are stuck together 2016-08-28 13:44:52 +01:00
wmwragg
b782e7b9ad Bottom line of the scroll area (well the top line of the bottom left menu) is now tinted same colour as the section headers 2016-08-28 13:22:14 +01:00
wmwragg
8d4268754e Fixed the stickies notification count to limit it to 99+ 2016-08-28 12:03:05 +01:00