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 |
|
Luke Barnard
|
f605b172a7
|
Better log
|
2016-09-08 17:38:51 +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 |
|
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 |
|
wmwragg
|
7e60012bd4
|
Added justification for the AddressTile, when requested
|
2016-09-07 10:55:44 +01:00 |
|
David Baker
|
094080629d
|
Actually commit changed path
|
2016-09-07 10:19:39 +01:00 |
|
David Baker
|
8f6d413ebd
|
Move DMRoomMap to a util subdir
|
2016-09-07 10:07:43 +01:00 |
|
Luke Barnard
|
4bfa57b34e
|
Getting join rules does not need user ID
|
2016-09-07 09:58:48 +01:00 |
|
Luke Barnard
|
3977ea0074
|
Add ability to set power level
|
2016-09-07 09:57:07 +01:00 |
|
wmwragg
|
45256f5d58
|
Validation checks added
|
2016-09-06 17:46:00 +01:00 |
|
David Baker
|
d5b23e9e0e
|
Save guessed DM rooms to account data
Also bugfix
|
2016-09-06 17:43:39 +01:00 |
|
wmwragg
|
52f050b5f9
|
Better scrolling UX, and fixed bug which created a room when no address supplied
|
2016-09-06 17:20:37 +01:00 |
|
wmwragg
|
c03f145f04
|
Basic keyboard scrolling of queryList
|
2016-09-06 17:00:28 +01:00 |
|
wmwragg
|
91b1c1f0fc
|
Initial highlighting selected address - styling not final
|
2016-09-06 16:39:50 +01:00 |
|
David Baker
|
8401323156
|
Hopefully read DM rooms from account data
|
2016-09-06 16:39:21 +01:00 |
|
wmwragg
|
d1398b137a
|
Circumventing autofill by using a textarea rather than an input type=text
|
2016-09-06 16:15:48 +01:00 |
|
wmwragg
|
0f73c4326e
|
Added scrolling to queryList
|
2016-09-06 15:46:58 +01:00 |
|
wmwragg
|
391fe0ab77
|
Basic address list created, and UX tweaks for interaction
|
2016-09-06 15:24:23 +01:00 |
|
wmwragg
|
ddf1e4841a
|
Selecting users with arrow keys added
|
2016-09-06 13:07:06 +01:00 |
|
wmwragg
|
1fe85f37fd
|
Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching
|
2016-09-06 11:34:38 +01:00 |
|
Luke Barnard
|
cb4df84d49
|
Missing curly bracket
|
2016-09-06 10:36:44 +01:00 |
|
Luke Barnard
|
fa3387b326
|
Code review
- use an empty state key
- swap switch for if
- s/not in view/not visible/
|
2016-09-06 10:29:38 +01:00 |
|
David Baker
|
80dd927275
|
Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
Fix: conference rooms were no longer hidden
|
2016-09-05 18:39:15 +01:00 |
|
David Baker
|
04889a89ec
|
Only count rooms we're in as DM rooms
|
2016-09-05 18:35:32 +01:00 |
|
Richard van der Hoff
|
83296512fd
|
Merge pull request #444 from matrix-org/dbkr/fix_conf_error
Fix error dialog on conf call error
|
2016-09-05 17:47:30 +01:00 |
|
David Baker
|
50ef695740
|
Fix: conference rooms were no longer hidden
|
2016-09-05 17:42:22 +01:00 |
|