mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			v0.41.3-be
			...
			v0.41.4-be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					98bbd17920 | ||
| 
						 | 
					dadcc93ae3 | ||
| 
						 | 
					48e19d0149 | 
@@ -12,7 +12,7 @@ echo "Copying required linux-x64 binaries"
 | 
			
		||||
rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
 | 
			
		||||
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
 | 
			
		||||
 | 
			
		||||
rm -r $SRC_DIR/src/public/dist/*.mobile.*
 | 
			
		||||
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
			
		||||
 | 
			
		||||
cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
 | 
			
		||||
cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
 | 
			
		||||
cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
 | 
			
		||||
cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
 | 
			
		||||
 | 
			
		||||
rm -r $SRC_DIR/src/public/dist/*.mobile.*
 | 
			
		||||
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
			
		||||
 | 
			
		||||
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
 | 
			
		||||
cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
 | 
			
		||||
cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
 | 
			
		||||
 | 
			
		||||
rm -r $SRC_DIR/src/public/dist/*.mobile.*
 | 
			
		||||
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
			
		||||
 | 
			
		||||
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
For bug reports, please mention **version of the application** and include **log files** from following location:
 | 
			
		||||
For bug reports, **PLEASE mention version of Trilium you're using** and also include **log files** from following location:
 | 
			
		||||
 | 
			
		||||
* `/home/[user]/.local/share/trilium-data/log` for Linux
 | 
			
		||||
* `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "trilium",
 | 
			
		||||
  "version": "0.41.2-beta",
 | 
			
		||||
  "version": "0.41.3-beta",
 | 
			
		||||
  "lockfileVersion": 1,
 | 
			
		||||
  "requires": true,
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
@@ -1416,9 +1416,9 @@
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "async-mutex": {
 | 
			
		||||
      "version": "0.2.1",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.1.tgz",
 | 
			
		||||
      "integrity": "sha512-8GAyGD9/Fr4TgMigfCAXsyjvPturIqHDDw7Mim6DtNRbwxY2ul/D4b4CF1qjaMvomd/SJs/8EM23M+RGDEpaKA==",
 | 
			
		||||
      "version": "0.2.2",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.2.tgz",
 | 
			
		||||
      "integrity": "sha512-L1wZNK83y16khj/Fqezy+FfOp5KuywxypF/C2aYfAN3NOMLYdAVKRk3UDklqv+ngX+O+tNSEkPX+FxprxELsMA==",
 | 
			
		||||
      "requires": {
 | 
			
		||||
        "tslib": "^1.11.1"
 | 
			
		||||
      }
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
  "name": "trilium",
 | 
			
		||||
  "productName": "Trilium Notes",
 | 
			
		||||
  "description": "Trilium Notes",
 | 
			
		||||
  "version": "0.41.3-beta",
 | 
			
		||||
  "version": "0.41.4-beta",
 | 
			
		||||
  "license": "AGPL-3.0-only",
 | 
			
		||||
  "main": "electron.js",
 | 
			
		||||
  "bin": {
 | 
			
		||||
@@ -21,7 +21,7 @@
 | 
			
		||||
    "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js"
 | 
			
		||||
  },
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "async-mutex": "0.2.1",
 | 
			
		||||
    "async-mutex": "0.2.2",
 | 
			
		||||
    "axios": "0.19.2",
 | 
			
		||||
    "body-parser": "1.19.0",
 | 
			
		||||
    "cls-hooked": "4.2.2",
 | 
			
		||||
 
 | 
			
		||||
@@ -42,6 +42,8 @@ export default class MainTreeExecutors extends Component {
 | 
			
		||||
        await ws.waitForMaxKnownSyncId();
 | 
			
		||||
 | 
			
		||||
        appContext.tabManager.getActiveTabContext().setNote(note.noteId);
 | 
			
		||||
 | 
			
		||||
        appContext.triggerCommand('focusAndSelectTitle');
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    async createNoteAfterCommand() {
 | 
			
		||||
@@ -63,5 +65,7 @@ export default class MainTreeExecutors extends Component {
 | 
			
		||||
        await ws.waitForMaxKnownSyncId();
 | 
			
		||||
 | 
			
		||||
        appContext.tabManager.getActiveTabContext().setNote(note.noteId);
 | 
			
		||||
 | 
			
		||||
        appContext.triggerCommand('focusAndSelectTitle');
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
module.exports = { buildDate:"2020-04-14T22:19:56+02:00", buildRevision: "61167f664644a60d207e7d2d8a0c3bedd2543397" };
 | 
			
		||||
module.exports = { buildDate:"2020-04-15T23:00:13+02:00", buildRevision: "dadcc93ae37fc03918837630c0a5a27a69af3495" };
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ module.exports = {
 | 
			
		||||
        mobile: './src/public/app/desktop.js',
 | 
			
		||||
    },
 | 
			
		||||
    output: {
 | 
			
		||||
        publicPath: 'dist/',
 | 
			
		||||
        publicPath: 'app-dist/',
 | 
			
		||||
        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
			
		||||
        filename: 'desktop.js'
 | 
			
		||||
    },
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ module.exports = {
 | 
			
		||||
        mobile: './src/public/app/mobile.js',
 | 
			
		||||
    },
 | 
			
		||||
    output: {
 | 
			
		||||
        publicPath: '/dist/',
 | 
			
		||||
        publicPath: 'app-dist/',
 | 
			
		||||
        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
			
		||||
        filename: 'mobile.js'
 | 
			
		||||
    },
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ module.exports = {
 | 
			
		||||
        mobile: './src/public/app/setup.js',
 | 
			
		||||
    },
 | 
			
		||||
    output: {
 | 
			
		||||
        publicPath: '/dist/',
 | 
			
		||||
        publicPath: 'app-dist/',
 | 
			
		||||
        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
			
		||||
        filename: 'setup.js'
 | 
			
		||||
    },
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user