mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-30 19:19:03 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						793984e8f2
					
				
							
								
								
									
										12
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							| @ -3,6 +3,12 @@ description: Report a bug | |||||||
| title: "(Bug report) " | title: "(Bug report) " | ||||||
| labels: "Type: Bug" | labels: "Type: Bug" | ||||||
| body: | body: | ||||||
|  | - type: textarea | ||||||
|  |   attributes: | ||||||
|  |     label: Description | ||||||
|  |     description: A clear and concise description of the bug and any additional information. | ||||||
|  |   validations: | ||||||
|  |     required: true | ||||||
| - type: input | - type: input | ||||||
|   attributes: |   attributes: | ||||||
|     label: TriliumNext Version |     label: TriliumNext Version | ||||||
| @ -38,12 +44,6 @@ body: | |||||||
|     placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04" |     placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04" | ||||||
|   validations: |   validations: | ||||||
|     required: true |     required: true | ||||||
| - type: textarea |  | ||||||
|   attributes: |  | ||||||
|     label: Description |  | ||||||
|     description: A clear and concise description of the bug and any additional information. |  | ||||||
|   validations: |  | ||||||
|     required: true |  | ||||||
| - type: textarea | - type: textarea | ||||||
|   attributes: |   attributes: | ||||||
|     label: Error logs |     label: Error logs | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										4
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -1,12 +1,12 @@ | |||||||
| { | { | ||||||
|   "name": "trilium", |   "name": "trilium", | ||||||
|   "version": "0.90.11-beta", |   "version": "0.90.12", | ||||||
|   "lockfileVersion": 3, |   "lockfileVersion": 3, | ||||||
|   "requires": true, |   "requires": true, | ||||||
|   "packages": { |   "packages": { | ||||||
|     "": { |     "": { | ||||||
|       "name": "trilium", |       "name": "trilium", | ||||||
|       "version": "0.90.11-beta", |       "version": "0.90.12", | ||||||
|       "license": "AGPL-3.0-only", |       "license": "AGPL-3.0-only", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "@braintree/sanitize-url": "7.1.0", |         "@braintree/sanitize-url": "7.1.0", | ||||||
|  | |||||||
| @ -2,7 +2,7 @@ | |||||||
|   "name": "trilium", |   "name": "trilium", | ||||||
|   "productName": "TriliumNext Notes", |   "productName": "TriliumNext Notes", | ||||||
|   "description": "Build your personal knowledge base with TriliumNext Notes", |   "description": "Build your personal knowledge base with TriliumNext Notes", | ||||||
|   "version": "0.90.11-beta", |   "version": "0.90.12", | ||||||
|   "license": "AGPL-3.0-only", |   "license": "AGPL-3.0-only", | ||||||
|   "main": "./dist/electron-main.js", |   "main": "./dist/electron-main.js", | ||||||
|   "author": { |   "author": { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Elian Doran
						Elian Doran