diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 1e435010f41..b9ef3071bcd 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -41,4 +41,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: ghcr.io/${{ github.repository_owner }}/logseq-webapp:latest + tags: ghcr.io/bad3r/logseq-webapp:testing diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 632ae35ca41..897d7b806ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Checkout Actions Repository uses: actions/checkout@v3 - name: Check spelling with custom config file - uses: crate-ci/typos@v1.13.10 + uses: crate-ci/typos@v1.16.8 with: config: ./typos.toml diff --git a/Dockerfile b/Dockerfile index 3073f34a01b..909e80bc275 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | \ WORKDIR /data # build Logseq static resources -RUN git clone -b master https://github.com/logseq/logseq.git . +RUN git clone -b test-fs-wrt-time https://github.com/bad3r/logseq-dev.git . RUN yarn config set network-timeout 240000 -g && yarn install diff --git a/android/app/build.gradle b/android/app/build.gradle index 5fd52493787..ceb2fb2ab41 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.logseq.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 66 - versionName "0.9.13" + versionCode 70 + versionName "0.9.17" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/capacitor.config.ts b/capacitor.config.ts index 75796ce6c02..64f582da2d8 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -8,6 +8,7 @@ const config: CapacitorConfig = { appName: 'Logseq', bundledWebRuntime: false, webDir: 'public', + loggingBehavior: 'debug', plugins: { SplashScreen: { launchShowDuration: 500, diff --git a/deps/common/src/logseq/common/path.cljs b/deps/common/src/logseq/common/path.cljs index 8553ef6dce1..9f44352aa5c 100644 --- a/deps/common/src/logseq/common/path.cljs +++ b/deps/common/src/logseq/common/path.cljs @@ -294,7 +294,7 @@ ;; compat (defn basename [path] - (let [path (string/replace path #"/$" "")] + (let [path (string/replace path #"/+$" "")] (filename path))) (defn dirname diff --git a/deps/shui/src/logseq/shui/context.cljs b/deps/shui/src/logseq/shui/context.cljs index fd3bbafe8c6..d72e465cecb 100644 --- a/deps/shui/src/logseq/shui/context.cljs +++ b/deps/shui/src/logseq/shui/context.cljs @@ -14,9 +14,9 @@ :config app-config ;; Until components are converted over, they need to fallback to the old inline function ;; Wrap the old inline function to allow for interception, but fallback to the old inline function - :inline-block (inline->inline-block inline block-config) + :inline-block (inline->inline-block inline block-config) :map-inline-block (inline->map-inline-block inline block-config) - ;; Currently frontend component are provided an object map containin at least the following keys: + ;; Currently frontend component are provided an object map containing at least the following keys: ;; These will be passed through in a whitelisted fashion so as to be able to track the dependencies ;; back to the core application ;; TODO: document the following @@ -24,7 +24,7 @@ :block? (:block? block-config) :blocks-container-id (:blocks-container-id block-config) :editor-box (:editor-box block-config) - :id (:id block-config) + :id (:id block-config) :mode? (:mode? block-config) :query-result (:query-result block-config) :sidebar? (:sidebar? block-config) diff --git a/docs/Build LogSeq Desktop for windows on Ubuntu.md b/docs/Build LogSeq Desktop for windows on Ubuntu.md index 8e504839976..3b24e9f738f 100644 --- a/docs/Build LogSeq Desktop for windows on Ubuntu.md +++ b/docs/Build LogSeq Desktop for windows on Ubuntu.md @@ -1,7 +1,7 @@ # Building Logseq Desktop app for Windows on Ubuntu ## Intro My Logseq dev machine is on Ubuntu 18.x and my production machine is running Windows 10, I needed a way to compile the Logseq desktop APP for Windows. -I tired & failed to make the "build" run on my windows machine but I did, however, succeed in letting my Ubuntu machine make Windows x64 files +I tried & failed to make the "build" run on my windows machine but I did, however, succeed in letting my Ubuntu machine make Windows x64 files ## Pre-requisites These are the steps I took to make it work on my Ubuntu machine, sharing them hoping it helps someone else. I assume you have all the basic pre-requisites for Logseq, if not you can find them at https://github.com/logseq/logseq#1-requirements 1. clone Logseq repo if you haven't already diff --git a/docs/accessibility.md b/docs/accessibility.md index 11cc086ec73..31d52aaa071 100644 --- a/docs/accessibility.md +++ b/docs/accessibility.md @@ -1,4 +1,4 @@ -- Accessibility is a vague term, which is why it is usually misunderstood. It is not just about people with with specific disabilities. You can read more about [what is accessibility](https://developer.mozilla.org/en-US/docs/Learn/Accessibility/What_is_accessibility#so_what_is_accessibility) and [diverse abilities and barriers](https://www.w3.org/WAI/people-use-web/abilities-barriers/). +- Accessibility is a vague term, which is why it is usually misunderstood. It is not just about people with specific disabilities. You can read more about [what is accessibility](https://developer.mozilla.org/en-US/docs/Learn/Accessibility/What_is_accessibility#so_what_is_accessibility) and [diverse abilities and barriers](https://www.w3.org/WAI/people-use-web/abilities-barriers/). - ## Web Content Accessibility Guidelines - [WCAG](https://www.w3.org/WAI/standards-guidelines/wcag/) (Web Content Accessibility Guidelines) is the international standard for web content accessibility, developed by [W3C](https://www.w3.org/). Logseq is a web application, so conforming with WCAG should be our first priority. In general, there is no simple way to determine if a website is accessible or not, but WCAG can help us make the tool usable by as many people as possible. - ## Levels of conformance @@ -6,7 +6,7 @@ - Level **A** is the minimum level. - Level **AA** includes all Level A and AA requirements. - Level **AAA** includes all Level A, AA, and AAA requirements. - - Many organizations strive to meet Level AA. The reason behind this decision, is that in some cases AAA standard is too strict. That does't mean that triple-A issues should be disregarded. On the contrary, all of them should be handled if possible. + - Many organizations strive to meet Level AA. The reason behind this decision, is that in some cases AAA standard is too strict. That doesn't mean that triple-A issues should be disregarded. On the contrary, all of them should be handled if possible. - We can also provide alternative options in order to conform with AAA standards. For instance, our default themes can aim for AA, but we can provide a high-contrast theme that aims for AAA. Providing [alternative versions](https://www.w3.org/WAI/GL/2007/05/alternate-versions.html) with different levels of conformance is permitted according to WCAG, if there is an accessible way to reach those alternatives. - ## Simple development guidelines - Use semantically correct markup whenever possible. Every time you are about to decide which html tag you are going to use, choose the one that behaves the way you want it. For example, let's say you want to create an element that looks like plain text, but triggers an action on click. Usually, the best approach would be to create a `