OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,055 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

8055 Commits (c7accb732cf6a9d8a696746d954d0595a2af3758)

Author SHA1 Message Date
David Baker c7accb732c
Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor 
make RoomDetailRow reusable for the Room Directory
 2018-01-04 18:26:06 +00:00
David Baker 50aeea8f05
Merge pull request #1686 from matrix-org/luke/fix-get-users-rooms-for-joined-groups 
Prefetch group data for all joined groups when RoomList mounts
 2018-01-04 18:19:37 +00:00
lukebarnard f1b60287fb Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups 2018-01-04 17:56:34 +00:00
lukebarnard 55bfff24c4 Fix forgotten rename during d5e2a73d99 2018-01-04 17:46:44 +00:00
David Baker b34f360f96
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop 
Remove unused selectedRoom prop
 2018-01-04 17:33:36 +00:00
David Baker 5961cf3958
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click 
Fix shift and shift-ctrl click in TagPanel
 2018-01-04 17:08:01 +00:00
David Baker c294e336b5
Merge pull request #1344 from matrix-org/t3chguy/hide_left_chats_memberinfo 
skip direct chats which either you or the target have left
 2018-01-04 16:49:17 +00:00
Michael Telatynski 831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo 2018-01-04 16:41:16 +00:00
lukebarnard 2282f5c26f Remove unused selectedRoom prop 2018-01-04 14:19:10 +00:00
lukebarnard d5e2a73d99 Add alt condition back in, rename to specify igorance of shift 
because this is really what this function is for - we want to
ignore specifically shift but not necessarily alt (despite
this probably not having any real impact).
 2018-01-04 12:06:19 +00:00
Luke Barnard d3e47fa99d
Merge pull request #1682 from Nostradamos/fix_riot_web_4821 
Make scroll on paste in RTE compatible with https://github.com/vector-im/riot-web/pull/5900
 2018-01-03 15:48:43 +00:00
lukebarnard 2baacfa562 Handle case where ordering is not yet known 2018-01-03 14:12:28 +00:00
lukebarnard a2bb240dcb Fetch group data for all tags instead of those selected 
so that tag switching is not delayed by fetching group data, i.e group members and rooms.
 2018-01-03 14:07:29 +00:00
Luke Barnard 63335f70e5
Merge pull request #1685 from matrix-org/dbkr/remove-double-fullstop 
Remove extra full stop
 2018-01-03 13:41:13 +00:00
David Baker 613e3b7ac1 Remove extra full stop 2018-01-03 11:57:49 +00:00
lukebarnard d495519986 Fix shift-ctrl-click 
isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
 2018-01-03 11:39:15 +00:00
lukebarnard 85cdd888e8 Combine TagOrderStore and FilterStore 
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
 2018-01-03 11:33:59 +00:00
nostradamos 2189fe9256 removed console.log 2018-01-03 01:52:02 +01:00
nostradamos e543f55572 refactored code 2018-01-03 01:50:03 +01:00
nostradamos 36df3acf4d Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821 2018-01-02 23:07:47 +01:00
nostradamos 03f88df66e Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821 2018-01-02 22:44:18 +01:00
lukebarnard 57fb09dfb7 Fix dodgy merge done in 874a7bf 
where develop branch should have been used for a chunk of code
 2018-01-02 19:26:56 +00:00
Luke Barnard 5abf0440c6
Merge pull request #1666 from matrix-org/luke/fix-duplicate-group-profile-requests 
Dedupe requests to fetch group profile data
 2018-01-02 19:02:50 +00:00
Luke Barnard 8eef09335a
Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting 
Get Group profile from TagTile instead of TagPanel
 2018-01-02 19:02:33 +00:00
Luke Barnard 2338fba2ee
Merge pull request #1664 from matrix-org/luke/fix-room-list-group-store-leak 
Fix leaking of GroupStore listeners in RoomList
 2018-01-02 18:58:22 +00:00
lukebarnard 479e88cff7 Log an error to get group profile data 2018-01-02 18:55:50 +00:00
lukebarnard 45e860de7a Document GroupStore.registerListener 2018-01-02 18:12:08 +00:00
lukebarnard 874a7bf1de Merge branch 'develop' into luke/fix-room-list-group-store-leak 2018-01-02 16:19:37 +00:00
lukebarnard 133837cdbe Document initial state 2018-01-02 15:59:10 +00:00
lukebarnard 833cd321f3 Log warning in case of failed group profile fetch 2018-01-02 15:58:24 +00:00
lukebarnard 31855f18f8 Initialise profile state 2018-01-02 15:56:32 +00:00
lukebarnard 2cb4c897ce Move `getInitialState` before `componentWillMount` 2018-01-02 13:45:19 +00:00
lukebarnard 3cb128094d Add more comments to TagTile to explain what it is 2018-01-02 13:44:22 +00:00
lukebarnard 80f11e5c77 Comment tag PropType 2018-01-02 13:34:47 +00:00
lukebarnard 3947a72d1b Fix to allow subsequent group profile requests if one fails 
Also, delete the groupProfilePromise immediately after setting
the group profile (the first if-statement will prevent a new
request from being started).
 2018-01-02 10:42:48 +00:00
Richard Lewis b5f6d97fa2 Ignore postmessage requests with api field set. 2017-12-19 15:39:13 +00:00
Matthew Hodgson fa14bc9b8d don't gutwrench 2017-12-18 22:49:23 +00:00
Matthew Hodgson e65c67ca15 fix https://github.com/vector-im/riot-web/issues/5841 2017-12-18 22:47:28 +00:00
Michael Telatynski b91bd52edd
Merge pull request #1658 from pafcu/annotate-t 
Add option to also output untranslated string
 2017-12-18 22:46:48 +00:00
Richard Lewis 32bdbdb2f3
Merge pull request #1669 from turt2live/travis/integ-theme 
Give the current theme to widgets and the integration manager
 2017-12-18 17:35:06 +00:00
Travis Ralston e5df0dcf1e
$riot_theme -> $theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-18 09:19:54 -07:00
Michael Telatynski 201d8f04c0
Merge pull request #1671 from oivoodoo/riot-web-issue-1953-multiple-file-upload 
Allow multiple file uploads using drag & drop for RoomView
 2017-12-18 14:56:31 +00:00
Michael Telatynski 779e4d026c
Merge pull request #1670 from oivoodoo/issue/phone-number-preview 
Fix issue with preview of phone number on register and waiting for sms code confirmation code
 2017-12-18 13:04:22 +00:00
Alexandr Korsak d051a2e0b3 Remove extra space 2017-12-18 15:59:21 +03:00
Alexandr Korsak 78af02b29b Replace lodash/every by Array.prototype.every function 2017-12-18 15:51:01 +03:00
Alexandr Korsak c07c4fd1cb Allow multiple file uploads on drag & drop 2017-12-18 13:20:18 +03:00
Alexandr Korsak fddbf3a2a2 Fix issue with preview of phone number on register and waiting for sms code confirmation code 2017-12-18 12:23:54 +03:00
Travis Ralston 678d87ef20 Give the current theme to the integration manager 
For integration managers which would like to theme themselves to match Riot.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-16 20:13:27 -07:00
Travis Ralston 94ef80c008 Support sending the current theme to widgets 
This is a namespaced variable because some clients may not be able to support themes, or may have varying definitions of what "light" means. Widgets are recommended to opt for per-client checks, or accept that some clients may differ.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-16 20:11:00 -07:00
Luke Barnard adaea9ad5b
Merge pull request #1647 from matrix-org/luke/tag-panel-improve-performance 
Attempt to improve TagPanel performance
 2017-12-15 17:38:15 +00:00