1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Merge branch 'master' into dependabot/go_modules/github.com/mmcdole/gofeed-1.0.0

This commit is contained in:
Chris Cummer 2020-05-23 09:38:39 -07:00
commit a5d55eb224
5 changed files with 14 additions and 6 deletions

View File

@ -910,6 +910,13 @@
"name": "Risto Saarelma", "name": "Risto Saarelma",
"avatar_url": "https://avatars1.githubusercontent.com/u/41840?v=4", "avatar_url": "https://avatars1.githubusercontent.com/u/41840?v=4",
"profile": "https://github.com/rsaarelm", "profile": "https://github.com/rsaarelm",
"contributions": []
},
{
"login": "sam-github",
"name": "Sam Roberts",
"avatar_url": "https://avatars2.githubusercontent.com/u/17607?v=4",
"profile": "https://sam-github.github.io/",
"contributions": [ "contributions": [
] ]
} }

View File

@ -29,7 +29,3 @@ brews:
name: wtfutil name: wtfutil
homepage: 'https://wtfutil.com' homepage: 'https://wtfutil.com'
description: 'The personal information dashboard for your terminal.' description: 'The personal information dashboard for your terminal.'
#dockers:
#- image_templates:
#- wtfutil/wtf

View File

@ -2,6 +2,10 @@
## Unreleased ## Unreleased
### ⚡️ Added
* [docker-credential-helpers](https://github.com/docker/docker-credential-helpers) support added to provide optional securing of module secrets, [#517](https://github.com/wtfutil/wtf/issues/517) by [sam-github](https://github.com/sam-github)
## v0.30.0 ## v0.30.0
### ⚡️ Added ### ⚡️ Added

View File

@ -387,6 +387,7 @@ Dependency management in WTF is handled by [Go modules](https://github.com/golan
<td align="center"><a href="https://github.com/Tdnshah"><img src="https://avatars2.githubusercontent.com/u/13272752?v=4" width="48px;" alt=""/><br /><sub><b>Tejas Shah</b></sub></a><br /></td> <td align="center"><a href="https://github.com/Tdnshah"><img src="https://avatars2.githubusercontent.com/u/13272752?v=4" width="48px;" alt=""/><br /><sub><b>Tejas Shah</b></sub></a><br /></td>
<td align="center"><a href="https://github.com/mogensen"><img src="https://avatars2.githubusercontent.com/u/592710?v=4" width="48px;" alt=""/><br /><sub><b>Frederik Mogensen</b></sub></a><br /></td> <td align="center"><a href="https://github.com/mogensen"><img src="https://avatars2.githubusercontent.com/u/592710?v=4" width="48px;" alt=""/><br /><sub><b>Frederik Mogensen</b></sub></a><br /></td>
<td align="center"><a href="https://github.com/rsaarelm"><img src="https://avatars1.githubusercontent.com/u/41840?v=4" width="48px;" alt=""/><br /><sub><b>Risto Saarelma</b></sub></a><br /></td> <td align="center"><a href="https://github.com/rsaarelm"><img src="https://avatars1.githubusercontent.com/u/41840?v=4" width="48px;" alt=""/><br /><sub><b>Risto Saarelma</b></sub></a><br /></td>
<td align="center"><a href="https://sam-github.github.io/"><img src="https://avatars2.githubusercontent.com/u/17607?v=4" width="48px;" alt=""/><br /><sub><b>Sam Roberts</b></sub></a><br /></td>
</tr> </tr>
</table> </table>

View File

@ -43,7 +43,7 @@ func (widget *Widget) content() (string, string, bool) {
timestamp = "" timestamp = ""
} }
title = fmt.Sprintf("[%s]%s", eventTitle := fmt.Sprintf("[%s]%s",
widget.titleColor(calEvent), widget.titleColor(calEvent),
widget.eventSummary(calEvent, calEvent.ConflictsWith(calEvents)), widget.eventSummary(calEvent, calEvent.ConflictsWith(calEvents)),
) )
@ -53,7 +53,7 @@ func (widget *Widget) content() (string, string, bool) {
widget.dayDivider(calEvent, prevEvent), widget.dayDivider(calEvent, prevEvent),
widget.responseIcon(calEvent), widget.responseIcon(calEvent),
timestamp, timestamp,
title, eventTitle,
) )
str += fmt.Sprintf("%s %s%s\n", str += fmt.Sprintf("%s %s%s\n",