OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
30,007 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

30007 Commits (2142a65a9b1f5757d4db168accfc23fc08de0b5e)

Author SHA1 Message Date
Michael Telatynski 9f9699bf75 Hide Invite to this room CTA if no permission 2020-12-08 10:31:40 +00:00
Travis Ralston f30d2ff1c5 Fix confetti room unread state check 
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
 2020-12-07 16:54:09 -07:00
Travis Ralston 603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Travis Ralston 87dbc82a9f Merge branch 'feature_confetti#14676' into develop 2020-12-07 15:12:45 -07:00
Travis Ralston 550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston 2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Travis Ralston f5ce50a472
Merge pull request #5391 from su-ex/fix-inverted-settings-default 
Fix inverted settings default value
 2020-12-07 14:51:28 -07:00
Michael Telatynski 14600adf66
Merge pull request #5474 from matrix-org/t3chguy/socials 
Improve usability of the Server Picker Dialog
 2020-12-07 20:08:04 +00:00
David Baker b9d70cb1a3 Fix indentation 2020-12-07 18:40:29 +00:00
David Baker 365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker 8a58c9dea0 Update UI for two calls in the PiP view 
and also merge hold_ui changes
 2020-12-07 17:56:36 +00:00
David Baker 747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
Michael Telatynski 499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
David Baker 3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
David Baker c7f1d97b1a Round off the sharp corners 
Before you have someone's eye out
 2020-12-07 15:38:55 +00:00
Michael Telatynski 52ada641ba
Merge pull request #5473 from schwukas/fixed-typos 
Fix typos in some strings
 2020-12-07 14:35:30 +00:00
Lukas 9bb04a857b Add generated i18n json 2020-12-07 15:21:31 +01:00
J. Ryan Stinnett 07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1 
Bump highlight.js from 10.1.2 to 10.4.1
 2020-12-07 12:58:21 +00:00
RiotRobot 7d41604569 Reset matrix-js-sdk back to develop branch 2020-12-07 12:33:18 +00:00
RiotRobot 6360bc7a01 Merge branch 'master' into develop 2020-12-07 12:32:20 +00:00
RiotRobot fefe84d101 v3.10.0 2020-12-07 12:31:08 +00:00
RiotRobot ae835fb8a9 Prepare changelog for v3.10.0 2020-12-07 12:31:07 +00:00
RiotRobot 1241b7c335 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:13:04 +00:00
J. Ryan Stinnett d967f01055
Merge pull request #5471 from matrix-org/jryans/rm-temp-test-sl 
Remove old app test script path
 2020-12-07 10:18:31 +00:00
Simon Merrick b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
Simon Merrick 5544ee6408 extract alias handling to separate function 2020-12-06 23:29:11 +13:00
Lukas a856484139 Fix typos in some strings 
This commit fixes some typos that I've stumbled upon.
 2020-12-06 10:32:52 +01:00
Aaron Raimist 32f7e3552c
Remove globally defined flex and set just for group queries 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-05 21:56:17 -06:00
Aaron Raimist 3ec9d93cb0 Merge branch 'develop' into searchbox-fix-width 2020-12-05 19:53:08 -06:00
David Baker ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker 4c50125e9d Don't remove call when we call hangup 
as hopefully explained by comment
 2020-12-04 20:22:01 +00:00
David Baker faf2922b1b Update video element when the call changes in a videoview 
Because that can happen now
 2020-12-04 19:41:48 +00:00
dependabot[bot] 58eaccbba8
Bump highlight.js from 10.1.2 to 10.4.1 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-04 17:35:40 +00:00
macekj 0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
J. Ryan Stinnett c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
J. Ryan Stinnett c63c8540f1 Remove old app test script path 
Now that https://github.com/matrix-org/pipelines/pull/112 has merged, we no
longer need to support this old path for launching app-level tests.
 2020-12-04 11:05:05 +00:00
David Baker 72f858b5bb Empty commit 
as I don't see any other way to make netlify retry
 2020-12-03 19:28:37 +00:00
David Baker 6222ae07ac Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 19:05:21 +00:00
David Baker 02d1249cfc Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 19:01:54 +00:00
David Baker 0b3c7e0972 revert 2 testing commits to replace with real commit from develop 2020-12-03 19:00:57 +00:00
David Baker 0154c5aef1
Merge pull request #5469 from matrix-org/dbkr/fetchdep_netlify 
Add support for Netlify to fetchdep script
 2020-12-03 19:00:03 +00:00
David Baker c853085e29 Add support for Netlify to fetchdep script 
and remove support for Jenkins
 2020-12-03 18:40:33 +00:00
David Baker 1ed5fb1f30 Try another variable 
BRANCH is pull/xxxx/head so that doesn't work
 2020-12-03 18:29:23 +00:00
David Baker a8a4d44a57 Try different branch variable to try & get netlify to work 2020-12-03 18:24:19 +00:00
David Baker 6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker 0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker 482c0a2f6a i18n 2020-12-03 17:49:22 +00:00
David Baker 1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
J. Ryan Stinnett 624e43823e
Merge pull request #5467 from matrix-org/jryans/netlify 
Nest other layers inside on automation
 2020-12-03 16:41:24 +00:00