zadam a88a00b60e Merge branch 'stable' ...

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/javascripts/services/note_detail_file.js
#	src/services/build.js

2019-04-22 16:29:16 +02:00

..

entities

removed FTS5 completely

2019-04-21 12:03:13 +02:00

public

Merge branch 'stable'

2019-04-22 16:29:16 +02:00

routes

upgrade to ckeditor 12.1.0 which fixes some upload issues

2019-04-15 21:08:31 +02:00

scripts

putting reddit importer back

2018-09-01 15:23:51 +02:00

services

removed FTS5 completely

2019-04-21 12:03:13 +02:00

test

moved test enex files to separate repo

2019-03-03 19:40:47 +01:00

tools

#98, working sync setup from server to desktop instance + refactoring of DB initialization

2018-07-22 19:56:20 +02:00

views

added noscript to make it clear that Trilium requires JavaScript

2019-04-15 21:30:26 +02:00

anonymize.js

allow creating anonymized database from command line as well, fixes #200

2018-10-25 18:03:28 +02:00

app.js

moved libraries and images out of src folder

2019-03-30 09:39:58 +01:00

www

missing cert and key error message

2019-04-08 20:08:29 +02:00