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

575 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manuel Ebert
dd79639095 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Manuel Ebert
003fb507ae 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
cc22fd8e60 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
6b8cbe52b5 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
1771ff4e27 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
cfd8856989 Now the importer reads from standard input using util.py23_read(). 2014-10-29 13:02:11 -07:00
Gregory Crosswhite
5685952a73 Made Journal.import_ more concise. 2014-10-29 13:02:05 -07:00
Gregory Crosswhite
584f0a969e Added support for importing entries. 2014-10-24 15:21:10 -07:00
Gregory Crosswhite
9e766d7ad0 Now the list of export types in --help is generated from the plugins. 2014-10-24 14:56:24 -07:00
Manuel Ebert
5e68b97e59 Plugin architecture 2014-09-27 15:07:22 -07:00
Manuel Ebert
359eabd56d Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
be009b08b4 Converts tests to YAML 2014-09-12 15:28:12 -07:00
Manuel Ebert
79f87abd76 Use 'version' in configs 2014-09-12 15:27:48 -07:00
Manuel Ebert
c5c6676bab Uses PBKDF2-SHA256 instead of plain SHA256 
Fixes #192
 2014-09-12 14:28:37 -07:00
Manuel Ebert
dc03c47da8 Upgrade prompt for encrypted jrnls 2014-09-12 14:28:03 -07:00
Manuel Ebert
0a28a9807b Doc changes 2014-09-12 14:28:03 -07:00
Manuel Ebert
84d886d0ef Basic support for cryptography.io 
Still needs better hash function
 2014-09-12 14:28:03 -07:00
Manuel Ebert
4ea5ae80b5 Upgrade scaffolding 2014-09-12 14:28:03 -07:00
Manuel Ebert
293204040b Remove deprecated tests 2014-09-12 14:28:03 -07:00
Manuel Ebert
9651adcdd0 Deprecate config.password 2014-09-12 14:28:03 -07:00
Matthias Vogelgesang
044accff6d Fix failing behave tests 2014-09-12 14:27:34 -07:00
Matthias Vogelgesang
84002574e6 Remove circular dependency 2014-09-12 14:26:23 -07:00
Matthias Vogelgesang
37d3f93b8a Move and remove imports in utils 2014-09-12 14:26:22 -07:00
Matthias Vogelgesang
953c18dff2 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
4f05c2bc07 fix call to entry_to_md() 2014-09-12 14:22:45 -07:00
Manuel Ebert
37ebc473c8 Fix config writing for python 3 2014-09-12 14:22:45 -07:00
Manuel Ebert
cbab596b43 Fixes config tests 2014-09-12 14:22:45 -07:00
Manuel Ebert
9c16ad4577 YAML configs 
See #184, #230, #197
 2014-09-12 14:22:30 -07:00
Manuel Ebert
bdcdce343f Docs 2014-09-12 14:22:15 -07:00
Manuel Ebert
487c902d37 Cleans up entry 2014-09-12 14:22:15 -07:00
Manuel Ebert
99c2884343 Fixes unicode errors in XML export 2014-09-12 14:21:48 -07:00
Manuel Ebert
76710d06f7 Better unicode mock support 2014-09-12 14:21:48 -07:00
B Krishna Chaitanya
dbb3fe40df Export to xml 2014-09-12 14:21:48 -07:00
Matthias Vogelgesang
b77a579ab5 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
f5a44487c1 Require config arguments 2014-09-12 14:18:52 -07:00
Manuel Ebert
411b9eb844 Version bump 2014-09-02 13:27:16 -07:00
Manuel Ebert
391269335f Multi-Word tags for DayOne Journals 
Closes #274
 2014-09-02 13:27:11 -07:00
Manuel Ebert
182e51b92d Use unicode literals 
Fixes #273
 2014-09-02 13:26:50 -07:00
Manuel Ebert
050eea7560 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
6d783a80ac using a common tag regex for searching and highlighting 2014-08-30 10:02:59 -06:00
Manuel Ebert
a43ebd7b08 Version bump 2014-08-12 10:11:18 +02:00
Manuel Ebert
4390e1f10c Sort journal entries after editing 
Fixes #269
 2014-08-12 10:10:15 +02:00
Manuel Ebert
ccd4cca9e6 Merge pull request #267 from maebert/issue-265 
Tags at the beginning of entries
 2014-08-07 13:31:25 +02:00
Manuel Ebert
0d981241ac typo 2014-08-07 13:27:48 +02:00
Manuel Ebert
b851941574 Version bump 2014-08-07 13:26:10 +02:00
Manuel Ebert
2780a0d9df Tags at the beginning of lines 2014-08-07 13:25:50 +02:00
Manuel Ebert
bf49f31d22 Manifest update 2014-07-27 12:43:26 +09:00
Manuel Ebert
2150b5b3e7 Merge pull request #252 from mjhoffman65/issue237 
There should be a whitespace character in front of a tag.  Fixes issue #...
 2014-07-27 12:32:30 +09:00
U-NA\cle1413
4d6cdc835e Add assertion to scenario that verifies a tag on a new line is recoginized as a tag. 2014-07-23 11:19:47 -04:00
Matt Hoffman
b8a3b6d9ad There should be a whitespace character in front of a tag. Fixes issue #237. 2014-07-22 22:14:26 -04:00