PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
14650 commits 1 branch 0 tags 338 MiB
Commit graph

14650 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
69fcebf045 Use allow/deny instead of whitelist/blacklist for terminology 2019-03-25 21:14:21 -06:00
Travis Ralston
3654c895eb Appease the linter 2019-03-23 23:31:19 -06:00
Travis Ralston
2dcb40f1be Track OpenID automatic permissions by (widgetLocation, widgetUrl) 2019-03-23 23:25:31 -06:00
Travis Ralston
21d52a8311 Use the same function name to bind the OpenID request handler 2019-03-23 22:50:26 -06:00
Travis Ralston
d3268801ed Merge branch 'develop' into travis/openid-widget 2019-03-23 22:48:12 -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
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
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
Travis Ralston
1ed2e6dcc1
Remove the correct widget listener 2019-03-20 15:03:02 -06: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
J. Ryan Stinnett
02569fca4b Support CI for matching branches on forks 
Currently, people with push access to the main Riot repos can push matching
branch names to Riot and the SDKs, and CI will test all the branches together.
This change allows contributors to access the same ability when submitting
several matching PRs from their fork of each repo.

Part of https://github.com/vector-im/riot-web/issues/9041
 2019-03-19 16:59:31 +00:00
Travis Ralston
9f6b550caa
Merge pull request #2801 from matrix-org/travis/renew-widget 
Discard old sticker picker when the URL changes
 2019-03-19 08:50:33 -06:00
Travis Ralston
d713c62774
Merge pull request #2799 from matrix-org/travis/widget-reload 
Reload widget messaging when widgets reload
 2019-03-19 08:49:24 -06:00
Travis Ralston
6a7e4ba52c
Merge pull request #2806 from matrix-org/t3chguy/explicit_room_name_settings 
Don't show calculated room name in room settings name input field
 2019-03-18 20:32:11 -06:00
Travis Ralston
6f89c77bf9
Merge pull request #2805 from matrix-org/t3chguy/disableBigEmoji_memote 
Disable big emoji for m.emote messages as it looks weird
 2019-03-18 20:31:32 -06:00
Michael Telatynski
cadf36e1c9 Don't show calculated room name in room settings name input field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-18 23:33:24 +00:00
Michael Telatynski
d6f31bef8e Disable big emoji for m.emote messages as it looks weird 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-18 23:25:11 +00:00
David Baker
bb111dc6c5 Update yarn.lock 
Which wasn't updated at release time
 2019-03-18 16:25:52 +00:00
David Baker
620590bd90 Update yarn.lock 
Which wasn't updated at release time
 2019-03-18 16:24:56 +00:00
J. Ryan Stinnett
5eea443cfb
Merge pull request #2803 from jryans/rm-edge-support 
Remove Edge from browser support statements
 2019-03-18 15:59:16 +00:00
J. Ryan Stinnett
34e533dd4b Remove Edge from browser support statements 
At the current time, we do not intend to do additional work specifically to
support Edge.  If it works for most use cases, that's great, but we do not
intend to fix issues that affect only Edge.

Fixes https://github.com/vector-im/riot-web/issues/9201
 2019-03-18 15:47:48 +00:00
David Baker
554da0fec3 Merge branch 'master' into develop 2019-03-18 13:57:50 +00:00
David Baker
fc7db55585 v1.0.4 2019-03-18 13:56:55 +00:00
David Baker
6ed45b52d3 Prepare changelog for v1.0.4 2019-03-18 13:56:55 +00:00
David Baker
88cc9b0504 Released js-sdk 2019-03-18 13:51:59 +00:00
David Baker
40920ae3c7
Merge pull request #2802 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-03-18 10:18:02 +00:00
Weblate
b63160693c Merge branch 'origin/develop' into Weblate. 2019-03-18 09:27:28 +00:00
Peter Vágner
d6e400c4b7 Translated using Weblate (Slovak) 
Currently translated at 89.2% (1392 of 1560 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2019-03-18 09:27:26 +00:00