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

580 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Manuel Ebert
9e95edd53c Docs 2014-09-12 14:22:15 -07:00
Manuel Ebert
bf1048729c Cleans up entry 2014-09-12 14:22:15 -07:00
Manuel Ebert
191ccb8217 Fixes unicode errors in XML export 2014-09-12 14:21:48 -07:00
Manuel Ebert
da0e74ff5f Better unicode mock support 2014-09-12 14:21:48 -07:00
B Krishna Chaitanya
6e6462de0c Export to xml 2014-09-12 14:21:48 -07:00
Matthias Vogelgesang
afae3d16a7 Use PyXDG to save config and journal in XDG dirs 
This change also hides the CONFIG_PATH state information entirely within
the install module. Therefore, the cli module does not have to care about
checking existence of files and paths.
 2014-09-12 14:20:05 -07:00
Matthias Vogelgesang
fca3d131bd Require config arguments 2014-09-12 14:18:52 -07:00
Manuel Ebert
fc1935d64e Version bump 2014-09-02 13:27:16 -07:00
Manuel Ebert
6d12ccc579 Multi-Word tags for DayOne Journals 
Closes #274
 2014-09-02 13:27:11 -07:00
Manuel Ebert
4301927b72 Use unicode literals 
Fixes #273
 2014-09-02 13:26:50 -07:00
Manuel Ebert
53958cf328 Merge pull request #261 from kneufeld/master 
using a common tag regex for searching and highlighting
 2014-09-02 13:07:33 -07:00
Kurt Neufeld
2f1894c765 using a common tag regex for searching and highlighting 2014-08-30 10:02:59 -06:00
Manuel Ebert
5bfb82cf90 Version bump 2014-08-12 10:11:18 +02:00
Manuel Ebert
2e75713a91 Sort journal entries after editing 
Fixes #269
 2014-08-12 10:10:15 +02:00
Manuel Ebert
7617f9e7f8 Merge pull request #267 from maebert/issue-265 
Tags at the beginning of entries
 2014-08-07 13:31:25 +02:00
Manuel Ebert
9c4b97ef5c typo 2014-08-07 13:27:48 +02:00
Manuel Ebert
2024e956bd Version bump 2014-08-07 13:26:10 +02:00