fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 08:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
897 commits 10 branches 99 tags 14 MiB
Commit graph

897 commits

This branch
This branch
All branches
Author SHA1 Message Date
flight16
53e3bd334c Merge remote-tracking branch 'maebert/2.0-rc1' into 2.0-rc1 
Conflicts:
	setup.py
 2015-04-13 08:46:43 +09:00
flight16
763a05a945 Add missing dependencies pyyaml and pyxdg 2015-04-11 13:03:15 +09:00
Manuel Ebert
bf7ece8208 TXT extension for temp files 2015-04-05 23:55:04 +02:00
Manuel Ebert
539a88ed14 Tests for parsing issue fix 2015-04-05 18:38:37 +02:00
Manuel Ebert
b4e578b63a Fix parsing issue 2015-04-05 18:38:30 +02:00
Manuel Ebert
6c18b6f3b4 More encoding madness 2015-04-05 06:38:38 +04:00
Manuel Ebert
4a7a8cb7a4 Encryption reads and writes in binary mode 2015-04-05 06:14:18 +04:00
Manuel Ebert
76c9006ed3 Python 3 fixes :) 2015-04-05 06:05:46 +04:00
Manuel Ebert
bad5582632 Bilingual meta classes 2015-04-05 05:50:30 +04:00
Manuel Ebert
6e52b5eb70 Tests for #333 2015-04-05 03:27:09 +04:00
Manuel Ebert
aae0fc21b6 Export DayOne UUID in json 
Fixes #333
 2015-04-05 03:26:52 +04:00
Manuel Ebert
c508e0c574 Update all tests to new time format 2015-04-05 03:25:39 +04:00
Manuel Ebert
54f8382450 Fix creating non-existent journals 2015-04-05 03:25:17 +04:00
Manuel Ebert
b8ef404453 Cleanup and more logging 2015-04-05 02:28:04 +04:00
Manuel Ebert
18d46417f1 Fix conflicting requirements 
Fixes #296
 2015-04-05 02:27:47 +04:00
Manuel Ebert
b37cefbea1 Upgrade old time stamps to fix #317 2015-04-05 02:23:10 +04:00
Manuel Ebert
5ffd0d5d0b Legacy Journal with old timestamps 2015-04-05 02:23:09 +04:00
Manuel Ebert
57007a8266 Cuddle timestamp in brackets to fix #318 2015-04-05 02:22:49 +04:00
Manuel Ebert
a5f08e6081 Introduce legacy classes 2015-04-05 07:25:22 +10:00
Manuel Ebert
df82ad1f4d Properly initialise journal files after creating them 2015-04-04 18:58:33 +11:00
Manuel Ebert
cc85d905ca Return config after install 
Fixes #297
 2015-04-04 18:47:09 +11:00
Manuel Ebert
c0ec95679b Make backup of config when upgrading 
Fixes #307
 2015-04-04 18:36:34 +11:00
Manuel Ebert
2615070df0 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Manuel Ebert
1a65ae57cb Merge pull request #306 from pcarranza/2.0-r1-logging 
Added basic logging feature to understand how is configuration loaded
 2014-11-10 11:53:14 +01:00
Pablo Carranza
640d426b71 Added basic logging feature to understand how is configuration loaded 
Conflicts:

	jrnl/cli.py
	jrnl/util.py
 2014-11-09 15:55:52 -05:00
Manuel Ebert
163dc04481 Merge pull request #300 from gcgoogle/add-import-plugin-support 
Added support for importing entries for 2.0rc1.
 2014-10-30 15:03:47 +01:00
Manuel Ebert
3024f2ba46 Merge pull request #299 from gcgoogle/fix-hard-coded-export-type-list 
Now the list of export types in --help is generated from the plugins.
 2014-10-30 15:01:32 +01:00
Gregory Crosswhite
324dfbd2db Now the importer reads from standard input using util.py23_read(). 2014-10-29 13:02:11 -07:00
Gregory Crosswhite
93ea6a2a6a Made Journal.import_ more concise. 2014-10-29 13:02:05 -07:00
Gregory Crosswhite
6258465f5d Added support for importing entries. 2014-10-24 15:21:10 -07:00
Gregory Crosswhite
a1dcb3ed87 Now the list of export types in --help is generated from the plugins. 2014-10-24 14:56:24 -07:00
Manuel Ebert
6fed042b8b Plugin architecture 2014-09-27 15:07:22 -07:00
Manuel Ebert
a1b5a4099e Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
e75e3d73a0 Converts tests to YAML 2014-09-12 15:28:12 -07:00
Manuel Ebert
0a19701ae9 Use 'version' in configs 2014-09-12 15:27:48 -07:00
Manuel Ebert
1f73d28147 Uses PBKDF2-SHA256 instead of plain SHA256 
Fixes #192
 2014-09-12 14:28:37 -07:00
Manuel Ebert
9c4294ca68 Upgrade prompt for encrypted jrnls 2014-09-12 14:28:03 -07:00
Manuel Ebert
72ab49d382 Doc changes 2014-09-12 14:28:03 -07:00
Manuel Ebert
db494597a2 Basic support for cryptography.io 
Still needs better hash function
 2014-09-12 14:28:03 -07:00
Manuel Ebert
51a6ac2d51 Upgrade scaffolding 2014-09-12 14:28:03 -07:00
Manuel Ebert
09b94d1047 Remove deprecated tests 2014-09-12 14:28:03 -07:00
Manuel Ebert
4563651b71 Deprecate config.password 2014-09-12 14:28:03 -07:00
Matthias Vogelgesang
ae47c5bb80 Fix failing behave tests 2014-09-12 14:27:34 -07:00
Matthias Vogelgesang
61739dd3b0 Remove circular dependency 2014-09-12 14:26:23 -07:00
Matthias Vogelgesang
5fd53241ab Move and remove imports in utils 2014-09-12 14:26:22 -07:00
Matthias Vogelgesang
9d589f3e64 Make Journal a general interface 
This change moves the loading and saving mechanisms into its own
Plain- and EncryptedJournal subclasses for easier maintenance and lazy loading
of all the crypto modules.
 2014-09-12 14:26:22 -07:00
yarko
beeda149d4 fix call to entry_to_md() 2014-09-12 14:22:45 -07:00
Manuel Ebert
abeaa28d13 Fix config writing for python 3 2014-09-12 14:22:45 -07:00
Manuel Ebert
60c03d96d6 Fixes config tests 2014-09-12 14:22:45 -07:00
Manuel Ebert
63ad45db75 YAML configs 
See #184, #230, #197
 2014-09-12 14:22:30 -07:00