Commit graph

367 commits

Author SHA1 Message Date
William Minchin
dd58becad2 Make editing work
the deleted lines were wiping the temp file, and thus the entry you were
trying to edit
2014-01-02 17:38:54 -07:00
William Minchin
419b2cb1a8 Revert "Gets rid of colorama"
This reverts commit fcd8c4d214.
We need colorama for Windows.

Conflicts:
	setup.py
2014-01-02 17:05:00 -07:00
Manuel Ebert
b050f2b030 Include dateutil in setup 2014-01-02 23:42:01 +01:00
Manuel Ebert
fcd8c4d214 Gets rid of colorama 2014-01-02 23:41:53 +01:00
Manuel Ebert
c3e8f59fe0 Doc fix 2014-01-02 14:53:32 +01:00
Manuel Ebert
77b669aedf Touch tmpfiles before opening 2014-01-02 07:48:57 +01:00
Manuel Ebert
860d74bc0e Travis fix 2013-12-22 18:50:57 +01:00
Manuel Ebert
cdf312de28 Makefile update 2013-12-22 18:47:09 +01:00
Manuel Ebert
a4448b0c34 Dateutil added to requirements. 2013-12-22 18:46:26 +01:00
Manuel Ebert
8c9ae82b98 Merge pull request #118 from maebert/develop
Develop
2013-12-22 09:42:14 -08:00
Manuel Ebert
e0ef258a83 Smal doc fixes (fixes #115) 2013-12-22 18:26:57 +01:00
Manuel Ebert
9df688d6f0 Changelog, dogs 2013-12-22 17:11:32 +01:00
Manuel Ebert
d34874947f Tests for #117 2013-12-22 14:52:13 +01:00
Manuel Ebert
077bff7e88 Fix for #117 2013-12-22 14:52:06 +01:00
Manuel Ebert
fa130143b5 DayOne support for --edit 2013-12-21 15:00:26 +01:00
Manuel Ebert
88db6fca23 Cleaner parsing 2013-12-21 14:59:24 +01:00
Manuel Ebert
c06bfd781f Modified flag for entries 2013-12-20 16:16:48 +01:00
Manuel Ebert
410e4299ea Get rid of --delete 2013-12-20 16:16:48 +01:00
Manuel Ebert
c6bde5e9ac Line break 2013-12-02 22:39:34 -08:00
Manuel Ebert
4d6b22861e Version bump 2013-11-30 15:14:53 -08:00
Manuel Ebert
abe2281361 Subheaders 2013-11-30 15:13:48 -08:00
Manuel Ebert
7fd210de3c Docs update 2013-11-30 15:10:34 -08:00
Manuel Ebert
bc75d4031b Deleting the last entry 2013-11-30 14:55:37 -08:00
Manuel Ebert
e1f31a23ae Merge pull request #112 from maebert/version-info
Version info
2013-11-29 11:23:22 -08:00
Manuel Ebert
c6e620d9cb py2.6 2013-11-29 11:13:12 -08:00
Manuel Ebert
1c7f0b351d Tests for new structure 2013-11-29 10:23:16 -08:00
Manuel Ebert
f9ea3e69ff jrnl.py:cli -> cli.py:run 2013-11-29 10:23:09 -08:00
Manuel Ebert
91b4257f7c Merge pull request #110 from MinchinWeb/help-windows
Help windows
2013-11-28 19:02:49 -08:00
William Minchin
b49e868f93 Set default linewrap to 79 globally 2013-11-27 12:52:56 -07:00
William Minchin
b6016611fd Add MS Visual Studio to GitIgnore 2013-11-27 10:37:14 -07:00
William Minchin
fd1fc05bd0 Windows: wraps lines at 79 chars by default
trying to wrap lines at 80 char in Windows' CMD results in blank lines
following lines that are exactly 80 char long
2013-11-27 10:25:17 -07:00
William Minchin
006361d963 Change break msg for Windows
for multiline input on Windows, you need Ctrl+Z to exit
2013-11-27 10:07:06 -07:00
William Minchin
e5262067a2 your chance to make a programmer happy :)
fix small typo in CONTRIBUTING.md
2013-11-27 09:11:01 -07:00
Manuel Ebert
f2b3f56993 Merge pull request #109 from maebert/piping
Piping data into jrnl
2013-11-24 11:34:56 -08:00
Manuel Ebert
0911c2e470 Docs & Version bump 2013-11-24 11:29:55 -08:00
Manuel Ebert
a88459dc1c Piping data into jrnl and multiline composing 2013-11-24 11:29:45 -08:00
Manuel Ebert
8821158835 Merge pull request #108 from maebert/#100
Squash of @alapolloni 's PR
2013-11-22 12:35:45 -08:00
Manuel Ebert
421d27f021 Squash of @alapolloni 's PR
Fixes #100 and #102
2013-11-22 12:27:52 -08:00
Manuel Ebert
37fad66942 ixed a bug that caused creating encrypted journals to fail 2013-11-20 16:55:41 -08:00
Manuel Ebert
7097ed03a2 Merge pull request #106 from multani/master
Typo on home page
2013-11-20 08:16:58 -08:00
Jonathan Ballet
afa1b2bc4d Typo in documentation 2013-11-20 11:18:52 +01:00
Manuel Ebert
7195c545ae Change to Makefile 2013-11-06 00:01:22 -08:00
Manuel Ebert
c582ac2af9 Fixes to docs 2013-11-05 23:54:54 -08:00
Manuel Ebert
7247af2195 Use RTFD's theme on their site 2013-11-05 13:26:42 -08:00
Manuel Ebert
bc9b8600a7 Fixes logo path on docs and introduces makefile 2013-11-05 11:59:32 -08:00
Manuel Ebert
bb5f8141ee Merge pull request #105 from maebert/docs
Docs
2013-11-05 11:32:08 -08:00
Manuel Ebert
b7afaa355c Contributing 2013-11-05 10:23:26 -08:00
Manuel Ebert
e0655d894a Changelog update 2013-11-05 10:23:26 -08:00
Manuel Ebert
73d0969d20 Finished docs 2013-11-05 10:23:26 -08:00
Manuel Ebert
04567ff5a7 Starring entries and looking at the stars 2013-11-05 10:23:26 -08:00