b0a4b017c3
Merge pull request #440 from aviraldg/feature-rte-formatbar
...
Formatting toolbar for RTE message composer.
2016-09-08 13:54:26 +01:00
8da7b98ad0
RTE: Remove dead code, fix <del> styling
2016-09-08 11:21:39 +05:30
c11232742b
Fix focus and toggling issues in formatting bar
2016-09-08 02:46:56 +05:30
8974442084
Hide empty autocomplete and remove word counter
2016-09-08 00:43:10 +05:30
802ec1169f
Fix Markdown conversion to not add extra \n
...
Fixes vector-im/vector-web#2094
2016-09-08 00:03:55 +05:30
f0f20beae0
RTE format bar enhancements
2016-09-08 00:03:54 +05:30
0c0c44b050
Formatting toggle, markdown indicator, quoting
...
Fixes vector-im/vector-web#1825
2016-09-08 00:02:55 +05:30
71251293e4
RTE formatbar (wip)
...
Fixes vector-im/vector-web#2024
2016-09-08 00:02:16 +05:30
603bf8c194
Merge pull request #447 from matrix-org/dbkr/refactor_matrixtools
...
Refactor MatrixTools to Rooms
2016-09-07 11:56:00 +01:00
66b2944011
Convert Rooms.js to ES6
2016-09-07 11:45:32 +01:00
8a4606cfbf
Remove unused import
2016-09-07 11:34:55 +01:00
df1cc8748f
Change references to MatrixTools to Rooms
...
or remove where they were unused
2016-09-07 11:33:58 +01:00
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
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
094080629d
Actually commit changed path
2016-09-07 10:19:39 +01:00
8f6d413ebd
Move DMRoomMap to a util subdir
2016-09-07 10:07:43 +01:00
d5b23e9e0e
Save guessed DM rooms to account data
...
Also bugfix
2016-09-06 17:43:39 +01:00
8401323156
Hopefully read DM rooms from account data
2016-09-06 16:39:21 +01:00
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
04889a89ec
Only count rooms we're in as DM rooms
2016-09-05 18:35:32 +01:00
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
50ef695740
Fix: conference rooms were no longer hidden
2016-09-05 17:42:22 +01:00
d782d5bbc7
Fix error dialog on conf call error
2016-09-05 17:03:10 +01:00
31e09e6137
Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
...
Make MemberInfo to use client.getStoredDevicesForUser
2016-09-05 10:38:24 +01:00
6e2fd85760
Merge pull request #437 from matrix-org/kegan/starter-links
...
Implement starter link support
2016-09-05 09:10:39 +01:00
56ac0004e5
Use href='#' hack to make link text look like a link
2016-09-05 09:10:15 +01:00
922fb448c5
Merge pull request #442 from matrix-org/rav/e2e_devices
...
Convert MemberDeviceInfo to ES6 class
2016-09-05 00:53:47 +01:00
fc40bdcbfc
Make MemberInfo to use client.getStoredDevicesForUser
...
It's more powerful than listDeviceKeys, and isn't deprecated.
2016-09-05 00:08:16 +01:00
a316c652b7
Convert MemberDeviceInfo to ES6 class
2016-09-04 21:49:06 +01:00
941dcc7e87
Merge pull request #439 from matrix-org/rav/enable_megolm_encryption
...
Make the 'encrypt this room' knob be megolm
2016-09-03 18:50:28 +01:00
bc8e7724e8
Make the 'encrypt this room' knob be megolm
2016-09-03 18:42:54 +01:00
fdfd6ecfd9
let users join confs as voice or video
2016-09-03 13:27:46 +01:00
dbd17ea953
improve e2e warning a bit
2016-09-02 17:37:16 +01:00
b5f9c2a5ac
Merge branch 'master' into develop
2016-09-02 17:17:24 +01:00
14227b5718
0.6.5-r3
2016-09-02 17:17:01 +01:00
714060ec8f
Prepare changelog for v0.6.5-r3
2016-09-02 17:17:00 +01:00
d5062f1ff7
gah, revert debug
2016-09-02 17:15:21 +01:00
fd664e893f
Merge branch 'master' into develop
2016-09-02 17:14:24 +01:00
c2ca261085
0.6.5-r2
2016-09-02 17:13:59 +01:00
6de2e8bda5
update changelog
2016-09-02 17:13:52 +01:00
fd0ed4a406
Show something when we see a no-op join event
...
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020 , don't supress no-op joins
2016-09-02 16:59:42 +01:00
8e9c04e1aa
Merge pull request #438 from matrix-org/rav/matrix_dev_hack
...
Show something when we see a no-op join event
2016-09-02 16:58:29 +01:00
f5fe4b2433
Show something when we see a no-op join event
...
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020 , don't supress no-op joins
2016-09-02 16:54:27 +01:00
45ada1887d
Implement starter link support
...
This involves modal dialogs because browsers are *terrible*.
2016-09-02 16:36:43 +01:00
6ec7e5df28
Move scalar auth stuff to ScalarAuthClient from RoomSettings
2016-09-02 16:03:24 +01:00
f9d8829ba2
let you join confs either as voice or video
2016-09-02 15:38:28 +01:00
d3bc2b7df7
Merge pull request #436 from matrix-org/rav/handle_broken_olm
...
Handle broken OlmAccounts
2016-09-02 11:58:40 +01:00
f3a1c58fa9
Handle broken OlmAccounts
...
olm 1.0.0 made broken OlmAccounts, which we may be unable to restore with olm
1.1.0. Add some words to that effect, and make sure we clear the localstorage.
2016-09-02 11:28:04 +01:00
584c7ed56d
Merge branch 'rav/show_session_load_errors' into develop
2016-09-02 11:03:39 +01:00
b4521bc44c
review feedback
2016-09-01 22:45:09 +01:00
Matthew Hodgson