1
0
mirror of https://github.com/mattermost/focalboard.git synced 2025-10-31 00:17:42 +02:00

Merge release-0.6.7

This commit is contained in:
Chen-I Lim
2021-05-24 09:59:30 -07:00
parent 2d542bbd30
commit 4c3f14e027
9 changed files with 247 additions and 37 deletions

View File

@@ -17,6 +17,9 @@ This changelog summarizes updates to our open source project. You can also find
* Improved board sorting without leading emoji. Thanks @Johennes!
* Added Prettier linting for SCSS. Thanks @signalwerk!
* Improved table headers. Thanks @sbishel!
* Disable unused Mac tab menu. Thanks @@haardikdharma10!
* Fixed server lint issues. Thanks @harshilsharma63!
* Updated open button. Thanks @arjitc!
## v0.6.5 Release - April 19, 2021

View File

@@ -468,6 +468,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = HFP57A3MYB;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Focalboard/Info.plist;
@@ -491,6 +492,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = HFP57A3MYB;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Focalboard/Info.plist;

View File

@@ -37,7 +37,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
private func showWhatsNewDialogIfNeeded() {
if Globals.currentWhatsNewVersion < Globals.WhatsNewVersion {
if Globals.currentWhatsNewVersion > 0 && Globals.currentWhatsNewVersion < Globals.WhatsNewVersion {
Globals.currentWhatsNewVersion = Globals.WhatsNewVersion
showWhatsNew(self)
}

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<plugIn identifier="com.apple.WebKit2IBPlugin" version="17506"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
<plugIn identifier="com.apple.WebKit2IBPlugin" version="17701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -717,20 +717,20 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="baY-7A-lBA">
<rect key="frame" x="20" y="54" width="574" height="418"/>
<rect key="frame" x="20" y="55" width="574" height="417"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="qB2-dj-jVl">
<rect key="frame" x="0.0" y="0.0" width="574" height="418"/>
<rect key="frame" x="0.0" y="0.0" width="559" height="417"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView editable="NO" importsGraphics="NO" verticallyResizable="YES" smartInsertDelete="YES" id="f3s-Q5-6IG">
<rect key="frame" x="0.0" y="0.0" width="574" height="418"/>
<rect key="frame" x="0.0" y="0.0" width="559" height="417"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="574" height="418"/>
<size key="minSize" width="559" height="417"/>
<size key="maxSize" width="636" height="10000000"/>
<attributedString key="textStorage">
<fragment content="Welcome to Focalboard v0.6.5!">
<fragment content="Welcome to Focalboard v0.6.7!">
<attributes>
<color key="NSColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="18" name="Helvetica-Bold"/>
@@ -826,26 +826,213 @@ Cg
</attributes>
</fragment>
<fragment>
<mutableString key="content">
Thanks to the help of many wonderful contributors, there are a number of new languages and features:
* Added German language translation. Thanks @svelle!
* Added Japanese language translation. Thanks @kaakaa!
* Added French language translation. Thanks @CyrilLD!
* Added Occitan language translation. Thanks Quentin PAGÈS!
* Added Dutch language translation. Thanks Tom De Moor!
* Added Turkish language translation. Thanks Abdullah Musab!
* Added Chinese language translation. Thanks Yao Xie and toto6038!
* Added Russian language translation. Thanks Edward Smirnov!
* Added Gallery view.
* Added Checkbox content type.
<string key="content">
Thank you contributors! There are a number of new features and improvements in this release:
* Added URL and phone number properties. Thanks @BharatKalluri!
* Persist Mac app settings. Thanks @Johennes!
</string>
<attributes>
<color key="NSColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Helvetica"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO">
<tabStops>
<textTab alignment="left" location="36">
<options/>
</textTab>
<textTab alignment="left" location="72">
<options/>
</textTab>
<textTab alignment="left" location="108">
<options/>
</textTab>
<textTab alignment="left" location="144">
<options/>
</textTab>
<textTab alignment="left" location="180">
<options/>
</textTab>
<textTab alignment="left" location="216">
<options/>
</textTab>
<textTab alignment="left" location="252">
<options/>
</textTab>
<textTab alignment="left" location="288">
<options/>
</textTab>
<textTab alignment="left" location="324">
<options/>
</textTab>
<textTab alignment="left" location="360">
<options/>
</textTab>
<textTab alignment="left" location="396">
<options/>
</textTab>
<textTab alignment="left" location="432">
<options/>
</textTab>
</tabStops>
</paragraphStyle>
</attributes>
</fragment>
<fragment>
<string key="content"> * Disable unused Mac tab menu. Thanks @@haardikdharma10!
</string>
<attributes>
<color key="NSColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Helvetica"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO">
<tabStops>
<textTab alignment="left" location="36">
<options/>
</textTab>
<textTab alignment="left" location="72">
<options/>
</textTab>
<textTab alignment="left" location="108">
<options/>
</textTab>
<textTab alignment="left" location="144">
<options/>
</textTab>
<textTab alignment="left" location="180">
<options/>
</textTab>
<textTab alignment="left" location="216">
<options/>
</textTab>
<textTab alignment="left" location="252">
<options/>
</textTab>
<textTab alignment="left" location="288">
<options/>
</textTab>
<textTab alignment="left" location="324">
<options/>
</textTab>
<textTab alignment="left" location="360">
<options/>
</textTab>
<textTab alignment="left" location="396">
<options/>
</textTab>
<textTab alignment="left" location="432">
<options/>
</textTab>
</tabStops>
</paragraphStyle>
</attributes>
</fragment>
<fragment>
<string key="content"> * Improved board sorting without leading emoji. Thanks @Johennes!
* Improved table headers. Thanks @sbishel!
* Updated open button. Thanks @arjitc!
</string>
<attributes>
<color key="NSColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Helvetica"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO">
<tabStops>
<textTab alignment="left" location="36">
<options/>
</textTab>
<textTab alignment="left" location="72">
<options/>
</textTab>
<textTab alignment="left" location="108">
<options/>
</textTab>
<textTab alignment="left" location="144">
<options/>
</textTab>
<textTab alignment="left" location="180">
<options/>
</textTab>
<textTab alignment="left" location="216">
<options/>
</textTab>
<textTab alignment="left" location="252">
<options/>
</textTab>
<textTab alignment="left" location="288">
<options/>
</textTab>
<textTab alignment="left" location="324">
<options/>
</textTab>
<textTab alignment="left" location="360">
<options/>
</textTab>
<textTab alignment="left" location="396">
<options/>
</textTab>
<textTab alignment="left" location="432">
<options/>
</textTab>
</tabStops>
</paragraphStyle>
</attributes>
</fragment>
<fragment>
<string key="content"> * Added documentation for share board. Thanks @haardikdharma10!
* Added Todoist import script. Thanks @harshilsharma63!
* Added Prettier linting for SCSS. Thanks @signalwerk!
</string>
<attributes>
<color key="NSColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Helvetica"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO">
<tabStops>
<textTab alignment="left" location="36">
<options/>
</textTab>
<textTab alignment="left" location="72">
<options/>
</textTab>
<textTab alignment="left" location="108">
<options/>
</textTab>
<textTab alignment="left" location="144">
<options/>
</textTab>
<textTab alignment="left" location="180">
<options/>
</textTab>
<textTab alignment="left" location="216">
<options/>
</textTab>
<textTab alignment="left" location="252">
<options/>
</textTab>
<textTab alignment="left" location="288">
<options/>
</textTab>
<textTab alignment="left" location="324">
<options/>
</textTab>
<textTab alignment="left" location="360">
<options/>
</textTab>
<textTab alignment="left" location="396">
<options/>
</textTab>
<textTab alignment="left" location="432">
<options/>
</textTab>
</tabStops>
</paragraphStyle>
</attributes>
</fragment>
<fragment>
<string key="content">
If you like what you see, please consider taking a moment to rate this version in the App Store. Your positive ratings make a real difference for us.
Thanks so much,
-- The Focalboard developers and community
</mutableString>
</string>
<attributes>
<color key="NSColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Helvetica"/>
@@ -901,12 +1088,12 @@ Thanks so much,
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="7bj-hR-AiH">
<rect key="frame" x="558" y="0.0" width="16" height="418"/>
<rect key="frame" x="559" y="0.0" width="15" height="417"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eyp-ee-dxf">
<rect key="frame" x="7" y="7" width="289" height="32"/>
<rect key="frame" x="8" y="7" width="287" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="275" id="Zzi-QI-UrX"/>
</constraints>
@@ -919,7 +1106,7 @@ Thanks so much,
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dYB-Yp-UHf">
<rect key="frame" x="500" y="7" width="89" height="32"/>
<rect key="frame" x="501" y="7" width="87" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="75" id="vxR-kQ-YQg"/>
</constraints>

View File

@@ -4,8 +4,8 @@
import Foundation
class Globals {
static let ProductVersion = 00605
static let WhatsNewVersion = 00605
static let ProductVersion = 00607
static let WhatsNewVersion = 00607
static var currentWhatsNewVersion: Int {
get { return UserDefaults.standard.integer(forKey: "whatsNewVersion") }

View File

@@ -19,13 +19,15 @@
<key>CFBundleShortVersionString</key>
<string>0.6.7</string>
<key>CFBundleVersion</key>
<string>12</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSFileQuarantineEnabled</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
@@ -37,7 +39,5 @@
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>LSFileQuarantineEnabled</key>
<true/>
</dict>
</plist>

View File

@@ -10,6 +10,7 @@ class ViewController:
WKNavigationDelegate,
WKScriptMessageHandler {
@IBOutlet var webView: WKWebView!
private var didLoad = false
private var refreshWebViewOnLoad = true
override func viewDidLoad() {
@@ -123,6 +124,7 @@ class ViewController:
}
private func loadHomepage() {
NSLog("loadHomepage")
let appDelegate = NSApplication.shared.delegate as! AppDelegate
let port = appDelegate.serverPort
let url = URL(string: "http://localhost:\(port)/")!
@@ -223,6 +225,7 @@ class ViewController:
// Disable right-click menu
webView.evaluateJavaScript("document.body.setAttribute('oncontextmenu', 'event.preventDefault();');", completionHandler: nil)
webView.isHidden = false
didLoad = true
// HACKHACK: Fix WebView initial rendering artifacts
if (refreshWebViewOnLoad) {
@@ -242,6 +245,16 @@ class ViewController:
self.webView.frame = frame
}
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
NSLog("webView didFailProvisionalNavigation, error: \(error.localizedDescription)")
if (!didLoad) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.updateSessionTokenAndUserSettings()
self.loadHomepage()
}
}
}
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
webView.isHidden = false
}

View File

@@ -215,7 +215,8 @@ func (s *SQLStore) GetAllBlocks(c store.Container) ([]model.Block, error) {
"update_at",
"delete_at",
).
From(s.tablePrefix + "blocks")
From(s.tablePrefix + "blocks").
Where(sq.Eq{"coalesce(workspace_id, '0')": c.WorkspaceID})
rows, err := query.Query()
if err != nil {

View File

@@ -35,7 +35,11 @@ function importUserSettings(json: string): boolean {
return false
}
for (const [key, value] of Object.entries(settings)) {
localStorage.setItem(key, value as string)
if (value) {
localStorage.setItem(key, value as string)
} else {
localStorage.removeItem(key)
}
}
return true
}