Skip to content

Commit

Permalink
Merge dev/v2.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jcv8000 authored Feb 22, 2025
2 parents 5264e1e + e34dbb0 commit 94b2ec3
Show file tree
Hide file tree
Showing 19 changed files with 10,814 additions and 6,667 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
version: 10

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: "pnpm"

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
version: 10

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: "pnpm"

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
version: 10

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: "pnpm"

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
version: 10

- name: Install node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: "pnpm"

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Creative Commons Corporation (“Creative Commons”) is not a law firm and does

Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.

- **Considerations for licensors:** Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
- **Considerations for licensors:** Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).

- **Considerations for the public:** By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
- **Considerations for the public:** By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).

## Creative Commons Attribution-NonCommercial 4.0 International Public License

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Codex is a note-taking app that allows you to save **styled and highlighted code

Other features:

- Support for highlighting 190+ programming languages
- Over 240 code themes
- Sort your notes into nestable notebooks/folders, customizable icons for notebooks and pages
- KaTeX math expressions
- PDF and Markdown exporting
- Support for highlighting 190+ programming languages
- Over 240 code themes
- Sort your notes into nestable notebooks/folders, customizable icons for notebooks and pages
- KaTeX math expressions
- PDF and Markdown exporting

## Screenshot

Expand Down
32 changes: 23 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"type": "module",
"main": ".vite/index.cjs",
"version": "2.0.4",
"version": "2.0.5",
"description": "Note-taking app for programmers and CS students",
"author": {
"name": "Josh Vickery",
Expand All @@ -23,7 +23,7 @@
"typecheck": "tsc && tsc -p packages/renderer/tsconfig.json"
},
"dependencies": {
"@electron/remote": "^2.1.1",
"@electron/remote": "^2.1.2",
"@emotion/react": "^11.11.3",
"@lukeed/uuid": "^2.0.1",
"@mantine/core": "^6.0.21",
Expand Down Expand Up @@ -69,9 +69,9 @@
"electron-log": "^4.4.8",
"fuse.js": "^7.0.0",
"highlight.js": "^11.9.0",
"katex": "^0.16.9",
"katex": "^0.16.21",
"lowlight": "^3.1.0",
"mathlive": "^0.95.5",
"mathlive": "^0.104.0",
"palettey": "^1.0.4",
"react-lowlight": "^3.0.0",
"sanitize-filename": "^1.6.3",
Expand All @@ -83,16 +83,16 @@
"@types/color": "^3.0.6",
"@types/d3": "^7.4.3",
"@types/katex": "^0.16.7",
"@types/node": "^18.19.4",
"@types/node": "^20.17.19",
"@types/react": "^18.2.46",
"@types/react-dom": "^18.2.18",
"@types/semver": "^7.5.6",
"@types/validator": "^13.11.7",
"@typescript-eslint/eslint-plugin": "^6.17.0",
"@typescript-eslint/parser": "^6.17.0",
"@vitejs/plugin-react": "^4.2.1",
"electron": "^26.6.3",
"electron-builder": "^24.9.1",
"electron": "^32.3.1",
"electron-builder": "^24.13.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.33.2",
Expand All @@ -104,9 +104,23 @@
"rimraf": "^5.0.5",
"sass": "^1.69.7",
"typescript": "^5.3.3",
"vite": "^5.0.10",
"vite": "^5.4.14",
"vite-plugin-static-copy": "^1.0.0",
"vite-tsconfig-paths": "^4.2.3",
"wait-on": "^7.2.0"
"wait-on": "^8.0.2"
},
"pnpm": {
"overrides": {
"braces": "3.0.3",
"palettey>nanoid": "3.3.8",
"cross-spawn": "7.0.5",
"tar": "6.2.1",
"ejs": "3.1.10",
"micromatch": "4.0.8"
},
"onlyBuiltDependencies": [
"electron",
"esbuild"
]
}
}
Loading

0 comments on commit 94b2ec3

Please sign in to comment.