mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 05:51:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
9404 commits 219 branches 562 tags 474 MiB
Commit graph

9404 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
a90bd6cd4f
Allow collapsing ReplyThread from MessageContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-13 12:28:58 +01:00
Michael Telatynski
8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-04-13 10:54:09 +01:00
David Baker
7e977d0016 Merge branch 'master' into develop 2018-04-12 12:54:46 +01:00
David Baker
c06fc31bb2 v0.12.2 2018-04-12 12:50:52 +01:00
David Baker
4a1d0fc8ab Prepare changelog for v0.12.2 2018-04-12 12:50:51 +01:00
David Baker
f38bb1f2c2 Bump js-sdk 2018-04-12 12:40:33 +01:00
Travis Ralston
3f069af067 Also remove the setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-04-12 12:40:07 +01:00
Travis Ralston
91a41392b4 Remove presence management 
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.

This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482

The changes to the context menu positioning were not reverted as they are useful outside of presence management.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-04-12 12:36:51 +01:00
David Baker
760f21b1d9 Put Tinter loop body in a try/catch 
So whatever other random ways this process fails in don't cause it
to take out the whole app.
 2018-04-12 12:23:33 +01:00
David Baker
5f2d9b6c54 Null check stylesheet href 
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
 2018-04-12 12:23:24 +01:00
Matthew Hodgson
d0827586e6
Merge pull request #1676 from turt2live/travis/remove-presence 
Remove presence management
 2018-04-12 11:47:21 +01:00
Michael Telatynski
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
 2018-04-12 09:48:06 +01:00
Travis Ralston
fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
David Baker
979452628f
Merge pull request #1835 from matrix-org/dbkr/fix_firefox_extension_death 
Null check stylesheet href
 2018-04-11 18:40:43 +01:00
David Baker
dbed29a7cc Put Tinter loop body in a try/catch 
So whatever other random ways this process fails in don't cause it
to take out the whole app.
 2018-04-11 18:31:54 +01:00
David Baker
91024007aa Null check stylesheet href 
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
 2018-04-11 18:20:40 +01:00
Luke Barnard
ab578a5c0c
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y 
TopUnreadMessagesBar a11y
 2018-04-11 15:47:43 +01:00
Luke Barnard
1c6c180908 Merge branch 'master' into develop 2018-04-11 11:55:24 +01:00
Luke Barnard
1adb82b985 v0.12.1 2018-04-11 11:54:54 +01:00
Luke Barnard
d392eef6a8 Prepare changelog for v0.12.1 2018-04-11 11:54:53 +01:00
Luke Barnard
478c2bab33 Bump js-sdk version to 0.10.0 2018-04-11 11:51:16 +01:00
Luke Barnard
428cae34eb Merge branch 'master' into develop 
(Releasing v0.12.0)
 2018-04-11 11:32:05 +01:00
Luke Barnard
87d0c4b45a v0.12.0 2018-04-11 11:31:31 +01:00
Luke Barnard
f4d3e6fabf Prepare changelog for v0.12.0 2018-04-11 11:31:30 +01:00
Luke Barnard
d877384d64
Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave 
Use correct 1-1 room avatar after users leave
 2018-04-11 11:21:18 +01:00
Luke Barnard
a142f4405a Revert "Use GeminiScrollbarWrapper in Flair settings of UserSettings" 
This reverts commit 3b5fb3ae30.
 2018-04-11 10:41:11 +01:00
Matthew Hodgson
8b2446f803 rename createGroupButton to not be a total misnomer... 2018-04-11 10:24:28 +01:00
Luke Barnard
3b5fb3ae30 Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-11 10:09:49 +01:00
David Baker
300e6877f5
Merge pull request #1833 from matrix-org/luke/fix-flair-settings-gemini-macOS 
Use GeminiScrollbarWrapper in Flair settings of UserSettings
 2018-04-11 09:45:14 +01:00
Luke Barnard
edb754b76b Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-10 18:08:19 +01:00
Luke Barnard
98c76a891c Change comments 2018-04-10 16:08:09 +01:00
Luke Barnard
b0818df329 Add 500ms delay to show membershipBusy for longer 
to avoid a UI that flashes quickly
 2018-04-10 16:08:02 +01:00
Luke Barnard
1b01c30fce
Merge pull request #1832 from matrix-org/luke/delay-group-leave-or-join 
Add 500ms delay to show `membershipBusy` for longer
 2018-04-10 16:05:54 +01:00
Luke Barnard
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285 Add 500ms delay to show membershipBusy for longer 
to avoid a UI that flashes quickly
 2018-04-10 15:31:04 +01:00
Luke Barnard
f2e60b1526 v0.12.0-rc.7 2018-04-10 14:27:38 +01:00
Luke Barnard
b4ea03f823 Prepare changelog for v0.12.0-rc.7 2018-04-10 14:27:38 +01:00
Luke Barnard
f721038942 Reword group setting delay 2018-04-10 14:05:53 +01:00
Luke Barnard
e616dbac33 Factor out _closeSettings for cleanliness 2018-04-10 13:56:54 +01:00
Luke Barnard
9e6841df09 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 13:56:49 +01:00
Luke Barnard
1da56d9e98 Hide settings after leaving a group 2018-04-10 13:56:42 +01:00
Luke Barnard
6f10b5a410 Fetch group data when leaving or joining to update the view 2018-04-10 13:56:36 +01:00
David Baker
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update 
Improve group join/leave feedback
 2018-04-10 13:40:50 +01:00
Luke Barnard
de1073aacb Factor out _closeSettings for cleanliness 2018-04-10 13:28:42 +01:00
Luke Barnard
24d4df87d1 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 11:49:59 +01:00
Luke Barnard
0681df71b0 Hide settings after leaving a group 2018-04-10 11:49:35 +01:00
Luke Barnard
42141f7da7 Fetch group data when leaving or joining to update the view 2018-04-10 10:03:54 +01:00
Matthew Hodgson
0ff2837d7f rename createGroupButton to not be a total misnomer... 2018-04-09 23:02:59 +01:00
Matthew Hodgson
2d8880ec5f patch NPE on Pill when lazyloading members 2018-04-09 23:02:15 +01:00
Luke Barnard
d02dced246 v0.12.0-rc.6 2018-04-09 17:10:03 +01:00