OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,360 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

2360 Commits (6ddc31fb66c165d39210a274d929bbd0f5511a13)

Author SHA1 Message Date
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
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
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
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
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
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
David Baker d5b23e9e0e Save guessed DM rooms to account data 
Also bugfix
 2016-09-06 17:43:39 +01:00
David Baker 8401323156 Hopefully read DM rooms from account data 2016-09-06 16:39:21 +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
David Baker d782d5bbc7 Fix error dialog on conf call error 2016-09-05 17:03:10 +01:00
Luke Barnard 310e6602ca Fix ref to dispatcher 2016-09-05 15:24:05 +01:00
Luke Barnard efccdab0ad Better error message for room not viewed 2016-09-05 15:16:22 +01:00
Luke Barnard 1c29c95990 Only current room works with postMessage 2016-09-05 15:13:48 +01:00
Luke Barnard 54f21c9acc Expose join rules of a room 2016-09-05 14:58:16 +01:00
Richard van der Hoff 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
Kegsay 6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links 
Implement starter link support
 2016-09-05 09:10:39 +01:00
Kegan Dougal 56ac0004e5 Use href='#' hack to make link text look like a link 2016-09-05 09:10:15 +01:00
Richard van der Hoff 922fb448c5 Merge pull request #442 from matrix-org/rav/e2e_devices 
Convert MemberDeviceInfo to ES6 class
 2016-09-05 00:53:47 +01:00
Richard van der Hoff 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
Richard van der Hoff a316c652b7 Convert MemberDeviceInfo to ES6 class 2016-09-04 21:49:06 +01:00
Richard van der Hoff 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
Richard van der Hoff bc8e7724e8 Make the 'encrypt this room' knob be megolm 2016-09-03 18:42:54 +01:00
Matthew Hodgson fdfd6ecfd9 let users join confs as voice or video 2016-09-03 13:27:46 +01:00
Matthew Hodgson dbd17ea953 improve e2e warning a bit 2016-09-02 17:37:16 +01:00
Matthew Hodgson b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson 14227b5718 0.6.5-r3 2016-09-02 17:17:01 +01:00