85 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
GitHub Merge Button	7987c7307f	Merge 7c3a6d0222 into d4bd93779a	2012-05-14 13:00:01 -07:00
Stephan Gabler	7c3a6d0222	don't ignore the blank lines #15	2012-05-14 21:57:58 +02:00
Stephan Gabler	448f56473d	simplify date parsing ... and remove some whitespace	2012-05-14 21:44:30 +02:00
Manuel Ebert	d4bd93779a	Updated .gitignore	2012-05-10 14:26:43 +02:00
Manuel Ebert	e4eef0fa81	Formatted tag count line	2012-05-10 11:27:02 +02:00
Manuel Ebert	e238d88225	Commented on a nested list comprehension, following f96d73d2	2012-05-09 21:49:55 +03:00
Manuel Ebert	f96d73d2e1	Modernised tag count syntax, Python 3 idioms galore!	2012-05-08 13:04:35 +02:00
Manuel Ebert	cfbfcbc50b	Bump to 2.3	2012-05-04 16:39:19 +02:00
Manuel Ebert	bd834e7863	Added readme on -short option	2012-05-03 14:27:24 +03:00
Manuel Ebert	b14493eea5	Update CHANGELOG.md	2012-05-03 14:26:04 +03:00
Manuel Ebert	0710411cde	Merge pull request #24 from dedan/short_option ... add short option like discussed in #20, closes #20	2012-05-03 04:24:16 -07:00
Stephan Gabler	d5b931c4a1	add short option like discussed in #20 ... a -short option, which only outputs the titles of the entries, not the entire entries. So jrnl @maebert will display the full entries, but jrnl -short @maebert will output all lines containing the tag. jrnl -short without a search tag will display all titles	2012-05-03 11:42:24 +02:00
Manuel Ebert	46a7bea4b4	Merge pull request #20 from dedan/tag_search ... highlight only the tags someone searched for in the tag search #16	2012-05-03 02:30:51 -07:00
Stephan Gabler	a79f094fd8	highlight only the tags someone searched for in the tag search #16	2012-04-26 17:29:53 +02:00
Manuel Ebert	0cc57bab49	Update CHANGELOG.md	2012-04-26 14:55:51 +03:00
Manuel Ebert	5a096ccd54	Merge pull request #19 from dedan/fix_editor_not_saved ... don't crash if editor file was not saved (treat it as read mode) close #12	2012-04-26 04:52:16 -07:00
Manuel Ebert	d550932b98	Merge pull request #17 from dedan/fix_highlighting ... automatically add 'highlight' to config after upgrade from earlier versiion	2012-04-26 04:51:10 -07:00
Stephan Gabler	0a56658c43	don't crash if editor file was not saved (treat it as read mode) close #12	2012-04-26 10:03:04 +02:00
Stephan Gabler	3ca6ef89f4	make update of new settings a bit more general and remove some whitespace ... * config.update(default_config) does not work, would overwrite all values	2012-04-26 09:43:09 +02:00
Stephan Gabler	6a23b54c36	automatically add 'highlight' to config after upgrade from earlier version #16	2012-04-24 22:05:33 +02:00
Manuel Ebert	f2e207de85	Adds support for tag highlighting as proposed by #16	2012-04-24 18:44:57 +02:00
Manuel Ebert	ae57eb9d77	Adds tag search, closes #16	2012-04-24 12:05:17 +02:00
Manuel Ebert	632add24f9	Version bump to 0.2.2	2012-04-17 22:01:09 +02:00
Manuel Ebert	a100d147af	Version bump to 0.2.2	2012-04-17 21:58:34 +02:00
Manuel Ebert	2ec032b4e6	Notes on --encrypt and --decrypt	2012-04-17 21:54:08 +02:00
Stephan Gabler	7009a88316	add markdown support #8	2012-04-17 21:51:33 +02:00
Stephan Gabler	de98d8f9bd	add markdown support to the readme, close #8	2012-04-17 21:46:18 +02:00
Stephan Gabler	5ddbfed35a	remove unused import	2012-04-17 21:45:23 +02:00
Manuel Ebert	4c7ea456cb	Adds encryption and decryption of existing journals, closes #6	2012-04-17 21:34:01 +02:00
Manuel Ebert	c7f7e2f287	removes unnessecary print command	2012-04-17 12:52:21 +02:00
Manuel Ebert	26be90544e	Remove hashlib dependency (it's a stdlib package)	2012-04-17 12:50:11 +02:00
Manuel Ebert	2bae454727	Tags are case-insensitive now	2012-04-17 12:37:34 +02:00
Manuel Ebert	b0a017dec4	Fixes setup.py	2012-04-17 11:17:48 +02:00
Manuel Ebert	b286bf9af7	Details on AES encryption	2012-04-17 00:06:04 +02:00
Manuel Ebert	2ebf976653	Fixes a mistake in the advanced cryptography explanation.	2012-04-16 23:31:40 +03:00
Manuel Ebert	8dd2e5e222	Bump to 0.2	2012-04-16 22:29:01 +02:00
Manuel Ebert	0227e13e87	Version bump to 0.2.0	2012-04-16 21:43:05 +02:00
Manuel Ebert	5e41861d61	Documentation on new encryption	2012-04-16 21:42:39 +02:00
Manuel Ebert	f7ebe41fd4	_block_tail is deprecated and removed	2012-04-16 21:40:59 +02:00
Manuel Ebert	7bec54f2b0	Don't try to decrypt empty strings	2012-04-16 21:36:43 +02:00
Manuel Ebert	d19d858dba	Queries the password three times before exiting	2012-04-16 21:31:43 +02:00
Manuel Ebert	88112512ab	Encryption using CBC and random IVs	2012-04-16 21:24:55 +02:00
Manuel Ebert	608809b61c	Journal uses self.config everywhere	2012-04-16 17:16:38 +02:00
Manuel Ebert	192d2a0794	Added .gitignore	2012-04-16 17:07:40 +02:00
Manuel Ebert	670247714f	JSON fallback if simplejson is not available	2012-04-16 17:05:30 +02:00
Manuel Ebert	c70c4fe7fa	formatting	2012-04-16 14:54:27 +02:00
Manuel Ebert	438771ebe3	usage updated	2012-04-16 14:48:14 +02:00
Manuel Ebert	e214b9c5f5	JSON export moved to advanced	2012-04-16 14:41:14 +02:00
Manuel Ebert	198ba80ed9	More about timestamps	2012-04-16 14:39:36 +02:00
Manuel Ebert	f392235e0a	Notes on Encryption	2012-04-16 14:32:28 +02:00