diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml index 9c9924c745..09787166c6 100644 --- a/.github/workflows/build-desktop-release.yml +++ b/.github/workflows/build-desktop-release.yml @@ -640,7 +640,7 @@ jobs: ./*.apk release: - # NOTE: For now, we only have beta channel to be released on Github + # NOTE: For now, we only have beta channel to be released on GitHub if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.build-target == 'beta' }} needs: [ build-macos-x64, build-macos-arm64, build-linux-x64, build-linux-arm64, build-windows-x64, build-windows-arm64] runs-on: ubuntu-22.04 diff --git a/README.md b/README.md index 4f29c2e054..7b27b515c1 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ The DB version is in beta status while the new mobile app and RTC is in alpha. T To get started with the DB version: * To try the latest web version, go to https://test.logseq.com/. -* To try the latest desktop version, login to Github and go to https://github.com/logseq/logseq/actions/workflows/build-desktop-release.yml and click on the latest release. Scroll to the bottom and under the `Artifacts` section download the artifact for your operating system. +* To try the latest desktop version, login to GitHub and go to https://github.com/logseq/logseq/actions/workflows/build-desktop-release.yml and click on the latest release. Scroll to the bottom and under the `Artifacts` section download the artifact for your operating system. * To try the latest by building from the source code * Use `test/db` for stable releases. Fewer bugs and slower updates. Update frequency: days or weeks. * Use `master` for the latest updates as they are developed. Expect more bugs and faster changes. Update frequency: hours or days. diff --git a/deps/cli/README.md b/deps/cli/README.md index 9226c8635e..28882fd3d2 100644 --- a/deps/cli/README.md +++ b/deps/cli/README.md @@ -1,6 +1,6 @@ ## Description -This library provides a `logseq` CLI for DB graphs created using the [database-version](/README.md#-database-version). By default, the CLI works offline with local graphs. This allows for running commands automatically on CI/CD platforms like Github Actions. Most CLI commands also connect to the current DB graph in a desktop app (a.k.a. in-app graph) if the [HTTP API Server](https://docs.logseq.com/#/page/local%20http%20server) is turned on. +This library provides a `logseq` CLI for DB graphs created using the [database-version](/README.md#-database-version). By default, the CLI works offline with local graphs. This allows for running commands automatically on CI/CD platforms like GitHub Actions. Most CLI commands also connect to the current DB graph in a desktop app (a.k.a. in-app graph) if the [HTTP API Server](https://docs.logseq.com/#/page/local%20http%20server) is turned on. ## Install diff --git a/deps/graph-parser/test/resources/exporter-test-graph/ignored/about.org b/deps/graph-parser/test/resources/exporter-test-graph/ignored/about.org index a94fce6054..7821f7f90f 100644 --- a/deps/graph-parser/test/resources/exporter-test-graph/ignored/about.org +++ b/deps/graph-parser/test/resources/exporter-test-graph/ignored/about.org @@ -17,14 +17,14 @@ Your notes will be stored in the local browser storage. We are using IndexedDB. ** How do I use it? *** 1. Sync between multiple devices - Currently, we only support syncing through Github, more options (e.g. + Currently, we only support syncing through GitHub, more options (e.g. Gitlab, Dropbox, Google Drive, WebDAV, etc.) will be added soon. We are using an excellent web git client called [[https://isomorphic-git.org/][isomorphic-git]]. **** Step 1 - Click the button /Login with Github/. + Click the button /Login with GitHub/. **** Step 2 - Set your Github personal access token, the token will be encrypted and + Set your GitHub personal access token, the token will be encrypted and stored in the browser local storage, our server will never store it. If you know nothing about either Git or the personal access token, no worries, @@ -50,7 +50,7 @@ - Twitter: https://twitter.com/logseq - Discord: https://discord.gg/KpN4eHY where we ask questions and share tips - Website: https://logseq.com/ - - Github: https://github.com/logseq/logseq everyone is encouraged to report issues! + - GitHub: https://github.com/logseq/logseq everyone is encouraged to report issues! - Our blog: https://logseq.com/blog ** Credits to - [[https://roamresearch.com/][Roam Research]] diff --git a/scripts/resources/schemaorg-current-https.json b/scripts/resources/schemaorg-current-https.json index 4b85edbf72..f559dab784 100644 --- a/scripts/resources/schemaorg-current-https.json +++ b/scripts/resources/schemaorg-current-https.json @@ -21807,7 +21807,7 @@ { "@id": "schema:SpecialAnnouncement", "@type": "rdfs:Class", - "rdfs:comment": "A SpecialAnnouncement combines a simple date-stamped textual information update\n with contextualized Web links and other structured data. It represents an information update made by a\n locally-oriented organization, for example schools, pharmacies, healthcare providers, community groups, police,\n local government.\n\nFor work in progress guidelines on Coronavirus-related markup see [this doc](https://docs.google.com/document/d/14ikaGCKxo50rRM7nvKSlbUpjyIk2WMQd3IkB1lItlrM/edit#).\n\nThe motivating scenario for SpecialAnnouncement is the [Coronavirus pandemic](https://en.wikipedia.org/wiki/2019%E2%80%9320_coronavirus_pandemic), and the initial vocabulary is oriented to this urgent situation. Schema.org\nexpect to improve the markup iteratively as it is deployed and as feedback emerges from use. In addition to our\nusual [Github entry](https://github.com/schemaorg/schemaorg/issues/2490), feedback comments can also be provided in [this document](https://docs.google.com/document/d/1fpdFFxk8s87CWwACs53SGkYv3aafSxz_DTtOQxMrBJQ/edit#).\n\n\nWhile this schema is designed to communicate urgent crisis-related information, it is not the same as an emergency warning technology like [CAP](https://en.wikipedia.org/wiki/Common_Alerting_Protocol), although there may be overlaps. The intent is to cover\nthe kinds of everyday practical information being posted to existing websites during an emergency situation.\n\nSeveral kinds of information can be provided:\n\nWe encourage the provision of \"name\", \"text\", \"datePosted\", \"expires\" (if appropriate), \"category\" and\n\"url\" as a simple baseline. It is important to provide a value for \"category\" where possible, most ideally as a well known\nURL from Wikipedia or Wikidata. In the case of the 2019-2020 Coronavirus pandemic, this should be \"https://en.wikipedia.org/w/index.php?title=2019-20\\_coronavirus\\_pandemic\" or \"https://www.wikidata.org/wiki/Q81068910\".\n\nFor many of the possible properties, values can either be simple links or an inline description, depending on whether a summary is available. For a link, provide just the URL of the appropriate page as the property's value. For an inline description, use a [[WebContent]] type, and provide the url as a property of that, alongside at least a simple \"[[text]]\" summary of the page. It is\nunlikely that a single SpecialAnnouncement will need all of the possible properties simultaneously.\n\nWe expect that in many cases the page referenced might contain more specialized structured data, e.g. contact info, [[openingHours]], [[Event]], [[FAQPage]] etc. By linking to those pages from a [[SpecialAnnouncement]] you can help make it clearer that the events are related to the situation (e.g. Coronavirus) indicated by the [[category]] property of the [[SpecialAnnouncement]].\n\nMany [[SpecialAnnouncement]]s will relate to particular regions and to identifiable local organizations. Use [[spatialCoverage]] for the region, and [[announcementLocation]] to indicate specific [[LocalBusiness]]es and [[CivicStructure]]s. If the announcement affects both a particular region and a specific location (for example, a library closure that serves an entire region), use both [[spatialCoverage]] and [[announcementLocation]].\n\nThe [[about]] property can be used to indicate entities that are the focus of the announcement. We now recommend using [[about]] only\nfor representing non-location entities (e.g. a [[Course]] or a [[RadioStation]]). For places, use [[announcementLocation]] and [[spatialCoverage]]. Consumers of this markup should be aware that the initial design encouraged the use of [[about]] for locations too.\n\nThe basic content of [[SpecialAnnouncement]] is similar to that of an [RSS](https://en.wikipedia.org/wiki/RSS) or [Atom](https://en.wikipedia.org/wiki/Atom_(Web_standard)) feed. For publishers without such feeds, basic feed-like information can be shared by posting\n[[SpecialAnnouncement]] updates in a page, e.g. using JSON-LD. For sites with Atom/RSS functionality, you can point to a feed\nwith the [[webFeed]] property. This can be a simple URL, or an inline [[DataFeed]] object, with [[encodingFormat]] providing\nmedia type information, e.g. \"application/rss+xml\" or \"application/atom+xml\".\n", + "rdfs:comment": "A SpecialAnnouncement combines a simple date-stamped textual information update\n with contextualized Web links and other structured data. It represents an information update made by a\n locally-oriented organization, for example schools, pharmacies, healthcare providers, community groups, police,\n local government.\n\nFor work in progress guidelines on Coronavirus-related markup see [this doc](https://docs.google.com/document/d/14ikaGCKxo50rRM7nvKSlbUpjyIk2WMQd3IkB1lItlrM/edit#).\n\nThe motivating scenario for SpecialAnnouncement is the [Coronavirus pandemic](https://en.wikipedia.org/wiki/2019%E2%80%9320_coronavirus_pandemic), and the initial vocabulary is oriented to this urgent situation. Schema.org\nexpect to improve the markup iteratively as it is deployed and as feedback emerges from use. In addition to our\nusual [GitHub entry](https://github.com/schemaorg/schemaorg/issues/2490), feedback comments can also be provided in [this document](https://docs.google.com/document/d/1fpdFFxk8s87CWwACs53SGkYv3aafSxz_DTtOQxMrBJQ/edit#).\n\n\nWhile this schema is designed to communicate urgent crisis-related information, it is not the same as an emergency warning technology like [CAP](https://en.wikipedia.org/wiki/Common_Alerting_Protocol), although there may be overlaps. The intent is to cover\nthe kinds of everyday practical information being posted to existing websites during an emergency situation.\n\nSeveral kinds of information can be provided:\n\nWe encourage the provision of \"name\", \"text\", \"datePosted\", \"expires\" (if appropriate), \"category\" and\n\"url\" as a simple baseline. It is important to provide a value for \"category\" where possible, most ideally as a well known\nURL from Wikipedia or Wikidata. In the case of the 2019-2020 Coronavirus pandemic, this should be \"https://en.wikipedia.org/w/index.php?title=2019-20\\_coronavirus\\_pandemic\" or \"https://www.wikidata.org/wiki/Q81068910\".\n\nFor many of the possible properties, values can either be simple links or an inline description, depending on whether a summary is available. For a link, provide just the URL of the appropriate page as the property's value. For an inline description, use a [[WebContent]] type, and provide the url as a property of that, alongside at least a simple \"[[text]]\" summary of the page. It is\nunlikely that a single SpecialAnnouncement will need all of the possible properties simultaneously.\n\nWe expect that in many cases the page referenced might contain more specialized structured data, e.g. contact info, [[openingHours]], [[Event]], [[FAQPage]] etc. By linking to those pages from a [[SpecialAnnouncement]] you can help make it clearer that the events are related to the situation (e.g. Coronavirus) indicated by the [[category]] property of the [[SpecialAnnouncement]].\n\nMany [[SpecialAnnouncement]]s will relate to particular regions and to identifiable local organizations. Use [[spatialCoverage]] for the region, and [[announcementLocation]] to indicate specific [[LocalBusiness]]es and [[CivicStructure]]s. If the announcement affects both a particular region and a specific location (for example, a library closure that serves an entire region), use both [[spatialCoverage]] and [[announcementLocation]].\n\nThe [[about]] property can be used to indicate entities that are the focus of the announcement. We now recommend using [[about]] only\nfor representing non-location entities (e.g. a [[Course]] or a [[RadioStation]]). For places, use [[announcementLocation]] and [[spatialCoverage]]. Consumers of this markup should be aware that the initial design encouraged the use of [[about]] for locations too.\n\nThe basic content of [[SpecialAnnouncement]] is similar to that of an [RSS](https://en.wikipedia.org/wiki/RSS) or [Atom](https://en.wikipedia.org/wiki/Atom_(Web_standard)) feed. For publishers without such feeds, basic feed-like information can be shared by posting\n[[SpecialAnnouncement]] updates in a page, e.g. using JSON-LD. For sites with Atom/RSS functionality, you can point to a feed\nwith the [[webFeed]] property. This can be a simple URL, or an inline [[DataFeed]] object, with [[encodingFormat]] providing\nmedia type information, e.g. \"application/rss+xml\" or \"application/atom+xml\".\n", "rdfs:label": "SpecialAnnouncement", "rdfs:subClassOf": { "@id": "schema:CreativeWork" diff --git a/src/electron/electron/plugin.cljs b/src/electron/electron/plugin.cljs index 96fe4860bf..7cae8f8f57 100644 --- a/src/electron/electron/plugin.cljs +++ b/src/electron/electron/plugin.cljs @@ -57,7 +57,7 @@ endpoint (api url-suffix) ^js res (fetch endpoint {:timeout (* 1000 5)}) illegal-text (when-not (= 200 (.-status res)) (.text res)) - _ (when-not (string/blank? illegal-text) (throw (js/Error. (str "Github API Failed(" (.-status res) ") " illegal-text)))) + _ (when-not (string/blank? illegal-text) (throw (js/Error. (str "GitHub API Failed(" (.-status res) ") " illegal-text)))) _ (debug "Release latest:" endpoint ":status" (.-status res)) res (response-transform res) res (.json res) @@ -184,7 +184,7 @@ includes the following keys: * :only-check - When set to true, this only fetches the latest version without installing * :plugin-action - When set to 'install', installs the specific :version given -* :repo - A Github repo, not a logseq repo, e.g. user/repo" +* :repo - A GitHub repo, not a logseq repo, e.g. user/repo" [{:keys [version repo only-check plugin-action] :as item}] (if repo (let [action (keyword plugin-action) diff --git a/src/main/frontend/components/plugins.cljs b/src/main/frontend/components/plugins.cljs index 370ebb9ee1..75ae863187 100644 --- a/src/main/frontend/components/plugins.cljs +++ b/src/main/frontend/components/plugins.cljs @@ -365,7 +365,7 @@ (util/copy-to-clipboard! id))} (str "ID: " id)]]] - ;; Github repo + ;; GitHub repo [:div.flag.is-top.flex.items-center.space-x-2 (cond (false? (:supportsDB item)) diff --git a/src/main/frontend/handler/plugin.cljs b/src/main/frontend/handler/plugin.cljs index b10fd970b3..88338e2916 100644 --- a/src/main/frontend/handler/plugin.cljs +++ b/src/main/frontend/handler/plugin.cljs @@ -845,7 +845,7 @@ (when auto-checking? (set-auto-checking! false)) (when (or auto-checking? (not user-checking?)) - ;; TODO: too many requests may be limited by Github api + ;; TODO: too many requests may be limited by GitHub api (when-let [plugins (seq (take 32 (state/get-enabled?-installed-plugins theme?)))] (->> plugins (map (fn [v] [(keyword (:id v)) v]))