Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
louis-ev committed Dec 18, 2024
2 parents 0db80f3 + 5b4e01b commit b139b50
Show file tree
Hide file tree
Showing 494 changed files with 16,911 additions and 15,834 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.9.0
v20.18.1
18 changes: 10 additions & 8 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
// Pointez pour afficher la description des attributs existants.
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"name": "Debug Main Process",
"type": "node",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
},
"args": ["."],
"outputCapture": "std"
}
]
}
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ The font [Belle Allure](https://www.jeanboyault.fr/belle-allure/) is used with p

# Branches

- **main** --> default branch, latest stable version (currently v10), in Electron (offline app). See release page for Linux/Mac/Windows installers.
- **main** --> default branch, latest stable version (currently v11), in Electron (offline app). See release page for Linux/Mac/Windows installers.
- **main-node** --> latest stable version without Electron, to use on online servers.

- **main-dev** --> fixes and small improvements on top of the current version, in Electron. Used for testing before merging changes to **main**.
- **main-dev-node** --> fixes and small improvements on top of the current version, for servers. Used for testing before merging changes to - **main-node**.

- **next** --> code for the next major version (v10.1 or v11), in Electron. Use at your own risks.
- **next** --> code for the next major version (v11), in Electron. Use at your own risks.
- **next-node** --> code for the next major version, without Electron. Use at your own risks.

# Install do•doc
Expand Down Expand Up @@ -66,7 +66,7 @@ Default values are:
- $preview (String, editable) if set, search for a meta filename in this folder and read it when reading folder (useful for advanced cover of this folder)
- $date_created (Date) when the folder was created
- $date_modified (Date) when the folder was last edited
- $files (Array) list of all the files in this folder (see Files below)
- $files (Array) list of all the files in this folder (see Files below) (bypass with no_files=true to improve performance where files are not needed)
- $status (String, editable) determines whether the folder gets listed
- $public (Boolean, editable) if true, return that folder, its files, and its source medias even when request is not auth
- $password (String, editable, stored as hash) limit editing to users with password
Expand Down
2 changes: 1 addition & 1 deletion client/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.9.0
v20.18.1
1 change: 1 addition & 0 deletions client/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports = {
presets: ["@vue/cli-plugin-babel/preset"],
plugins: ["@babel/plugin-transform-private-methods"],
};
21 changes: 0 additions & 21 deletions client/dist/bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion client/dist/bundle.js.map

This file was deleted.

8 changes: 0 additions & 8 deletions client/dist/context-filter-polyfill.min.js

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed client/dist/fonts/archivo/archivo-v16-latin-700.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion client/dist/fonts/belle-allure/info.txt

This file was deleted.

Loading

0 comments on commit b139b50

Please sign in to comment.