Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,664 Commits 206 Branches 552 Tags 519 MiB
db834b315a
Commit Graph

14664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Ryan Stinnett
db834b315a
Merge pull request #2828 from jryans/notification-labels 
Clarify devices affected by notification settings
 2019-03-26 17:43:19 +00:00
J. Ryan Stinnett
f8dce875f2 Clarify devices affected by notification settings 
This clarifies that the notification settings only apply to the current device.
This also tries to apply the spirit of
https://github.com/matrix-org/matrix-react-sdk/pull/1995 (authored by @aidalgol)
which wanted to remove "web" from the label, since there's also a desktop
client.
 2019-03-26 17:39:07 +00:00
Travis Ralston
1a6bebcc1d
Merge pull request #2824 from matrix-org/travis/add-widget-command 
Add a command for creating custom widgets without an integration manager
 2019-03-26 10:26:59 -06:00
Travis Ralston
f61a6104b5
Use m.custom for widget type 
As per https://github.com/matrix-org/matrix-doc/issues/1236
 2019-03-26 09:23:17 -06:00
Travis Ralston
1703e3860b
Merge pull request #2822 from matrix-org/travis/minimize-widgets 
Minimize stickerpicker when the title is clicked
 2019-03-26 07:44:14 -06:00
J. Ryan Stinnett
dbc4735b06
Merge pull request #2825 from YaoiFangirl420/develop 
Add <code> blocks around homeserver and identity server urls
 2019-03-26 09:35:56 +00:00
Travis Ralston
a3a242f22c
Merge pull request #2815 from teemak/develop 
Fixed drop shadow for tooltip.
 2019-03-25 16:09:00 -06:00
Travis Ralston
79ea873717
Merge pull request #2820 from matrix-org/travis/timeline-explosion-workaround 
Ask the user for debug logs when the timeline explodes
 2019-03-25 12:09:16 -06:00
Travis Ralston
43291c708d i18n 2019-03-25 11:58:11 -06:00
J. Ryan Stinnett
1e5c0a8713
Apply suggestions from code review 
Co-Authored-By: turt2live <travpc@gmail.com>
 2019-03-25 11:56:49 -06:00
J. Ryan Stinnett
3e676454b6
Update src/components/views/dialogs/TimelineExplosionDialog.js 
Co-Authored-By: turt2live <travpc@gmail.com>
 2019-03-25 11:33:31 -06:00
Travis Ralston
1172488cce
Merge pull request #2823 from matrix-org/travis/fix-add-widget-button 
Fix typo preventing users from adding more widgets easily
 2019-03-25 09:59:43 -06:00
Travis Ralston
0d5c98634d
Merge pull request #2817 from matrix-org/travis/blacklist-unverified-devices 
Attach an onChange listener to the room's blacklist devices option
 2019-03-25 09:59:29 -06:00
Travis Ralston
a9ea74610a
Merge pull request #2818 from matrix-org/travis/leave-room-chain 
Use leaveRoomChain when leaving a room
 2019-03-25 09:57:17 -06:00
YaoiFangirl420
f2b64a8e7f Add <code> blocks around homeserver and identity server urls 
To make the urls visually distinct from the surrounding non-url text

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-03-24 02:05:04 -07:00
Travis Ralston
8cca1bef23 Add a command for creating custom widgets without an integration manager 
Fixes https://github.com/vector-im/riot-web/issues/4882
 2019-03-24 00:07:00 -06:00
Travis Ralston
1ba23d6833 Fix typo preventing users from adding more widgets easily 
Fixes https://github.com/vector-im/riot-web/issues/9266
 2019-03-23 23:53:21 -06:00
Travis Ralston
a8ae63bb06 Minimize stickerpicker when the title is clicked 
Fixes https://github.com/vector-im/riot-web/issues/6437

This also fixes a bug where if the room had apps open and you clicked the sticker picker's title, you'd end up closing the apps and not the picker.
 2019-03-23 23:50:06 -06:00
Travis Ralston
7b972e476f
Merge pull request #2821 from YaoiFangirl420/develop 
Fix bug with NetworkList dropdown
 2019-03-23 22:25:23 -06:00
YaoiFangirl420
00335e2462 Fix bug with NetworkList dropdown 
The NetworkDropdown component was incorrectly guarding against a null
check when retrieving the list of networks

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-03-23 20:53:09 -07:00
Travis Ralston
e5f7563dec Ask the user for debug logs when the timeline explodes 
Fixes https://github.com/vector-im/riot-web/issues/9260
Workaround for https://github.com/vector-im/riot-web/issues/8593
Requires https://github.com/matrix-org/matrix-js-sdk/pull/869

We check if any dialogs are open before moving forward because we don't want to risk showing so many dialogs that the user is unable to click a button. We're also not overly concerned if the dialog being shown is irrelevant because whatever the user is doing will likely be unaffected, and we can scream in pain when they're finished.
 2019-03-22 20:23:35 -06:00
Travis Ralston
389abed574 Define a title for generic error 2019-03-22 19:03:52 -06:00
Travis Ralston
4fd48988e9 Check for any errors leaving the room, not just the top level 2019-03-22 17:39:42 -06:00
Travis Ralston
a34a8bb425 Use leaveRoomChain when leaving a room 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/868
Fixes https://github.com/vector-im/riot-web/issues/8539

We don't need to use leaveRoomChain when rejecting invites because we won't have the references needed. This leaves the couple spots where we do actually leave a room, and use the new function for that.
 2019-03-22 17:36:54 -06:00
J. Ryan Stinnett
68997f9652
Merge pull request #2816 from jryans/trim-preview 
Trim the logging for URL previews
 2019-03-22 20:50:36 +00:00
Travis Ralston
50614fa7fb Attach an onChange listener to the room's blacklist devices option 
Fixes https://github.com/vector-im/riot-web/issues/9235

The global option in user settings is unaffected by this bug. Users who have previously set the per-room flag without success can simply refresh the page and the change will be picked up. The bug here is that the current session would not update accordingly, however.

Introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2523
 2019-03-22 14:22:20 -06:00
Tee Mak
50ffdc2f12
Fixed drop shadow for tooltip. 
The box-shadow color value is from $menu-box-shadow-color. The shadow now looks consistent on light or dark theme.
 2019-03-22 14:50:13 -04:00
J. Ryan Stinnett
c17f7a2949 Trim the logging for URL previews 
It should be sufficient to have the error stack and general log message for URL
preview failure.
 2019-03-22 18:50:08 +00:00
J. Ryan Stinnett
140e0d6a30
Merge pull request #2814 from jryans/storage-edge-cases 
Explicitly create `cryptoStore` in React SDK
 2019-03-22 17:26:45 +00:00
J. Ryan Stinnett
2ac7dd4ca3 Explicitly create cryptoStore in React SDK 
The React SDK has a client creation path that starts 2 out of 3 stores, but then
leaves the other one for the JS SDK's default value handling.

We'll soon be adding additional code to check the health of stores, so it would
be simpler to follow and think about if we create them all in one place.
 2019-03-22 15:03:03 +00:00
J. Ryan Stinnett
ed72352636
Merge pull request #2812 from jryans/memory-store-name 
Change to new consistent name for `MemoryStore`
 2019-03-21 18:33:19 +00:00
Travis Ralston
44987955ac
Merge pull request #2813 from matrix-org/travis/buildkite2 
Use medium agents for the more resource intensive builds
 2019-03-21 12:11:42 -06:00
Travis Ralston
8a0d6562dc Use medium agents for the more resource intensive builds 2019-03-21 10:55:43 -06:00
J. Ryan Stinnett
1c677d3581 Change to new consistent name for MemoryStore 2019-03-21 15:35:00 +00:00
Bruno Windels
44f3cac5eb Merge branch 'master' into develop 2019-03-21 11:28:35 +01:00
Bruno Windels
4ca90b16c3 Merge branch 'release-v1.0.5' 2019-03-21 11:28:08 +01:00
Bruno Windels
a483352798 v1.0.5 2019-03-21 11:27:29 +01:00
Bruno Windels
3ab205b64d Prepare changelog for v1.0.5 2019-03-21 11:24:01 +01:00
Bruno Windels
03dbc0b2cc
Merge pull request #2811 from matrix-org/bwindels/disable-typing-jump-prevention 
Hotfix: disable typing notifs jumping prevention for now
 2019-03-21 10:19:40 +00:00
Bruno Windels
817fe1a520 disable typing notifs jumping prevention for now 2019-03-21 11:01:47 +01:00
David Baker
ce1febe150
Merge pull request #2810 from matrix-org/dbkr/buildkite_group_logs 
Add log grouping to buildkite
 2019-03-20 21:31:58 +00:00
J. Ryan Stinnett
4c4d4407bf
Merge pull request #2809 from jryans/git-proto 
Switch to `git` protocol for CI dependencies
 2019-03-20 20:53:25 +00:00
David Baker
8b1e05542d Add log grouping to buildkite 2019-03-20 19:10:47 +00:00
David Baker
324781005d
Merge pull request #2808 from matrix-org/dbkr/velocity-mainline 
Go back to using mainine velocity
 2019-03-20 19:01:20 +00:00
J. Ryan Stinnett
99369a54fe
Typo 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-03-20 18:11:42 +00:00
J. Ryan Stinnett
6f79e8503a Switch to git protocol for CI dependencies 
If you try to clone a repo that doesn't exist via `https`, `git` will prompt for
auth credentials and hang forever. Using `git` avoids this and fails immediately
instead, which is what we want for a missing repo.

Part of https://github.com/vector-im/riot-web/issues/9221
 2019-03-20 18:06:07 +00:00
David Baker
58b2068fbf Set velocity's mock option in the unit test 2019-03-20 17:43:19 +00:00
Travis Ralston
94e91e6f9a
Merge pull request #2796 from matrix-org/travis/upgrade-warning 
Warn that members won't be autojoined to upgraded rooms
 2019-03-20 08:34:33 -06:00
David Baker
1a8fe4dd43 Go back to using mainine velocity 
We moved off to our own fork of velocity many moons ago to fix
a memory leak bug when velocity was being barely maintained. They
have now merged the bugfix, so go back to mainline.
 2019-03-20 10:54:06 +00:00
J. Ryan Stinnett
d47eb51589
Merge pull request #2807 from jryans/ci-forks 
Support CI for matching branches on forks
 2019-03-20 09:56:57 +00:00