Matthew Hodgson
|
904348e62a
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-09 11:12:52 +01:00 |
Matthew Hodgson
|
dce2dd36ec
|
Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat
Wmwragg/one to one chat
|
2016-09-09 10:46:11 +01:00 |
Luke Barnard
|
6ddc31fb66
|
Merge pull request #443 from matrix-org/luke/post-messages
Scalar Messaging: Expose join_rules and restrict to currently viewed room
|
2016-09-09 09:57:48 +01:00 |
wmwragg
|
840bfe84c1
|
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
|
2016-09-09 06:57:30 +01:00 |
Matthew Hodgson
|
db61d8e8ad
|
another null check
|
2016-09-09 02:28:14 +01:00 |
Matthew Hodgson
|
f4d939da81
|
null checks on room in onRoomTimeline
|
2016-09-09 02:09:12 +01:00 |
Matthew Hodgson
|
4aef352a5c
|
update to use new API based on js-sdk PR input
|
2016-09-08 22:48:44 +01:00 |
Luke Barnard
|
f605b172a7
|
Better log
|
2016-09-08 17:38:51 +01:00 |
Matthew Hodgson
|
3c7864a7ad
|
remove unused _gatherTimelinePanelRef
|
2016-09-08 14:52:08 +01:00 |
Matthew Hodgson
|
f88ba9df11
|
fix comment & use room.getUnfilteredTimelineSet()
|
2016-09-08 14:38:34 +01:00 |
David Baker
|
c9475e2ae5
|
Merge pull request #449 from matrix-org/dbkr/toggle_dm_room
API for (un)marking rooms as DM rooms
|
2016-09-08 14:11:22 +01:00 |
David Baker
|
ee7c064690
|
I can't spell 'likely'
|
2016-09-08 13:56:45 +01:00 |
Matthew Hodgson
|
b0a4b017c3
|
Merge pull request #440 from aviraldg/feature-rte-formatbar
Formatting toolbar for RTE message composer.
|
2016-09-08 13:54:26 +01:00 |
wmwragg
|
d1974a75fd
|
Only Direct Message rooms, that aren't parted or forgotten are used
|
2016-09-08 13:09:54 +01:00 |
wmwragg
|
d0523cae70
|
If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one
|
2016-09-08 11:45:09 +01:00 |
Aviral Dasgupta
|
8da7b98ad0
|
RTE: Remove dead code, fix <del> styling
|
2016-09-08 11:21:39 +05:30 |
Matthew Hodgson
|
c882d66b0d
|
make NotificationPanel work
|
2016-09-08 03:02:31 +01:00 |
Matthew Hodgson
|
27b3f5f6b1
|
create a global notif timeline set for each client
|
2016-09-08 03:02:26 +01:00 |
Matthew Hodgson
|
7174648f94
|
don't show RRs if manageRRs is false
|
2016-09-08 03:01:38 +01:00 |
Matthew Hodgson
|
334564c814
|
unbreak tests
|
2016-09-07 22:54:38 +01:00 |
Matthew Hodgson
|
8f75bce29e
|
add fixmes
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
990d84df77
|
make FilePanel refresh when we switch rooms
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
e7074ef9af
|
apply FilePanel css and fix filtering
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
c2f2fb3816
|
use passive event listener for mousewheel
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
e5dd2e0b46
|
make FilePanel work, superficially at least
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
b4c1eca1c5
|
fix key warning
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
850578a973
|
FilePanel
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
e22d0a53b6
|
WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
820cd579d8
|
fix stupid double-spacing issue
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
c3de035964
|
filepanel
|
2016-09-07 22:54:37 +01:00 |
Matthew Hodgson
|
ae34f2ed5c
|
placeholder NotificationPanel
|
2016-09-07 22:53:15 +01:00 |
Matthew Hodgson
|
d9ffe30a0d
|
WIP notif panel
|
2016-09-07 22:53:15 +01:00 |
Aviral Dasgupta
|
c11232742b
|
Fix focus and toggling issues in formatting bar
|
2016-09-08 02:46:56 +05:30 |
Aviral Dasgupta
|
8974442084
|
Hide empty autocomplete and remove word counter
|
2016-09-08 00:43:10 +05:30 |
Aviral Dasgupta
|
802ec1169f
|
Fix Markdown conversion to not add extra \n
Fixes vector-im/vector-web#2094
|
2016-09-08 00:03:55 +05:30 |
Aviral Dasgupta
|
f0f20beae0
|
RTE format bar enhancements
|
2016-09-08 00:03:54 +05:30 |
Aviral Dasgupta
|
0c0c44b050
|
Formatting toggle, markdown indicator, quoting
Fixes vector-im/vector-web#1825
|
2016-09-08 00:02:55 +05:30 |
Aviral Dasgupta
|
71251293e4
|
RTE formatbar (wip)
Fixes vector-im/vector-web#2024
|
2016-09-08 00:02:16 +05:30 |
David Baker
|
ec4086c5fc
|
API for (un)marking rooms as DM rooms
|
2016-09-07 17:46:45 +01:00 |
wmwragg
|
7dfb8857d8
|
Merge branch 'develop' into wmwragg/one-to-one-chat
|
2016-09-07 17:22:10 +01:00 |
Luke Barnard
|
ce68a5bfc8
|
clean up
|
2016-09-07 17:08:02 +01:00 |
Luke Barnard
|
31d2a819f0
|
Get power levels before setting them
|
2016-09-07 17:06:57 +01:00 |
wmwragg
|
ca3910f5a8
|
Mouse actions on the queryList added, as well as better queryListElement styling
|
2016-09-07 16:18:50 +01:00 |
Richard van der Hoff
|
603bf8c194
|
Merge pull request #447 from matrix-org/dbkr/refactor_matrixtools
Refactor MatrixTools to Rooms
|
2016-09-07 11:56:00 +01:00 |
David Baker
|
66b2944011
|
Convert Rooms.js to ES6
|
2016-09-07 11:45:32 +01:00 |
David Baker
|
8a4606cfbf
|
Remove unused import
|
2016-09-07 11:34:55 +01:00 |
David Baker
|
df1cc8748f
|
Change references to MatrixTools to Rooms
or remove where they were unused
|
2016-09-07 11:33:58 +01:00 |
David Baker
|
db42d629aa
|
Rename MatrixTools to Rooms
Since all the functions therein are to do with rooms, so this name is probably more helpful
|
2016-09-07 11:30:09 +01:00 |
David Baker
|
bed5aa8c83
|
Merge pull request #446 from matrix-org/dbkr/m_direct_dm_rooms
Track DM rooms in account data
|
2016-09-07 11:28:35 +01:00 |
wmwragg
|
dd186dd612
|
Fixed wrong type to justified prop
|
2016-09-07 10:59:06 +01:00 |