zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-15 19:51:57 +08:00
Code Issues Projects Releases Packages Wiki Activity
4705 commits 38 branches 306 tags 138 MiB
Commit graph

4705 commits

This branch
This branch
All branches
Author SHA1 Message Date
zadam
0ee093f038 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	Dockerfile
#	bin/build-server.sh
#	package-lock.json
#	src/public/app/layouts/mobile_layout.js
 2021-08-23 22:27:19 +02:00
zadam
06eb0ce910 alias shell with bash 2021-08-23 22:26:01 +02:00
zadam
c59b3a0c5c release 0.47.7 2021-08-22 12:36:49 +02:00
zadam
08eda83700 node update to 14.17.5 2021-08-22 12:25:50 +02:00
zadam
d23bb5fd17 note title gets overflown by long content 2021-08-22 12:21:22 +02:00
zadam
8cb07525cf Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2021-08-21 21:32:11 +02:00
zadam
dc4c922edb fix imported strikethrough text, closes #2110 2021-08-21 21:31:30 +02:00
zadam
c3ed673453 release 0.47.6 2021-08-21 20:56:58 +02:00
zadam
3fd16a16e8 fix deletion in the mobile frontend, closes #2114 2021-08-21 20:53:45 +02:00
zadam
3448eba7b9 fix importing image captions, closes #2113 
(cherry picked from commit e050e380b9)
 2021-08-21 20:23:55 +02:00
zadam
ad8f374276 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
 2021-08-21 20:20:09 +02:00
zadam
19a6d89d4f fix include note PDF sizing, closes #2116 2021-08-21 20:19:02 +02:00
zadam
b99d83af50 improvements in frontend sync (WIP) 2021-08-20 21:42:06 +02:00
zadam
e050e380b9 fix importing image captions, closes #2113 2021-08-20 21:40:28 +02:00
zadam
68d599ed19 fix dynamic positioning 2021-08-20 21:39:56 +02:00
zadam
9d9bc31d91 fixes in frontend sync 2021-08-14 10:13:59 +02:00
zadam
b619a6515b fix first "0-24:00:00.000" log time 2021-08-12 20:57:43 +02:00
zadam
13a16e8251 force attribute value to be a string, closes #2104 2021-08-12 20:42:35 +02:00
zadam
86a53ceebb updating becca after sync 2021-08-07 21:21:30 +02:00
zadam
669eaa7509 fix SQL console 2021-07-27 22:08:41 +02:00
zadam
f50084dc1b removed annoying "sync update in progress" toast message 2021-07-26 21:28:45 +02:00
zadam
3a78a75afc fixed frontend update after note deletion 2021-07-26 21:11:51 +02:00
zadam
6e7b722bf2 fixed image being too high 2021-07-26 20:18:57 +02:00
zadam
4ca0f4b06b tree item styling based on flex, fixed root element jumping on hover 2021-07-25 22:46:45 +02:00
zadam
a33661d050 websocket events fill additional data from becca instead of database 2021-07-25 21:25:06 +02:00
zadam
f1338bb643 fix moving notes up and down using keyboard 2021-07-25 20:55:41 +02:00
zadam
b6b6d11ef7 keep sorting for content hash computation backwards compatible 2021-07-25 10:58:50 +02:00
zadam
17a6c94f66 fix errors popping up when closing tabs with multiple panes 2021-07-24 22:51:12 +02:00
zadam
e74979ccc1 fix edited notes ribbon widget 2021-07-24 22:13:32 +02:00
zadam
e003341dff optimized becca loader with raw queries 2021-07-24 21:10:16 +02:00
zadam
5c4369206a optimized content hash computation using raw queries 2021-07-24 12:04:48 +02:00
zadam
507a0e2e1d "pojoing" backend entity responses to significantly speed up 2021-07-24 11:38:57 +02:00
zadam
b381331029 refactoring of date notes route 2021-07-24 11:28:47 +02:00
zadam
af703445e1 hover for tree item buttons 2021-07-24 09:36:52 +02:00
zadam
c508217604 added underline heading style and make it a default 2021-07-23 16:04:56 +02:00
zadam
6a1287a3de fixes in the demo document 2021-07-23 14:53:31 +02:00
zadam
7261ab69bc add ignoreMissing flag to becca's getNotes() 2021-07-22 21:23:01 +02:00
zadam
f9cfd134b7 fixed corner cases in becca updates from sync 2021-07-22 20:19:44 +02:00
Abitofevrything
89d28ef27c
Various window border related fixes (#2077) 
* Remove gap between window control buttons and top of screen, add square hitbox to window control buttons

* Add better overflow detection for context menu

* Remove gap between tabs and top of screen
 2021-07-22 19:37:53 +02:00
zadam
9da8d466b8 fix note hoisting 2021-07-21 22:47:52 +02:00
zadam
74d0626dc9 Merge remote-tracking branch 'origin/master' 2021-07-21 22:07:13 +02:00
zadam
830a357b9a better styling for drop marker #2073 2021-07-21 21:12:21 +02:00
Abitofevrything
7b129c7c34
Check for active node before create note in createNoteAfter (#2074) 2021-07-21 20:19:17 +02:00
zadam
adc98d4515 fix corner case when deleting a note with not yet downloaded images, closes #2073 2021-07-21 20:18:03 +02:00
zadam
f3959cf2aa styles for dropping items in the tree, WIP 2021-07-20 22:07:14 +02:00
zadam
6fdabbc73b fixed styling for loading notes 2021-07-20 21:25:26 +02:00
zadam
de6ff09bb9 fix moving notes 2021-07-20 21:12:23 +02:00
zadam
c82308489b fix import 2021-07-20 13:29:11 +02:00
zadam
98ee3b029a Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/becca/becca_service.js
 2021-07-08 13:11:25 +02:00
zadam
a6bef45a30 fix "root" note in edited notes, closes #2058 2021-07-08 13:06:22 +02:00