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 |
|
Matthew Hodgson
|
5543c126e6
|
fix tests
|
2016-08-30 15:22:52 +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
|
3b2faa4cf9
|
pin to dev
|
2016-08-30 13:54:35 +01:00 |
|
Matthew Hodgson
|
c7eba0f292
|
repin deps to dev
|
2016-08-30 13:52:35 +01:00 |
|
Matthew Hodgson
|
7a2b7b5b66
|
Merge pull request #432 from matrix-org/wmwragg/direct-chat-sublist
Wmwragg/direct chat sublist
|
2016-08-30 12:56:31 +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
|
c30ff57c62
|
Better comments
|
2016-08-30 12:29:25 +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
|
8061a2f279
|
Fixed historical scetion not scrolling up when clicked if not hidden and stuck
|
2016-08-30 11:55:51 +01:00 |
|
wmwragg
|
7b7a77bad0
|
Merge branch 'develop' into wmwragg/direct-chat-sublist
|
2016-08-30 11:22:31 +01:00 |
|
wmwragg
|
769e7d3b2e
|
Merge branch 'develop' into wmwragg/direct-chat-sublist
|
2016-08-30 11:19:54 +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
|
83c4fd4b2f
|
Code clean up, and better comments
|
2016-08-30 10:45:17 +01:00 |
|
wmwragg
|
2b1ed707c4
|
Better comments, and correct bottom header sticky calc to allow clicking
|
2016-08-28 19:18:41 +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
v0.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
v0.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 |
|
Matthew Hodgson
|
90cfb06ba3
|
0.6.5
|
2016-08-28 16:55:04 +01:00 |
|
Matthew Hodgson
|
4e169f8e00
|
Prepare changelog for v0.6.5
|
2016-08-28 16:55:04 +01:00 |
|
Matthew Hodgson
|
3dd337b553
|
dep on 0.5.6 of matrix-js-sdk
|
2016-08-28 16:51:51 +01:00 |
|
wmwragg
|
123d9b56c8
|
calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars
|
2016-08-28 16:25:20 +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 |
|
Matthew Hodgson
|
5e105e1be6
|
make /user URLs work
|
2016-08-28 14:04:11 +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 |
|
wmwragg
|
8f7d3394e6
|
Always setup stickies, even if we aren't going to use them so that the following map can fire
|
2016-08-28 12:02:20 +01:00 |
|
Matthew Hodgson
|
cd07907392
|
Merge pull request #431 from aviraldg/fix-emojione-sizing
fix emojione sizing
|
2016-08-28 11:55:14 +01:00 |
|
wmwragg
|
7631539584
|
Fixed incorrect init calculation of originalPosition attribute
|
2016-08-28 11:39:47 +01:00 |
|
Aviral Dasgupta
|
7c6b1703f3
|
fix emojione sizing
|
2016-08-28 14:54:07 +05:30 |
|
Matthew Hodgson
|
18436e1257
|
pick up ! matrix.to URLs
|
2016-08-28 02:12:18 +01:00 |
|
Matthew Hodgson
|
9b8e127e23
|
switch to using matrix.to for permalinks
|
2016-08-28 02:11:57 +01:00 |
|
Matthew Hodgson
|
de82ac3bc0
|
don't change URL bar when clicking on linkified rooms or users.
be aware of /user paths.
|
2016-08-28 02:05:31 +01:00 |
|
Matthew Hodgson
|
ad873c2b60
|
handle matrix.to links correctly. add partial support for #/user URLs
|
2016-08-28 01:55:42 +01:00 |
|
Matthew Hodgson
|
50d09f73f5
|
add leave/forget button to RoomSettings
|
2016-08-28 00:00:22 +01:00 |
|
Matthew Hodgson
|
fb5f8294c8
|
switch to namespaced CSS
|
2016-08-28 00:00:10 +01:00 |
|
Matthew Hodgson
|
5b0d13c1fc
|
switch to namespaced CSS
|
2016-08-27 23:59:55 +01:00 |
|
Matthew Hodgson
|
88dba1bf6c
|
CSS for room settings leave button
|
2016-08-27 23:59:26 +01:00 |
|
Matthew Hodgson
|
8d7daf61b9
|
fix CSS namespacing
|
2016-08-27 23:59:15 +01:00 |
|
Matthew Hodgson
|
ee1fae8ced
|
fix RoomTagContextMenu so it works on historical rooms
|
2016-08-27 23:58:35 +01:00 |
|