mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
8039 commits 214 branches 561 tags 415 MiB
Commit graph

8039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo 2018-01-04 16:41:16 +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
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
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
Luke Barnard
71740cc176 Merge branch 'develop' into luke/fix-room-list-group-store-leak 2017-12-15 17:36:36 +00:00
Luke Barnard
d292dab9c6 More doc 2017-12-15 17:30:21 +00:00
Luke Barnard
56affd3d42 Rename for clarity 2017-12-15 17:29:06 +00:00
Luke Barnard
d2066f41d5
Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption 
Fix one variant of a scroll jump that occurs when decrypting an m.text
 2017-12-15 17:25:21 +00:00
Luke Barnard
653137f6ec Update comment 2017-12-15 17:21:20 +00:00
Luke Barnard
6f896098e3 Get Group profile from TagTile instead of TagPanel 
So that instead of getting all group profiles everytime the tags
change order, get them when the TagTile mounts for a group tag.
 2017-12-15 17:18:46 +00:00
Luke Barnard
0a944e0746
Merge pull request #1665 from matrix-org/luke/fix-matrix-chat-logged-in-view-ref 
Avoid NPEs by using ref method for collecting loggedInView in MatrixChat
 2017-12-15 16:30:35 +00:00
Luke Barnard
6e832c7d73 Dedupe requests to fetch group profile data 2017-12-15 16:28:50 +00:00
Luke Barnard
8b11b10531 Avoid NPEs by using ref method for collecting loggedInView in MatrixChat 2017-12-15 15:24:37 +00:00
Luke Barnard
961d5e1868 Split updatedSelectedTagsRooms 
because we don't need to get the rooms for all groups when
the filtered tags change.
 2017-12-15 14:23:35 +00:00
Luke Barnard
34e455c6fc Fix leaking of GroupStore listeners in RoomList 2017-12-15 14:12:21 +00:00
Luke Barnard
7f551f517b Add comments to _onDecrypted 2017-12-15 14:01:07 +00:00
Luke Barnard
a516c18cc5 Indicate event tile resize after rendering 2017-12-15 13:58:58 +00:00