Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update with main #1

Merged
merged 17 commits into from
Mar 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Enhancement / Feature Request
about: Suggest a new capability
title: 'Feature Request: '
labels: enhancement
assignees: ''

---

**Summary:**
What the new capability is.

**How important this is to me and why:**

Importance: High/Medium/Low

Use cases:
1.
2.
3.

**Additional context / similar features:**
Any examples of good implementations of this capability.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ FROM ubuntu:latest

# Make sure that the underlying container is patched to the latest versions
RUN apt update && \
apt install -y wget tar gzip unzip file
apt install -y wget tar gzip

# Now install Focalboard as a seperate layer
RUN wget https://releases.mattermost.com/focalboard/0.5.0/focalboard-server-linux-amd64.tar.gz && \
unzip -o focalboard-server-linux-amd64.tar.gz && \
RUN wget https://github.com/mattermost/focalboard/releases/download/v0.6.1/focalboard-server-linux-amd64.tar.gz && \
tar -xvzf focalboard-server-linux-amd64.tar.gz && \
mv focalboard /opt

Expand Down
4 changes: 2 additions & 2 deletions mac/Focalboard.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -438,7 +438,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
Expand Down
9 changes: 1 addition & 8 deletions server/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@ go 1.15

require (
github.com/Masterminds/squirrel v1.4.0
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/go-ldap/ldap v3.0.3+incompatible // indirect
github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
github.com/golang-migrate/migrate/v4 v4.13.0
github.com/golang/gddo v0.0.0-20200831202555-721e228c7686 // indirect
github.com/golang/mock v1.4.4
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
github.com/jteeuwen/go-bindata v3.0.7+incompatible // indirect
github.com/kr/pretty v0.2.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lib/pq v1.8.0
github.com/mattermost/mattermost-server v5.11.1+incompatible
github.com/mattermost/mattermost-server/v5 v5.28.0
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/nicksnyder/go-i18n v1.10.1 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pkg/errors v0.9.1
github.com/rudderlabs/analytics-go v3.2.1+incompatible
Expand All @@ -28,6 +22,5 @@ require (
go.uber.org/zap v1.15.0
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/tools v0.0.0-20201017001424-6003fad69a88 // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
)
119 changes: 3 additions & 116 deletions server/go.sum

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions server/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/google/uuid"
"github.com/gorilla/mux"
"github.com/pkg/errors"
"go.uber.org/zap"

"github.com/mattermost/focalboard/server/api"
Expand All @@ -26,11 +27,9 @@ import (
"github.com/mattermost/focalboard/server/services/webhook"
"github.com/mattermost/focalboard/server/web"
"github.com/mattermost/focalboard/server/ws"
"github.com/mattermost/mattermost-server/utils"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/filesstore"

"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v5/utils"
)

type Server struct {
Expand Down
3 changes: 3 additions & 0 deletions webapp/__mocks__/styleMock.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
module.exports = {};
12 changes: 12 additions & 0 deletions webapp/i18n/de.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"BoardCard.delete": "Löschen",
"BoardCard.duplicate": "Duplizieren",
"BoardCard.untitled": "Unbenannt",
"BoardComponent.add-a-group": "+ Hinzufügen einer Gruppe",
"BoardComponent.delete": "Löschen",
"BoardComponent.hide": "Ausblenden",
"BoardComponent.neww": "+ Neu",
"BoardComponent.show": "Anzeigen",
"CardDetail.add-content": "Inhalt hinzufügen",
"CardDetail.new-comment-placeholder": "Kommentar hinzufügen..."
}
11 changes: 0 additions & 11 deletions webapp/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,14 @@
"BoardComponent.delete": "Borrar",
"BoardComponent.hidden-columns": "Columnas Ocultas",
"BoardComponent.hide": "Ocultar",
"BoardComponent.loading": "Cargando...",
"BoardComponent.neww": "+ Nueva",
"BoardComponent.no-property": "Sin {property}",
"BoardComponent.no-property-title": "Elementos sin la propiedad {property} irán aquí. Esta columna no se puede eliminar.",
"BoardComponent.show": "Mostrar",
"CardDetail.add-content": "Añadir contenido",
"CardDetail.add-icon": "Añadir icono",
"CardDetail.add-property": "+ Añadir propiedad",
"CardDetail.image": "Imagen",
"CardDetail.new-comment-placeholder": "Añadir un comentario...",
"CardDetail.pick-icon": "Escoger Icono",
"CardDetail.random-icon": "Aleatorio",
"CardDetail.remove-icon": "Quitar icono",
"CardDetail.text": "Texto",
"Comment.delete": "Borrar",
"CommentsList.send": "Enviar",
"Filter.includes": "incluye",
Expand All @@ -43,7 +37,6 @@
"Sidebar.untitled-board": "(Panel sin titulo)",
"Sidebar.untitled-view": "(Vista sin titulo)",
"TableComponent.add-icon": "Añadir Icono",
"TableComponent.loading": "Cargando...",
"TableComponent.name": "Nombre",
"TableComponent.plus-new": "+ Nueva",
"TableHeaderMenu.delete": "Borrar",
Expand All @@ -54,7 +47,6 @@
"TableHeaderMenu.sort-ascending": "Orden ascendente",
"TableHeaderMenu.sort-descending": "Orden descendente",
"TableRow.open": "Abrir",
"ViewHeader.export-board-archive": "Exportar Archivo del Panel",
"ViewHeader.export-csv": "Exportar a CSV",
"ViewHeader.filter": "Filtrar",
"ViewHeader.group-by": "Agrupar por: {property}",
Expand All @@ -63,9 +55,6 @@
"ViewHeader.search": "Buscar",
"ViewHeader.search-text": "Texto de búsqueda",
"ViewHeader.sort": "Ordenar",
"ViewHeader.test-add-100-cards": "TEST: Añadir 100 tarjetas",
"ViewHeader.test-add-1000-cards": "TEST: Añadir 1,000 tarjetas",
"ViewHeader.test-randomize-icons": "TEST: Iconos aleatorios",
"ViewTitle.pick-icon": "Escoger Icono",
"ViewTitle.random-icon": "Aleatorio",
"ViewTitle.remove-icon": "Quitar Icono",
Expand Down
3 changes: 3 additions & 0 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
"react-simplemde-editor": "^4.1.3"
},
"jest": {
"moduleNameMapper": {
"\\.(scss)$": "<rootDir>/__mocks__/styleMock.js"
},
"globals": {
"ts-jest": {
"tsConfig": "./src/tsconfig.json"
Expand Down
39 changes: 39 additions & 0 deletions webapp/src/widgets/propertyMenu.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import React from 'react'
import {render} from '@testing-library/react'
import '@testing-library/jest-dom'
import {IntlProvider} from 'react-intl'

import PropertyMenu from './propertyMenu'

describe('widgets/PropertyMenu', () => {
beforeEach(() => {
// Quick fix to disregard console error when unmounting a component
console.error = jest.fn()
document.execCommand = jest.fn()
})

test('should display the type of property', () => {
const rootPortalDiv = document.createElement('div')
rootPortalDiv.id = 'root-portal'
const callback = jest.fn()

const {getByText} = render(
<IntlProvider locale='en'>
<PropertyMenu
propertyId={'id'}
propertyName={'email of a person'}
propertyType={'email'}
onTypeChanged={callback}
onNameChanged={callback}
onDelete={callback}
/>
</IntlProvider>,
{container: document.body.appendChild(rootPortalDiv)},
)

expect(getByText('Type: Email')).toBeVisible()
})
})
4 changes: 2 additions & 2 deletions website/site/content/download/personal-edition/ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Popular hosted options include:

## Install Focalboard

[Download the Ubuntu archive package](https://releases.mattermost.com/focalboard/0.5.0/focalboard-server-linux-amd64.tar.gz), then unpack it to /opt/focalboard:
Download the Ubuntu archive package from the appropriate [release in GitHub](https://github.com/mattermost/focalboard/releases). E.g. this is the link for v0.6.1:

```
wget https://releases.mattermost.com/focalboard/0.5.0/focalboard-server-linux-amd64.tar.gz
wget https://github.com/mattermost/focalboard/releases/download/v0.6.1/focalboard-server-linux-amd64.tar.gz
tar -xvzf focalboard-server-linux-amd64.tar.gz
sudo mv focalboard /opt
```
Expand Down