Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-02 14:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'wekan:master' into master

Browse source
This commit is contained in:
Hélio Guardabaxo 2022-09-13 11:25:26 -03:00 • committed by GitHub
commit bbc6d0955c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
132 changed files with 1350 additions and 913 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/components/boards/boardBody.js
View file

@ -411,8 +411,10 @@ BlazeComponent.extendComponent({
if (card) {
// TODO: add a flag for allDay events
if (!event.allDay) {
card.setStart(event.start.toDate());
card.setEnd(event.end.toDate());
// https://github.com/wekan/wekan/issues/2917#issuecomment-1236753962
//card.setStart(event.start.toDate());
//card.setEnd(event.end.toDate());
card.setDue(event.start.toDate());
isOk = true;
}
}

6
client/components/sidebar/sidebar.jade
View file

@ -49,7 +49,7 @@ template(name="membersWidget")
| {{_ 'members'}}
+basicTabs(tabs=tabs)
+tabContent(slug="people")
unless isWorker
unless currentUser.isWorker
p.quiet
.board-widget-content
each currentBoard.activeMembers
@ -70,7 +70,7 @@ template(name="membersWidget")
button.js-member-invite-accept.primary {{_ 'accept'}}
button.js-member-invite-decline {{_ 'decline'}}
+tabContent(slug='organizations')
unless isWorker
unless currentUser.isWorker
p.quiet
if AtLeastOneOrgWasCreated
.board-widget.board-widget-members
@ -78,7 +78,7 @@ template(name="membersWidget")
+boardOrgGeneral
.clearfix
+tabContent(slug="teams")
unless isWorker
unless currentUser.isWorker
p.quiet
if AtLeastOneTeamWasCreated
.board-widget.board-widget-members