Skip to content

Commit c8f7c78

Browse files
jbutler992jbutler992
authored
Merge pull request #1 from mattermost/main
update with main
2 parents 1ed5659 + d4b8520 commit c8f7c78

File tree

12 files changed

+92
-145
lines changed

12 files changed

+92
-145
lines changed

‎.github/ISSUE_TEMPLATE/enhancement.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Enhancement / Feature Request
3+
about: Suggest a new capability
4+
title: 'Feature Request: '
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Summary:**
11+
What the new capability is.
12+
13+
**How important this is to me and why:**
14+
15+
Importance: High/Medium/Low
16+
17+
Use cases:
18+
1.
19+
2.
20+
3.
21+
22+
**Additional context / similar features:**
23+
Any examples of good implementations of this capability.

‎Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ FROM ubuntu:latest
22

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

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

‎mac/Focalboard.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
384384
GCC_WARN_UNUSED_FUNCTION = YES;
385385
GCC_WARN_UNUSED_VARIABLE = YES;
386-
MACOSX_DEPLOYMENT_TARGET = 10.15;
386+
MACOSX_DEPLOYMENT_TARGET = 10.14;
387387
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
388388
MTL_FAST_MATH = YES;
389389
ONLY_ACTIVE_ARCH = YES;
@@ -438,7 +438,7 @@
438438
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
439439
GCC_WARN_UNUSED_FUNCTION = YES;
440440
GCC_WARN_UNUSED_VARIABLE = YES;
441-
MACOSX_DEPLOYMENT_TARGET = 10.15;
441+
MACOSX_DEPLOYMENT_TARGET = 10.14;
442442
MTL_ENABLE_DEBUG_INFO = NO;
443443
MTL_FAST_MATH = YES;
444444
SDKROOT = macosx;

‎server/go.mod

+1-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,16 @@ go 1.15
44

55
require (
66
github.com/Masterminds/squirrel v1.4.0
7-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
8-
github.com/go-ldap/ldap v3.0.3+incompatible // indirect
9-
github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
107
github.com/golang-migrate/migrate/v4 v4.13.0
11-
github.com/golang/gddo v0.0.0-20200831202555-721e228c7686 // indirect
128
github.com/golang/mock v1.4.4
139
github.com/google/uuid v1.1.1
1410
github.com/gorilla/mux v1.8.0
1511
github.com/gorilla/websocket v1.4.2
16-
github.com/jteeuwen/go-bindata v3.0.7+incompatible // indirect
12+
github.com/kr/pretty v0.2.0 // indirect
1713
github.com/kr/text v0.2.0 // indirect
1814
github.com/lib/pq v1.8.0
19-
github.com/mattermost/mattermost-server v5.11.1+incompatible
2015
github.com/mattermost/mattermost-server/v5 v5.28.0
2116
github.com/mattn/go-sqlite3 v2.0.3+incompatible
22-
github.com/nicksnyder/go-i18n v1.10.1 // indirect
2317
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
2418
github.com/pkg/errors v0.9.1
2519
github.com/rudderlabs/analytics-go v3.2.1+incompatible
@@ -28,6 +22,5 @@ require (
2822
go.uber.org/zap v1.15.0
2923
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
3024
golang.org/x/tools v0.0.0-20201017001424-6003fad69a88 // indirect
31-
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
3225
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
3326
)

‎server/go.sum

+3-116
Large diffs are not rendered by default.

‎server/server/server.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/google/uuid"
1313
"github.com/gorilla/mux"
14+
"github.com/pkg/errors"
1415
"go.uber.org/zap"
1516

1617
"github.com/mattermost/focalboard/server/api"
@@ -26,11 +27,9 @@ import (
2627
"github.com/mattermost/focalboard/server/services/webhook"
2728
"github.com/mattermost/focalboard/server/web"
2829
"github.com/mattermost/focalboard/server/ws"
29-
"github.com/mattermost/mattermost-server/utils"
3030
"github.com/mattermost/mattermost-server/v5/model"
3131
"github.com/mattermost/mattermost-server/v5/services/filesstore"
32-
33-
"github.com/pkg/errors"
32+
"github.com/mattermost/mattermost-server/v5/utils"
3433
)
3534

3635
type Server struct {

‎webapp/__mocks__/styleMock.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
2+
// See LICENSE.txt for license information.
3+
module.exports = {};

‎webapp/i18n/de.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"BoardCard.delete": "Löschen",
3+
"BoardCard.duplicate": "Duplizieren",
4+
"BoardCard.untitled": "Unbenannt",
5+
"BoardComponent.add-a-group": "+ Hinzufügen einer Gruppe",
6+
"BoardComponent.delete": "Löschen",
7+
"BoardComponent.hide": "Ausblenden",
8+
"BoardComponent.neww": "+ Neu",
9+
"BoardComponent.show": "Anzeigen",
10+
"CardDetail.add-content": "Inhalt hinzufügen",
11+
"CardDetail.new-comment-placeholder": "Kommentar hinzufügen..."
12+
}

‎webapp/i18n/es.json

-11
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,14 @@
66
"BoardComponent.delete": "Borrar",
77
"BoardComponent.hidden-columns": "Columnas Ocultas",
88
"BoardComponent.hide": "Ocultar",
9-
"BoardComponent.loading": "Cargando...",
109
"BoardComponent.neww": "+ Nueva",
1110
"BoardComponent.no-property": "Sin {property}",
1211
"BoardComponent.no-property-title": "Elementos sin la propiedad {property} irán aquí. Esta columna no se puede eliminar.",
1312
"BoardComponent.show": "Mostrar",
1413
"CardDetail.add-content": "Añadir contenido",
1514
"CardDetail.add-icon": "Añadir icono",
1615
"CardDetail.add-property": "+ Añadir propiedad",
17-
"CardDetail.image": "Imagen",
1816
"CardDetail.new-comment-placeholder": "Añadir un comentario...",
19-
"CardDetail.pick-icon": "Escoger Icono",
20-
"CardDetail.random-icon": "Aleatorio",
21-
"CardDetail.remove-icon": "Quitar icono",
22-
"CardDetail.text": "Texto",
2317
"Comment.delete": "Borrar",
2418
"CommentsList.send": "Enviar",
2519
"Filter.includes": "incluye",
@@ -43,7 +37,6 @@
4337
"Sidebar.untitled-board": "(Panel sin titulo)",
4438
"Sidebar.untitled-view": "(Vista sin titulo)",
4539
"TableComponent.add-icon": "Añadir Icono",
46-
"TableComponent.loading": "Cargando...",
4740
"TableComponent.name": "Nombre",
4841
"TableComponent.plus-new": "+ Nueva",
4942
"TableHeaderMenu.delete": "Borrar",
@@ -54,7 +47,6 @@
5447
"TableHeaderMenu.sort-ascending": "Orden ascendente",
5548
"TableHeaderMenu.sort-descending": "Orden descendente",
5649
"TableRow.open": "Abrir",
57-
"ViewHeader.export-board-archive": "Exportar Archivo del Panel",
5850
"ViewHeader.export-csv": "Exportar a CSV",
5951
"ViewHeader.filter": "Filtrar",
6052
"ViewHeader.group-by": "Agrupar por: {property}",
@@ -63,9 +55,6 @@
6355
"ViewHeader.search": "Buscar",
6456
"ViewHeader.search-text": "Texto de búsqueda",
6557
"ViewHeader.sort": "Ordenar",
66-
"ViewHeader.test-add-100-cards": "TEST: Añadir 100 tarjetas",
67-
"ViewHeader.test-add-1000-cards": "TEST: Añadir 1,000 tarjetas",
68-
"ViewHeader.test-randomize-icons": "TEST: Iconos aleatorios",
6958
"ViewTitle.pick-icon": "Escoger Icono",
7059
"ViewTitle.random-icon": "Aleatorio",
7160
"ViewTitle.remove-icon": "Quitar Icono",

‎webapp/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
"react-simplemde-editor": "^4.1.3"
3333
},
3434
"jest": {
35+
"moduleNameMapper": {
36+
"\\.(scss)$": "<rootDir>/__mocks__/styleMock.js"
37+
},
3538
"globals": {
3639
"ts-jest": {
3740
"tsConfig": "./src/tsconfig.json"

‎webapp/src/widgets/propertyMenu.test.tsx

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
2+
// See LICENSE.txt for license information.
3+
4+
import React from 'react'
5+
import {render} from '@testing-library/react'
6+
import '@testing-library/jest-dom'
7+
import {IntlProvider} from 'react-intl'
8+
9+
import PropertyMenu from './propertyMenu'
10+
11+
describe('widgets/PropertyMenu', () => {
12+
beforeEach(() => {
13+
// Quick fix to disregard console error when unmounting a component
14+
console.error = jest.fn()
15+
document.execCommand = jest.fn()
16+
})
17+
18+
test('should display the type of property', () => {
19+
const rootPortalDiv = document.createElement('div')
20+
rootPortalDiv.id = 'root-portal'
21+
const callback = jest.fn()
22+
23+
const {getByText} = render(
24+
<IntlProvider locale='en'>
25+
<PropertyMenu
26+
propertyId={'id'}
27+
propertyName={'email of a person'}
28+
propertyType={'email'}
29+
onTypeChanged={callback}
30+
onNameChanged={callback}
31+
onDelete={callback}
32+
/>
33+
</IntlProvider>,
34+
{container: document.body.appendChild(rootPortalDiv)},
35+
)
36+
37+
expect(getByText('Type: Email')).toBeVisible()
38+
})
39+
})

‎website/site/content/download/personal-edition/ubuntu.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Popular hosted options include:
1717

1818
## Install Focalboard
1919

20-
[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:
20+
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:
2121

2222
```
23-
wget https://releases.mattermost.com/focalboard/0.5.0/focalboard-server-linux-amd64.tar.gz
23+
wget https://github.com/mattermost/focalboard/releases/download/v0.6.1/focalboard-server-linux-amd64.tar.gz
2424
tar -xvzf focalboard-server-linux-amd64.tar.gz
2525
sudo mv focalboard /opt
2626
```

0 commit comments

Comments
 (0)